SenateISVPIE

yt_dlp/extractor/generic.py

@@ -1091,18 +1091,6 @@ class GenericIE(InfoExtractor):
             'title': 'Yhdysvaltojen Texasin osavaltiota ovat koetelleet tuhoisat tulvat',
         },
         'skip': 'IE fix required',
-    }, {
-        # 🔧95
-        # SenateISVPIE
-        'url': 'https://www.hsgac.senate.gov/subcommittees/bmfwra/hearings/match-ready-oversight-of-the-federal-governments-border-management-and-personnel-readiness-efforts-for-the-decade-of-sports/',
-        'info_dict': {
-            'id': 'govtaff061025',
-            'ext': 'mp4',
-            'title': 'ISVP',
-            'thumbnail': 'https://www.hsgac.senate.gov/wp-content/uploads/HSGAC_VideoPoster_WatchVideo.jpeg',
-            '_old_archive_ids': ['senategov govtaff061025'],
-        },
-        'skip': 'IE fix required; embed detection',
     }, {
         # ✅124
         # YoutubeIE

yt_dlp/extractor/senategov.py

@@ -23,13 +23,10 @@ class SenateISVPIE(InfoExtractor):
             'id': 'judiciary031715',
             'ext': 'mp4',
             'title': 'ISVP',
-            'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
+            'thumbnail': r're:https?://.+\.(?:jpe?g|png)',
             '_old_archive_ids': ['senategov judiciary031715'],
         },
-        'params': {
+        'params': {'skip_download': 'm3u8'},
-            # m3u8 download
-            'skip_download': True,
-        },
         'expected_warnings': ['Failed to download m3u8 information'],
     }, {
         'url': 'http://www.senate.gov/isvp/?type=live&comm=commerce&filename=commerce011514.mp4&auto_play=false',
@@ -39,10 +36,6 @@ class SenateISVPIE(InfoExtractor):
             'title': 'Integrated Senate Video Player',
             '_old_archive_ids': ['senategov commerce011514'],
         },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
         'skip': 'This video is not available.',
     }, {
         'url': 'http://www.senate.gov/isvp/?type=arch&comm=intel&filename=intel090613&hc_location=ufi',
@@ -60,7 +53,7 @@ class SenateISVPIE(InfoExtractor):
             'id': 'help090920',
             'ext': 'mp4',
             'title': 'ISVP',
-            'thumbnail': 'https://www.help.senate.gov/assets/images/video-poster.png',
+            'thumbnail': r're:https?://.+\.(?:jpe?g|png)',
             '_old_archive_ids': ['senategov help090920'],
         },
     }, {
@@ -68,6 +61,17 @@ class SenateISVPIE(InfoExtractor):
         'url': 'http://www.senate.gov/isvp?type=live&comm=banking&filename=banking012715',
         'only_matching': True,
     }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.hsgac.senate.gov/subcommittees/bmfwra/hearings/match-ready-oversight-of-the-federal-governments-border-management-and-personnel-readiness-efforts-for-the-decade-of-sports/',
+        'info_dict': {
+            'id': 'govtaff061025',
+            'ext': 'mp4',
+            'title': 'ISVP',
+            'thumbnail': r're:https?://.+\.(?:jpe?g|png)',
+            '_old_archive_ids': ['senategov govtaff061025'],
+        },
+        'skip': 'IE fix required; embed detection',
+    }]
 
     _COMMITTEES = {
         'ag': ('76440', 'https://ag-f.akamaihd.net', '2036803', 'agriculture'),
@@ -150,10 +154,10 @@ class SenateGovIE(InfoExtractor):
             'id': 'help090920',
             'display_id': 'vaccines-saving-lives-ensuring-confidence-and-protecting-public-health',
             'title': 'Vaccines: Saving Lives, Ensuring Confidence, and Protecting Public Health',
-            'description': 'The U.S. Senate Committee on Health, Education, Labor & Pensions',
+            'description': 'md5:00c6fa23d03db22c02e40fcb492b7f9d',
             'ext': 'mp4',
             'age_limit': 0,
-            'thumbnail': 'https://www.help.senate.gov/assets/images/sharelogo.jpg',
+            'thumbnail': r're:https?://.+\.(?:jpe?g|png)',
             '_old_archive_ids': ['senategov help090920'],
         },
         'params': {'skip_download': 'm3u8'},
@@ -165,7 +169,7 @@ class SenateGovIE(InfoExtractor):
             'title': 'Review of the FY2019 Budget Request for the U.S. Army',
             'ext': 'mp4',
             'age_limit': 0,
-            'thumbnail': 'https://www.appropriations.senate.gov/themes/appropriations/images/video-poster-flash-fit.png',
+            'thumbnail': r're:https?://.+\.(?:jpe?g|png)',
             '_old_archive_ids': ['senategov appropsA051518'],
         },
         'params': {'skip_download': 'm3u8'},
@@ -176,9 +180,9 @@ class SenateGovIE(InfoExtractor):
             'id': 'banking041521',
             'display_id': '21st-century-communities-public-transportation-infrastructure-investment-and-fast-act-reauthorization',
             'title': '21st Century Communities: Public Transportation Infrastructure Investment and FAST Act Reauthorization',
-            'description': 'The Official website of The United States Committee on Banking, Housing, and Urban Affairs',
+            'description': 'md5:bc9496ea2ea0c35694ad9b2ec8a54cc3',
             'ext': 'mp4',
-            'thumbnail': 'https://www.banking.senate.gov/themes/banking/images/sharelogo.jpg',
+            'thumbnail': r're:https?://.+\.(?:jpe?g|png)',
             'age_limit': 0,
             '_old_archive_ids': ['senategov banking041521'],
         },