Changeset 44469

Timestamp:

01/01/20 21:45:36 (4 years ago)

Author:

obi

Message:

fix

Location:

titan/mediathek/localhoster

Files:

• cloudflare.py (modified) (3 diffs)
• lib/common.py (modified) (1 diff)

titan/mediathek/localhoster/cloudflare.py

@@ -6 +6 @@
 import lib.common as common
 import re
+import cookielib
+from lib.cCFScrape import cCFScrape
+#from lib.cloudflare import cloudflare
 import lib.cloudflare as cloudflare
+#from lib.cCFScrape import cCFScrape
 
 class CloudflareResolver(object):
@@ -12 +16 @@
         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)
@@ -24 +29 @@
                    'Content-Type': 'text/html; charset=utf-8'}
 
-#        html = self.net.http_GET(web_url, headers=headers).content
-#        #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')
-
         CF = cloudflare.CloudflareBypass()
         html = CF.GetHtml(web_url)
+        ret = self.net.save_cookies('/mnt/network/cookies')      
+
         print CF.GetReponseInfo()
-        print "html", html
+
+        try:
+            print "html", html.encode('utf8')
+        except:
+            print html
 
 sys.stdout = CloudflareResolver()
 
-

titan/mediathek/localhoster/lib/common.py

@@ -34 +34 @@
 #has_addon = kodi.has_addon
 
-profilePath = "/tmp/pro"
+profilePath = "/mnt/network"
 
 RAND_UA = get_ua()