[ie/crunchyroll] Fix stream extraction (#10005)

[yt-dlp.git] / yt_dlp / extractor / senategov.py

diff --git a/yt_dlp/extractor/senategov.py b/yt_dlp/extractor/senategov.py
index bced143288ed48c44b20e2c507d18e676024afb7..7ff0cf5b72bfd0f84995b0b0c03724ad97132549 100644 (file)
--- a/yt_dlp/extractor/senategov.py
+++ b/yt_dlp/extractor/senategov.py
@@ -49,6 +49,7 @@
 class SenateISVPIE(InfoExtractor):
     _IE_NAME = 'senate.gov:isvp'
     _VALID_URL = r'https?://(?:www\.)?senate\.gov/isvp/?\?(?P<qs>.+)'
+    _EMBED_REGEX = [r"<iframe[^>]+src=['\"](?P<url>https?://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]"]
 
     _TESTS = [{
         'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png',
@@ -87,14 +88,6 @@ class SenateISVPIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    @staticmethod
-    def _search_iframe_url(webpage):
-        mobj = re.search(
-            r"<iframe[^>]+src=['\"](?P<url>https?://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]",
-            webpage)
-        if mobj:
-            return mobj.group('url')
-
     def _real_extract(self, url):
         url, smuggled_data = unsmuggle_url(url, {})
 
@@ -138,8 +131,6 @@ def _real_extract(self, url):
                     entry['format_id'] += mobj.group('tag')
                 formats.append(entry)
 
-            self._sort_formats(formats)
-
         return {
             'id': video_id,
             'title': title,
@@ -194,7 +185,6 @@ def _real_extract(self, url):
         formats = self._extract_m3u8_formats(
             f'{stream_domain}/i/{filename}_1@{stream_num}/master.m3u8',
             display_id, ext='mp4')
-        self._sort_formats(formats)
 
         title = self._html_search_regex(
             (*self._og_regexes('title'), r'(?s)<title>([^<]*?)</title>'), webpage, 'video title')