etc/yt-dlp
0
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-25 02:45:12 +00:00
Code Issues Projects Releases Wiki Activity

[disney] Handle redirects and updating tests

Browse source
This commit is contained in:
MrDemocracy 2024-11-20 17:00:40 +01:00 committed by GitHub
parent f919729538
commit deaaca0aff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
yt_dlp/extractor/disney.py
View file

@ -7,6 +7,7 @@
join_nonempty,
unified_strdate,
update_url_query,
traverse_obj,
)
@ -22,6 +23,8 @@ class DisneyIE(InfoExtractor):
'title': 'Moana - Trailer',
'description': 'A fun adventure for the entire Family! Bring home Moana on Digital HD Feb 21 & Blu-ray March 7',
'upload_date': '20170112',
'duration': 95,
'thumbnail': 'https://lumiere-a.akamaihd.net/v1/images/545ed1857afee5a0ec239977_84a55142.jpeg?height=354&region=0%2C144%2C1920%2C792&width=630',
},
'params': {
# m3u8 download
@ -36,6 +39,8 @@ class DisneyIE(InfoExtractor):
'title': '"Intro" Featurette: Rogue One: A Star Wars Story',
'upload_date': '20170104',
'description': 'Go behind-the-scenes of Rogue One: A Star Wars Story in this featurette with Director Gareth Edwards and the cast of the film.',
'duration': 122,
'thumbnail': 'https://lumiere-a.akamaihd.net/v1/images/r1-featurette-11-17-yt_9b401d61.jpeg?height=354&region=0%2C0%2C1920%2C1080&width=630',
},
'params': {
# m3u8 download
@ -73,18 +78,21 @@ class DisneyIE(InfoExtractor):
'only_matching': True,
}]
# https://www.starwars.com times out with the default user-agent
_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:132.0) Gecko/20100101 Firefox/132.0'
def _real_extract(self, url):
domain, video_id, display_id = self._match_valid_url(url).groups()
if not video_id:
webpage = self._download_webpage(url, display_id)
webpage = self._download_webpage(url, display_id, headers={'user-agent': self._USER_AGENT})
grill = re.sub(r'"\s*\+\s*"', '', self._search_regex(
r'Grill\.burger\s*=\s*({.+})\s*:',
webpage, 'grill data'))
page_data = next(s for s in self._parse_json(grill, display_id)['stack'] if s.get('type') == 'video')
video_data = page_data['data'][0]
video_data = next(traverse_obj(s, ('data', 0, 'video')) or traverse_obj(s, ('data', 0)) for s in self._parse_json(grill,
display_id)['stack'] if s.get('type') in ('video', 'flexcontenthero'))
else:
webpage = self._download_webpage(
f'http://{domain}/embed/{video_id}', video_id)
f'http://{domain}/embed/{video_id}', video_id, headers={'user-agent': self._USER_AGENT})
page_data = self._parse_json(self._search_regex(
r'Disney\.EmbedVideo\s*=\s*({.+});',
webpage, 'embed data'), video_id)
@ -101,6 +109,10 @@ def _real_extract(self, url):
for flavor in video_data.get('flavors', []):
flavor_format = flavor.get('format')
flavor_url = flavor.get('url')
if '/emea-exit/' in flavor_url:
webpage = self._download_webpage(flavor_url, display_id, headers={'user-agent': self._USER_AGENT}, note=False)
flavor_url = self._search_regex(r'rel="canonical" href="([^"]+)',
webpage, 'redirect url')
if not flavor_url or not re.match(r'https?://', flavor_url) or flavor_format == 'mp4_access':
continue
tbr = int_or_none(flavor.get('bitrate'))