1
1
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-27 08:46:48 +01:00

[orf:tvthek] Improve geo restricted videos detection (closes #23741)

This commit is contained in:
Sergey M․ 2020-01-15 04:32:05 +07:00
parent e4e5fa6e3c
commit 90ea83c64d
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -90,8 +90,11 @@ class ORFTVthekIE(InfoExtractor):
format_id = '-'.join(format_id_list) format_id = '-'.join(format_id_list)
ext = determine_ext(src) ext = determine_ext(src)
if ext == 'm3u8': if ext == 'm3u8':
formats.extend(self._extract_m3u8_formats( m3u8_formats = self._extract_m3u8_formats(
src, video_id, 'mp4', m3u8_id=format_id, fatal=False)) src, video_id, 'mp4', m3u8_id=format_id, fatal=False)
if any('/geoprotection' in f['url'] for f in m3u8_formats):
self.raise_geo_restricted()
formats.extend(m3u8_formats)
elif ext == 'f4m': elif ext == 'f4m':
formats.extend(self._extract_f4m_formats( formats.extend(self._extract_f4m_formats(
src, video_id, f4m_id=format_id, fatal=False)) src, video_id, f4m_id=format_id, fatal=False))