]> asedeno.scripts.mit.edu Git - youtube-dl.git/commitdiff
[pornhub] Fix lq formats extraction (closes #27386)
authorJChris246 <chris.401@live.com>
Sat, 12 Dec 2020 14:17:59 +0000 (10:17 -0400)
committerSergey M․ <dstftw@gmail.com>
Sat, 26 Dec 2020 14:17:11 +0000 (21:17 +0700)
youtube_dl/extractor/pornhub.py

index 9ad92a8ecf374b9615ed763907fbbece6907967e..3b649896436dc36d3011cc5386cb509a518fba8e 100644 (file)
@@ -288,15 +288,25 @@ class PornHubIE(PornHubBaseIE):
             video_urls.append((v_url, None))
             video_urls_set.add(v_url)
 
+        def parse_quality_items(js_str):
+            if (url_or_none(js_str)):
+                return js_str
+            media_definitions = self._parse_json(js_str, video_id, fatal=False)
+            if isinstance(media_definitions, list):
+                for definition in media_definitions:
+                    if not isinstance(definition, dict):
+                        continue
+                    add_video_url(definition.get('url'))
+
         if not video_urls:
-            FORMAT_PREFIXES = ('media', 'quality')
+            FORMAT_PREFIXES = ('media', 'quality', 'qualityItems')
             js_vars = extract_js_vars(
                 webpage, r'(var\s+(?:%s)_.+)' % '|'.join(FORMAT_PREFIXES),
                 default=None)
             if js_vars:
                 for key, format_url in js_vars.items():
                     if any(key.startswith(p) for p in FORMAT_PREFIXES):
-                        add_video_url(format_url)
+                        add_video_url(parse_quality_items(format_url))
             if not video_urls and re.search(
                     r'<[^>]+\bid=["\']lockedPlayer', webpage):
                 raise ExtractorError(