Changeset 45114

Timestamp:

01/10/21 00:42:25 (2 years ago)

Author:

obi

Message:

fix typo

Location:

titan/mediathek/localhoster

Files:

• lib/helpers.py (modified) (3 diffs)
• upstream.py (modified) (1 diff)

titan/mediathek/localhoster/lib/helpers.py

@@ -176 +176 @@
     return source_list
 
-
-def get_media_url(url, result_blacklist=None, patterns=None, generic_patterns=True):
-    if patterns is None: patterns = []
-    scheme = urlparse(url).scheme
+def get_media_url(url, result_blacklist=None, patterns=None, generic_patterns=True, referer=True):
+    if patterns is None:
+        patterns = []
+    scheme = urllib_parse.urlparse(url).scheme
     if result_blacklist is None:
         result_blacklist = []
@@ -188 +188 @@
     net = common.Net()
     headers = {'User-Agent': common.RAND_UA}
-
+    if referer:
+        headers.update({'Referer': url})
     response = net.http_GET(url, headers=headers)
     response_headers = response.get_headers(as_dict=True)
-    headers.update({'Referer': url})
     cookie = response_headers.get('Set-Cookie', None)
     if cookie:
         headers.update({'Cookie': cookie})
     html = response.content
-
+    if not referer:
+        headers.update({'Referer': url})
     source_list = scrape_sources(html, result_blacklist, scheme, patterns, generic_patterns)
     source = pick_source(source_list)
@@ -285 +286 @@
     response = urllib_request.urlopen(request)
     return response.geturl()
+    
+def _default_get_url(self, host, media_id, template=None):
+    if template is None:
+        template = 'http://{host}/embed-{media_id}.html'
+    host = self._get_host(host)
+    return template.format(host=host, media_id=media_id)

titan/mediathek/localhoster/upstream.py

@@ -48 +48 @@
 
     def get_media_url(self, host, media_id):
-        referer = False
         print helpers.get_media_url(self.get_url(host, media_id),
                                     patterns=[r'''sources:\s*\[(?:{file:)?\s*"(?P<url>[^"]+)'''],