test/test_subtitles.py

@@ -258,24 +258,16 @@ class TestNRKSubtitles(BaseTestSubtitles):
 
 
 class TestRaiPlaySubtitles(BaseTestSubtitles):
+    url = 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html'
     IE = RaiPlayIE
 
-    def test_subtitles_key(self):
+    def test_allsubtitles(self):
-        self.url = 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['it']))
         self.assertEqual(md5(subtitles['it']), 'b1d90a98755126b61e667567a1f6680a')
 
-    def test_subtitles_array_key(self):
-        self.url = 'https://www.raiplay.it/video/2020/12/Report---04-01-2021-2e90f1de-8eee-4de4-ac0e-78d21db5b600.html'
-        self.DL.params['writesubtitles'] = True
-        self.DL.params['allsubtitles'] = True
-        subtitles = self.getSubtitles()
-        self.assertEqual(set(subtitles.keys()), set(['it']))
-        self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
-
 
 class TestVikiSubtitles(BaseTestSubtitles):
     url = 'http://www.viki.com/videos/1060846v-punch-episode-18'

youtube_dl/extractor/canvas.py

@@ -211,7 +211,7 @@ class CanvasEenIE(InfoExtractor):
 
 class VrtNUIE(GigyaBaseIE):
     IE_DESC = 'VrtNU.be'
-    _VALID_URL = r'https?://(?:www\.)?vrt\.be/vrtnu/a-z/(?:[^/]+/){2}(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?vrt\.be/(?P<site_id>vrtnu)/(?:[^/]+/)*(?P<id>[^/?#&]+)'
     _TESTS = [{
         # Available via old API endpoint
         'url': 'https://www.vrt.be/vrtnu/a-z/postbus-x/1989/postbus-x-s1989a1/',

youtube_dl/extractor/rai.py

@@ -103,28 +103,22 @@ class RaiBaseIE(InfoExtractor):
         }.items() if v is not None)
 
     @staticmethod
-    def _extract_subtitles(url, video_data):
+    def _extract_subtitles(url, subtitle_url):
-        STL_EXT = 'stl'
-        SRT_EXT = 'srt'
         subtitles = {}
-        subtitles_array = video_data.get('subtitlesArray') or []
+        if subtitle_url and isinstance(subtitle_url, compat_str):
-        for k in ('subtitles', 'subtitlesUrl'):
+            subtitle_url = urljoin(url, subtitle_url)
-            subtitles_array.append({'url': video_data.get(k)})
+            STL_EXT = '.stl'
-        for subtitle in subtitles_array:
+            SRT_EXT = '.srt'
-            sub_url = subtitle.get('url')
+            subtitles['it'] = [{
-            if sub_url and isinstance(sub_url, compat_str):
+                'ext': 'stl',
-                sub_lang = subtitle.get('language') or 'it'
+                'url': subtitle_url,
-                sub_url = urljoin(url, sub_url)
+            }]
-                sub_ext = determine_ext(sub_url, SRT_EXT)
+            if subtitle_url.endswith(STL_EXT):
-                subtitles.setdefault(sub_lang, []).append({
+                srt_url = subtitle_url[:-len(STL_EXT)] + SRT_EXT
-                    'ext': sub_ext,
+                subtitles['it'].append({
-                    'url': sub_url,
+                    'ext': 'srt',
+                    'url': srt_url,
                 })
-                if STL_EXT == sub_ext:
-                    subtitles[sub_lang].append({
-                        'ext': SRT_EXT,
-                        'url': sub_url[:-len(STL_EXT)] + SRT_EXT,
-                    })
         return subtitles
 
 
@@ -144,9 +138,6 @@ class RaiPlayIE(RaiBaseIE):
             'duration': 6160,
             'series': 'Report',
             'season': '2013/14',
-            'subtitles': {
-                'it': 'count:2',
-            },
         },
         'params': {
             'skip_download': True,
@@ -154,10 +145,6 @@ class RaiPlayIE(RaiBaseIE):
     }, {
         'url': 'http://www.raiplay.it/video/2016/11/gazebotraindesi-efebe701-969c-4593-92f3-285f0d1ce750.html?',
         'only_matching': True,
-    }, {
-        # subtitles at 'subtitlesArray' key (see #27698)
-        'url': 'https://www.raiplay.it/video/2020/12/Report---04-01-2021-2e90f1de-8eee-4de4-ac0e-78d21db5b600.html',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -185,7 +172,7 @@ class RaiPlayIE(RaiBaseIE):
         if date_published and time_published:
             date_published += ' ' + time_published
 
-        subtitles = self._extract_subtitles(url, video)
+        subtitles = self._extract_subtitles(url, video.get('subtitles'))
 
         program_info = media.get('program_info') or {}
         season = media.get('season')
@@ -340,7 +327,7 @@ class RaiIE(RaiBaseIE):
             'skip_download': True,
         },
     }, {
-        # ContentItem in iframe (see #12652) and subtitle at 'subtitlesUrl' key
+        # ContentItem in iframe (see #12652)
         'url': 'http://www.presadiretta.rai.it/dl/portali/site/puntata/ContentItem-3ed19d13-26c2-46ff-a551-b10828262f1b.html',
         'info_dict': {
             'id': '1ad6dc64-444a-42a4-9bea-e5419ad2f5fd',
@@ -348,9 +335,6 @@ class RaiIE(RaiBaseIE):
             'title': 'Partiti acchiappavoti - Presa diretta del 13/09/2015',
             'description': 'md5:d291b03407ec505f95f27970c0b025f4',
             'upload_date': '20150913',
-            'subtitles': {
-                'it': 'count:2',
-            },
         },
         'params': {
             'skip_download': True,
@@ -395,7 +379,7 @@ class RaiIE(RaiBaseIE):
                     'url': compat_urlparse.urljoin(url, thumbnail_url),
                 })
 
-        subtitles = self._extract_subtitles(url, media)
+        subtitles = self._extract_subtitles(url, media.get('subtitlesUrl'))
 
         info = {
             'id': content_id,