Updated version 2017.10.15.1 from 'upstream/2017.10.15.1'

[youtubedl] / youtube_dl / extractor / tv4.py

diff --git a/youtube_dl/extractor/tv4.py b/youtube_dl/extractor/tv4.py
index ad79db92beb3825dc1293b047acf7c61ca99386a..cfcce020a62f1cf5728e275a8122d68428865b4b 100644 (file)
--- a/youtube_dl/extractor/tv4.py
+++ b/youtube_dl/extractor/tv4.py
@@ -18,12 +18,13 @@ class TV4IE(InfoExtractor):
             tv4\.se/(?:[^/]+)/klipp/(?:.*)-|
             tv4play\.se/
             (?:
             tv4\.se/(?:[^/]+)/klipp/(?:.*)-|
             tv4play\.se/
             (?:

-                (?:program|barn)/(?:[^\?]+)\?video_id=|
+                (?:program|barn)/(?:[^/]+/|(?:[^\?]+)\?video_id=)|

                 iframe/video/|
                 film/|
                 sport/|
             )
         )(?P<id>[0-9]+)'''
                 iframe/video/|
                 film/|
                 sport/|
             )
         )(?P<id>[0-9]+)'''

+    _GEO_COUNTRIES = ['SE']

     _TESTS = [
         {
             'url': 'http://www.tv4.se/kalla-fakta/klipp/kalla-fakta-5-english-subtitles-2491650',
     _TESTS = [
         {
             'url': 'http://www.tv4.se/kalla-fakta/klipp/kalla-fakta-5-english-subtitles-2491650',


@@ -62,6 +63,10 @@ class TV4IE(InfoExtractor):
             'url': 'http://www.tv4play.se/barn/looney-tunes?video_id=3062412',
             'only_matching': True,
         },
             'url': 'http://www.tv4play.se/barn/looney-tunes?video_id=3062412',
             'only_matching': True,
         },

+        {
+            'url': 'http://www.tv4play.se/program/farang/3922081',
+            'only_matching': True,
+        }

     ]
 
     def _real_extract(self, url):
     ]
 
     def _real_extract(self, url):


@@ -71,16 +76,12 @@ class TV4IE(InfoExtractor):
             'http://www.tv4play.se/player/assets/%s.json' % video_id,
             video_id, 'Downloading video info JSON')
 
             'http://www.tv4play.se/player/assets/%s.json' % video_id,
             video_id, 'Downloading video info JSON')
 

-        # If is_geo_restricted is true, it doesn't necessarily mean we can't download it
-        if info.get('is_geo_restricted'):
-            self.report_warning('This content might not be available in your country due to licensing restrictions.')
-

         title = info['title']
 
         subtitles = {}
         formats = []
         # http formats are linked with unresolvable host
         title = info['title']
 
         subtitles = {}
         formats = []
         # http formats are linked with unresolvable host

-        for kind in ('hls', ''):
+        for kind in ('hls3', ''):

             data = self._download_json(
                 'https://prima.tv4play.se/api/web/asset/%s/play.json' % video_id,
                 video_id, 'Downloading sources JSON', query={
             data = self._download_json(
                 'https://prima.tv4play.se/api/web/asset/%s/play.json' % video_id,
                 video_id, 'Downloading sources JSON', query={


@@ -113,6 +114,10 @@ class TV4IE(InfoExtractor):
                                 'url': manifest_url,
                                 'ext': 'vtt',
                             }]})
                                 'url': manifest_url,
                                 'ext': 'vtt',
                             }]})

+
+        if not formats and info.get('is_geo_restricted'):
+            self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
+

         self._sort_formats(formats)
 
         return {
         self._sort_formats(formats)
 
         return {