midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[pornhub] Fix lq formats extraction (closes #27386)

Browse source
This commit is contained in:
JChris246 2020-12-12 10:17:59 -04:00 committed by Sergey M․
parent bbe8cc6662
commit b57b27ff8f
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/pornhub.py
View file

@ -288,15 +288,25 @@ class PornHubIE(PornHubBaseIE):
video_urls.append((v_url, None)) video_urls.append((v_url, None))
video_urls_set.add(v_url) 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: if not video_urls:
FORMAT_PREFIXES = ('media', 'quality') FORMAT_PREFIXES = ('media', 'quality', 'qualityItems')
js_vars = extract_js_vars( js_vars = extract_js_vars(
webpage, r'(var\s+(?:%s)_.+)' % '|'.join(FORMAT_PREFIXES), webpage, r'(var\s+(?:%s)_.+)' % '|'.join(FORMAT_PREFIXES),
default=None) default=None)
if js_vars: if js_vars:
for key, format_url in js_vars.items(): for key, format_url in js_vars.items():
if any(key.startswith(p) for p in FORMAT_PREFIXES): 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( if not video_urls and re.search(
r'<[^>]+\bid=["\']lockedPlayer', webpage): r'<[^>]+\bid=["\']lockedPlayer', webpage):
raise ExtractorError( raise ExtractorError(