depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-05-13 08:39:33 +00:00
Code Issues Releases Wiki Activity

[pornhub] Fix review issues (closes #27393)

Browse source
This commit is contained in:
Sergey M․ 2020-12-26 21:16:55 +07:00
parent b57b27ff8f
commit 17e0f41d34
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
youtube_dl/extractor/pornhub.py
View file

@ -288,15 +288,13 @@ 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'))
def parse_quality_items(quality_items):
q_items = self._parse_json(quality_items, video_id, fatal=False)
if not isinstance(q_items, list):
return
for item in q_items:
if isinstance(item, dict):
add_video_url(item.get('url'))
if not video_urls:
FORMAT_PREFIXES = ('media', 'quality', 'qualityItems')
@ -305,8 +303,10 @@ class PornHubIE(PornHubBaseIE):
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(parse_quality_items(format_url))
if key.startswith(FORMAT_PREFIXES[-1]):
parse_quality_items(format_url)
elif any(key.startswith(p) for p in FORMAT_PREFIXES[:2]):
add_video_url(format_url)
if not video_urls and re.search(
r'<[^>]+\bid=["\']lockedPlayer', webpage):
raise ExtractorError(