mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 10:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[disney] Implement code review suggestions

Browse source
This commit is contained in:
MrDemocracy 2024-11-21 23:56:35 +01:00 committed by GitHub
parent 683c166daa
commit 98a8c6d6cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
yt_dlp/extractor/disney.py
View file

@ -104,8 +104,7 @@ def _real_extract(self, url):
grill = re.sub(r'"\s*\+\s*"', '', self._search_regex( grill = re.sub(r'"\s*\+\s*"', '', self._search_regex(
r'Grill\.burger\s*=\s*({.+})\s*:', r'Grill\.burger\s*=\s*({.+})\s*:',
webpage, 'grill data')) webpage, 'grill data'))
video_data = next(traverse_obj(s, ('data', 0, 'video')) or traverse_obj(s, ('data', 0)) for s in self._parse_json(grill, video_data = next(traverse_obj(s, ('data', 0, 'video'), ('data', 0)) for s in self._parse_json(grill, display_id)['stack'] if s.get('type') in ('video', 'flexcontenthero'))
display_id)['stack'] if s.get('type') in ('video', 'flexcontenthero'))
else: else:
webpage = self._download_webpage( webpage = self._download_webpage(
f'http://{domain}/embed/{video_id}', video_id, headers={'user-agent': self._USER_AGENT}) f'http://{domain}/embed/{video_id}', video_id, headers={'user-agent': self._USER_AGENT})
@ -126,9 +125,8 @@ def _real_extract(self, url):
flavor_format = flavor.get('format') flavor_format = flavor.get('format')
flavor_url = flavor.get('url') flavor_url = flavor.get('url')
if '/emea-exit/' in flavor_url: if '/emea-exit/' in flavor_url:
webpage = self._download_webpage(flavor_url, display_id, headers={'user-agent': self._USER_AGENT}, note=False) webpage = self._download_webpage(flavor_url, display_id, headers={'user-agent': self._USER_AGENT}, note=f"Resolving format URL redirect: {flavor_format} {flavor.get('height')}p")
flavor_url = self._search_regex(r'rel="canonical" href="([^"]+)', flavor_url = self._search_regex(r'rel="canonical" href="([^"]+)', webpage, 'redirect url')
webpage, 'redirect url')
if not flavor_url or not re.match(r'https?://', flavor_url) or flavor_format == 'mp4_access': if not flavor_url or not re.match(r'https?://', flavor_url) or flavor_format == 'mp4_access':
continue continue
tbr = int_or_none(flavor.get('bitrate')) tbr = int_or_none(flavor.get('bitrate'))