Index: titan/mediathek/localhoster/goldesel.py =================================================================== --- titan/mediathek/localhoster/goldesel.py (revision 39399) +++ titan/mediathek/localhoster/goldesel.py (revision 39400) @@ -12,6 +12,6 @@ def __init__(self): -# self.net = Net(cookie_file='/mnt/network/cookie', http_debug=True, cloudflare=True) - self.net = Net(cookie_file='/mnt/network/cookie', cloudflare=True) +# self.net = Net(cookie_file='/mnt/network/cookies', http_debug=True, cloudflare=True) + self.net = Net(cookie_file='/mnt/network/cookies', cloudflare=True) url = str(sys.argv[1]) return self.get_answer_code(url) @@ -20,5 +20,6 @@ headers = {'User-Agent': common.FF_USER_AGENT} html = self.net.http_GET(web_url, headers=headers).content - #html = self.request(web_url, cookie_file=/mnt/network/cookie, cloudflare=True) + #html = self.request(web_url, cookie_file=/mnt/network/cookies, cloudflare=True) + ret = self.net.save_cookies('/mnt/network/cookies') print "html", html.encode('utf8') Index: titan/mediathek/localhoster/hoster.sh =================================================================== --- titan/mediathek/localhoster/hoster.sh (revision 39399) +++ titan/mediathek/localhoster/hoster.sh (revision 39400) @@ -10,5 +10,5 @@ BOX=`cat /etc/model` debuglevel=`cat /mnt/config/titan.cfg | grep debuglevel | cut -d"=" -f2` -curlbin="curl -k -s -L --cookie /mnt/network/cookies --cookie-jar /mnt/network/cookies -A 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Maxthon/4.4.7.3000 Chrome/30.0.1599.101 Safari/537.36'" +curlbin="curl -k -s -L --cookie /mnt/network/cookies --cookie-jar /mnt/network/cookies -A 'Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0'" curlbin2='curl -k -s --cookie /mnt/network/cookies --cookie-jar /mnt/network/cookies' if [ "$debuglevel" == "99" ]; then curlbin="$curlbin -v"; fi Index: titan/mediathek/localhoster/lib/net.py =================================================================== --- titan/mediathek/localhoster/lib/net.py (revision 39399) +++ titan/mediathek/localhoster/lib/net.py (revision 39400) @@ -51,5 +51,5 @@ ANDROID_USER_AGENT = 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36' - _cj = cookielib.LWPCookieJar() + _cj = cookielib.MozillaCookieJar() _proxy = None @@ -87,5 +87,5 @@ # empty jar for each instance rather than scope of the import - self._cloudflare_jar = cookielib.LWPCookieJar() + self._cloudflare_jar = cookielib.MozillaCookieJar() self.cloudflare = cloudflare @@ -170,5 +170,5 @@ if cloudflare_jar: - self._cloudflare_jar = cookielib.LWPCookieJar() + self._cloudflare_jar = cookielib.MozillaCookieJar() jar = self._cloudflare_jar else: Index: titan/mediathek/localparser_secret/goldesel.sh =================================================================== --- titan/mediathek/localparser_secret/goldesel.sh (revision 39399) +++ titan/mediathek/localparser_secret/goldesel.sh (revision 39400) @@ -163,6 +163,6 @@ rm $TMP/$PARSER.$INPUT.list fi -# $curlbin $URL/$PAGE -o $TMP/cache.$PARSER.$INPUT.1 - /tmp/localhoster/hoster.sh get $URL/$PAGE > $TMP/cache.$PARSER.$INPUT.1 + $curlbin $URL/$PAGE -o $TMP/cache.$PARSER.$INPUT.1 -A 'Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0' +# /tmp/localhoster/hoster.sh get $URL/$PAGE > $TMP/cache.$PARSER.$INPUT.1 cat $TMP/cache.$PARSER.$INPUT.1 | sed 's!