Changeset 39400 for titan/mediathek

Timestamp:

12/02/16 23:31:14 (7 years ago)

Author:

tt4sk

Message:

First call of goldesel.to with goldesel.py / net.py, store cookie in /mnt/network/cookies, following calls with curl using same cookie and user agent.

Location:

titan/mediathek

Files:

• localhoster/goldesel.py (modified) (2 diffs)
• localhoster/hoster.sh (modified) (1 diff)
• localhoster/lib/net.py (modified) (3 diffs)
• localparser_secret/goldesel.sh (modified) (2 diffs)

titan/mediathek/localhoster/goldesel.py

@@ -12 +12 @@
 
     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 +20 @@
         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')
 

titan/mediathek/localhoster/hoster.sh

@@ -10 +10 @@
 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

titan/mediathek/localhoster/lib/net.py

@@ -51 +51 @@
     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 +87 @@
 
         # 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 +170 @@
 
         if cloudflare_jar:
-            self._cloudflare_jar = cookielib.LWPCookieJar()
+            self._cloudflare_jar = cookielib.MozillaCookieJar()
             jar = self._cloudflare_jar
         else:

titan/mediathek/localparser_secret/goldesel.sh

@@ -163 +163 @@
                 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!<h2>Stream-Links</h2>!\nfound=!g' | sed 's!<h2>Sample-Links</h2>!\nerror=!g' | grep ^found= | sed 's/<li data=/\ndata=/g' | grep ^data= >$TMP/cache.$PARSER.$INPUT.2
@@ -184 +184 @@
 {
         rm $TMP/cache.$PARSER.$INPUT.* > /dev/null 2>&1
-        $curlbin $URL/res/links -X POST --data "$PAGE" -o $TMP/cache.$PARSER.$INPUT.1
+        $curlbin $URL/res/links -X POST --data "$PAGE" -o $TMP/cache.$PARSER.$INPUT.1 -A 'Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0'
         STREAMURL=`cat $TMP/cache.$PARSER.$INPUT.1 | sed 's!url="http://dref.me/?!\nstreamurl="!' | grep ^streamurl= | cut -d'"' -f2 | sed 's!%3A!:!g' | sed 's!%2F!/!g'`
 #       rm $TMP/cache.$PARSER.$INPUT.* > /dev/null 2>&1