Changeset 39354 for titan/mediathek/localhoster/lib

Timestamp:

11/19/16 16:32:54 (7 years ago)

Author:

obi

Message:

fix vidzi

File:

• titan/mediathek/localhoster/lib/helpers.py (modified) (4 diffs)

titan/mediathek/localhoster/lib/helpers.py

@@ -24 +24 @@
 #from urlresolver.resolver import ResolverError
 import common
+from net import Net
 
 def get_hidden(html, form_id=None, index=None, include_submit=True):
@@ -149 +150 @@
         try: source_list.sort(key=lambda x: int(x[0]), reverse=True)
         except:
-            common.log_utils.log_debug('Scrape sources sort failed |int(x[0])|')
+            test = 1
+#            common.log_utils.log_debug('Scrape sources sort failed |int(x[0])|')
             try: source_list.sort(key=lambda x: int(x[0][:-1]), reverse=True)
             except:
-                common.log_utils.log_debug('Scrape sources sort failed |int(x[0][:-1])|')
+                 test = 2
+#                common.log_utils.log_debug('Scrape sources sort failed |int(x[0][:-1])|')
 
     return source_list
@@ -164 +167 @@
 
     result_blacklist = list(set(result_blacklist + ['.smil']))  # smil(not playable) contains potential sources, only blacklist when called from here
-    net = common.Net()
+    net = Net()
     parsed_url = urlparse(url)
     headers = {'User-Agent': common.FF_USER_AGENT,
@@ -170 +173 @@
 
     response = net.http_GET(url, headers=headers)
-    response_headers = response.get_headers(as_dict=True)
+#    response_headers = response.get_headers(as_dict=True)
+    response_headers = response.get_headers()
+
     headers.update({'Referer': url})
-    cookie = response_headers.get('Set-Cookie', None)
-    if cookie:
-        headers.update({'Cookie': cookie})
+#    cookie = response_headers.get('Set-Cookie', None)
+#    if cookie:
+#        headers.update({'Cookie': cookie})
     html = response.content
 
     source_list = scrape_sources(html, result_blacklist)
     source = pick_source(source_list)
-    return source + append_headers(headers)
+    return source# + append_headers(headers)