youtube-dl

commit: 90ea83c64d904587992105fb4506e80f6abb28b5
parent e4e5fa6e3c1c2ca2d48dfb5a8b1f734bd627b2dc
Author: Sergey M․ <dstftw@gmail.com>
Date:   Wed, 15 Jan 2020 04:32:05 +0700

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

Diffstat:
M
youtube_dl/extractor/orf.py
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py
@@ -90,8 +90,11 @@ class ORFTVthekIE(InfoExtractor):
                 format_id = '-'.join(format_id_list)
                 ext = determine_ext(src)
                 if ext == 'm3u8':
-                    formats.extend(self._extract_m3u8_formats(
-                        src, video_id, 'mp4', m3u8_id=format_id, fatal=False))
+                    m3u8_formats = self._extract_m3u8_formats(
+                        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':
                     formats.extend(self._extract_f4m_formats(
                         src, video_id, f4m_id=format_id, fatal=False))