]> jfr.im git - yt-dlp.git/blobdiff - yt_dlp/extractor/pladform.py
[ie/crunchyroll] Fix stream extraction (#10005)
[yt-dlp.git] / yt_dlp / extractor / pladform.py
index 301f5c83875f1947d34535cb0c86d7259d05db94..d67f6005c1795a08738002eb28c8bf3d99d2005c 100644 (file)
@@ -1,5 +1,3 @@
-import re
-
 from .common import InfoExtractor
 from ..utils import (
     determine_ext,
@@ -24,6 +22,7 @@ class PladformIE(InfoExtractor):
                         )
                         (?P<id>\d+)
                     '''
+    _EMBED_REGEX = [r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//out\.pladform\.ru/player\?.+?)\1']
     _TESTS = [{
         'url': 'http://out.pladform.ru/player?pl=18079&type=html5&videoid=100231282',
         'info_dict': {
@@ -36,7 +35,6 @@ class PladformIE(InfoExtractor):
             'thumbnail': str,
             'view_count': int,
             'description': str,
-            'category': list,
             'uploader_id': '12082',
             'uploader': 'Comedy Club',
             'duration': 367,
@@ -61,13 +59,6 @@ class PladformIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    @staticmethod
-    def _extract_url(webpage):
-        mobj = re.search(
-            r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//out\.pladform\.ru/player\?.+?)\1', webpage)
-        if mobj:
-            return mobj.group('url')
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
@@ -86,7 +77,7 @@ def fail(text):
                 expected=True)
 
         if not video:
-            targetUrl = self._request_webpage(url, video_id, note='Resolving final URL').geturl()
+            targetUrl = self._request_webpage(url, video_id, note='Resolving final URL').url
             if targetUrl == url:
                 raise ExtractorError('Can\'t parse page')
             return self.url_result(targetUrl)
@@ -119,8 +110,6 @@ def fail(text):
             if error:
                 fail(error)
 
-        self._sort_formats(formats)
-
         webpage = self._download_webpage(
             'http://video.pladform.ru/catalog/video/videoid/%s' % video_id,
             video_id)