yt_dlp/extractor/vidly.py

@@ -8,9 +8,9 @@ from ..utils.traversal import traverse_obj
 
 
 class VidlyIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:vid\.ly/|(?:s\.)?vid\.ly/embeded\.html\?(?:[^#]+&)?link=)(?P<id>\w+)'
+    _VALID_URL = r'https?://(?:vid\.ly/|(?:s\.)?vid\.ly/embeded.html\?(?:[^#/]+&)?link=)(?P<id>\w+)'
     _EMBED_REGEX = [r'<script[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//vid\.ly/\w+/embed[^\'"]+)',
-                    r'<iframe[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//(?:s\.)?vid\.ly/embeded\.html\?(?:[^#\'"]+&)?link=\w+[^\'"]+)']
+                    r'<iframe[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//(?:s\.)?vid\.ly/embeded.html\?(?:[^#/]+&)?link=\w+[^\'"]+)']
     _TESTS = [{
         # JWPlayer 7, Embeds forbidden
         'url': 'https://vid.ly/2i3o9j/embed',
@@ -55,29 +55,31 @@ class VidlyIE(InfoExtractor):
             f'https://vid.ly/{video_id}/embed', video_id, headers={'Referer': 'https://vid.ly/'})
         player = self._search_json(r'initCallback\(', embed_script, 'player', video_id)
 
-        player_type = player.get('player') or ''
+        if player['player'].startswith('jwplayer'):
-        if player_type.startswith('jwplayer'):
             return self._parse_jwplayer_data(player['config'], video_id)
-        elif not player_type.startswith('vidly'):
+        elif player['player'] == 'vidlyplayer':
-            raise ExtractorError(f'Unknown player type {player_type!r}')
+            formats = []
-
+            ext = mimetype2ext(traverse_obj(player, ('config', 'type')))
-        formats = []
+            if traverse_obj(player, ('config', 'source', {url_or_none})):
-        ext = mimetype2ext(traverse_obj(player, ('config', 'type')))
-        for source, fid in [('source', 'sd'), ('source_hd', 'hd')]:
-            if traverse_obj(player, ('config', source, {url_or_none})):
                 formats.append({
-                    'url': player['config'][source],
+                    'url': player['config']['source'],
-                    'format_id': f'http-{fid}',
+                    'format_id': 'http-sd',
                     'ext': ext,
                 })
-        # Has higher quality formats
+            if traverse_obj(player, ('config', 'source_hd', {url_or_none})):
-        formats.extend(self._extract_m3u8_formats(
+                formats.append({
-            f'https://d3fenhwk93s16g.cloudfront.net/{video_id}/hls.m3u8', video_id,
+                    'url': player['config']['source_hd'],
-            fatal=False, note='Requesting higher quality m3u8 formats',
+                    'format_id': 'http-hd',
-            errnote='No higher quality m3u8 formats found') or [])
+                    'ext': ext,
-
+                })
-        return {
+            # Has higher quality formats
-            'id': video_id,
+            formats.extend(self._extract_m3u8_formats(
-            'title': video_id,
+                f'https://d3fenhwk93s16g.cloudfront.net/{video_id}/hls.m3u8', video_id,
-            'formats': formats,
+                fatal=False, note='Trying to guess m3u8 URL') or [])
-        }
+            return {
+                'id': video_id,
+                'title': video_id,
+                'formats': formats,
+            }
+        else:
+            raise ExtractorError('Unknown player type')