Changeset 44467

Timestamp:

01/01/20 21:14:01 (4 years ago)

Author:

obi

Message:

fix

File:

• titan/mediathek/localhoster/cloudflare.py (modified) (2 diffs)

titan/mediathek/localhoster/cloudflare.py

@@ -6 +6 @@
 import lib.common as common
 import re
+import lib.cloudflare as cloudflare
 
 class CloudflareResolver(object):
@@ -23 +24 @@
                    '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')
 
 #        print "cloudflare.CheckIfActive: ", web_url
-        CF = cloudflare.CloudflareBypass()
-        html = CF.GetHtml(web_url)
-        print CF.GetReponseInfo()
-        print "html", html
+
+        try:
+            CF = cloudflare.CloudflareBypass()
+            html = CF.GetHtml(web_url)
+            print CF.GetReponseInfo()
+            print "html", html
+        except:
+            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')
 
 sys.stdout = CloudflareResolver()