Skip to content

Commit

Permalink
[ie/mediastream] Fix authenticated format extraction (yt-dlp#8657)
Browse files Browse the repository at this point in the history
Authored by: NickCis
  • Loading branch information
NickCis authored and aalsuwaidi committed Apr 21, 2024
1 parent 72c023a commit d90fd49
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions yt_dlp/extractor/mediastream.py
Expand Up @@ -3,8 +3,11 @@
from .common import InfoExtractor
from ..utils import (
clean_html,
filter_dict,
parse_qs,
remove_end,
traverse_obj,
update_url_query,
urljoin,
)

Expand Down Expand Up @@ -108,7 +111,9 @@ def _real_extract(self, url):

for message in [
'Debido a tu ubicación no puedes ver el contenido',
'You are not allowed to watch this video: Geo Fencing Restriction'
'You are not allowed to watch this video: Geo Fencing Restriction',
'Este contenido no está disponible en tu zona geográfica.',
'El contenido sólo está disponible dentro de',
]:
if message in webpage:
self.raise_geo_restricted()
Expand All @@ -118,7 +123,16 @@ def _real_extract(self, url):
formats, subtitles = [], {}
for video_format in player_config['src']:
if video_format == 'hls':
fmts, subs = self._extract_m3u8_formats_and_subtitles(player_config['src'][video_format], video_id)
params = {
'at': 'web-app',
'access_token': traverse_obj(parse_qs(url), ('access_token', 0)),
}
for name, key in (('MDSTRMUID', 'uid'), ('MDSTRMSID', 'sid'), ('MDSTRMPID', 'pid'), ('VERSION', 'av')):
params[key] = self._search_regex(
rf'window\.{name}\s*=\s*["\']([^"\']+)["\'];', webpage, key, default=None)

fmts, subs = self._extract_m3u8_formats_and_subtitles(
update_url_query(player_config['src'][video_format], filter_dict(params)), video_id)
formats.extend(fmts)
self._merge_subtitles(subs, target=subtitles)
elif video_format == 'mpd':
Expand Down

0 comments on commit d90fd49

Please sign in to comment.