Skip to content

Commit

Permalink
[pornhub] Fix lq formats extraction (closes #27386)
Browse files Browse the repository at this point in the history
  • Loading branch information
JChris246 authored and dstftw committed Dec 26, 2020
1 parent bbe8cc6 commit b57b27f
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions youtube_dl/extractor/pornhub.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,15 +288,25 @@ def add_video_url(video_url):
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(
Expand Down

0 comments on commit b57b27f

Please sign in to comment.