Update upstream source from tag 'upstream/2020.06.16'

[youtubedl] / youtube_dl / extractor / restudy.py

diff --git a/youtube_dl/extractor/restudy.py b/youtube_dl/extractor/restudy.py
index b17c2bfc06b7bd63a1abc4bc112c6692d98b9756..d47fb45ca5f7ce73e2905136f579cdaa6937fb32 100644 (file)
--- a/youtube_dl/extractor/restudy.py
+++ b/youtube_dl/extractor/restudy.py
@@ -5,8 +5,8 @@ from .common import InfoExtractor
 
 
 class RestudyIE(InfoExtractor):
 
 
 class RestudyIE(InfoExtractor):

-    _VALID_URL = r'https?://(?:www\.)?restudy\.dk/video/play/id/(?P<id>[0-9]+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:(?:www|portal)\.)?restudy\.dk/video/[^/]+/id/(?P<id>[0-9]+)'
+    _TESTS = [{

         'url': 'https://www.restudy.dk/video/play/id/1637',
         'info_dict': {
             'id': '1637',
         'url': 'https://www.restudy.dk/video/play/id/1637',
         'info_dict': {
             'id': '1637',


@@ -18,7 +18,10 @@ class RestudyIE(InfoExtractor):
             # rtmp download
             'skip_download': True,
         }
             # rtmp download
             'skip_download': True,
         }

-    }
+    }, {
+        'url': 'https://portal.restudy.dk/video/leiden-frosteffekt/id/1637',
+        'only_matching': True,
+    }]

 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
     def _real_extract(self, url):
         video_id = self._match_id(url)


@@ -29,8 +32,9 @@ class RestudyIE(InfoExtractor):
         description = self._og_search_description(webpage).strip()
 
         formats = self._extract_smil_formats(
         description = self._og_search_description(webpage).strip()
 
         formats = self._extract_smil_formats(

-            'https://www.restudy.dk/awsmedia/SmilDirectory/video_%s.xml' % video_id,
+            'https://cdn.portal.restudy.dk/dynamic/themes/front/awsmedia/SmilDirectory/video_%s.xml' % video_id,

             video_id)
             video_id)

+        self._sort_formats(formats)

 
         return {
             'id': video_id,
 
         return {
             'id': video_id,