yt_dlp/extractor/digitalconcerthall.py

@@ -86,7 +86,7 @@ class DigitalConcertHallIE(InfoExtractor):
                 })
 
             m3u8_url = traverse_obj(
-                stream_info, ('channel', lambda k, _: k.startswith('vod_mixed'), 'stream', 0, 'url'), get_all=False)
+                stream_info, ('channel', lambda x: x.startswith('vod_mixed'), 'stream', 0, 'url'), get_all=False)
             formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', 'm3u8_native', fatal=False)
             self._sort_formats(formats)
 

yt_dlp/extractor/pornhub.py

@@ -21,7 +21,6 @@ from ..utils import (
     NO_DEFAULT,
     orderedSet,
     remove_quotes,
-    remove_start,
     str_to_int,
     update_url_query,
     urlencode_postdata,
@@ -199,16 +198,6 @@ class PornHubIE(PornHubBaseIE):
             'skip_download': True,
         },
         'skip': 'This video has been disabled',
-    }, {
-        'url': 'http://www.pornhub.com/view_video.php?viewkey=ph601dc30bae19a',
-        'info_dict': {
-            'id': 'ph601dc30bae19a',
-            'uploader': 'Projekt Melody',
-            'uploader_id': 'projekt-melody',
-            'upload_date': '20210205',
-            'title': '"Welcome to My Pussy Mansion" - CB Stream (02/03/21)',
-            'thumbnail': r're:https?://.+',
-        },
     }, {
         'url': 'http://www.pornhub.com/view_video.php?viewkey=ph557bbb6676d2d',
         'only_matching': True,
@@ -468,11 +457,9 @@ class PornHubIE(PornHubBaseIE):
         self._sort_formats(
             formats, field_preference=('height', 'width', 'fps', 'format_id'))
 
-        model_profile = self._search_json(
-            r'var\s+MODEL_PROFILE\s*=', webpage, 'model profile', video_id, fatal=False)
         video_uploader = self._html_search_regex(
             r'(?s)From:&nbsp;.+?<(?:a\b[^>]+\bhref=["\']/(?:(?:user|channel)s|model|pornstar)/|span\b[^>]+\bclass=["\']username)[^>]+>(.+?)<',
-            webpage, 'uploader', default=None) or model_profile.get('username')
+            webpage, 'uploader', default=None)
 
         def extract_vote_count(kind, name):
             return self._extract_count(
@@ -501,7 +488,6 @@ class PornHubIE(PornHubBaseIE):
         return merge_dicts({
             'id': video_id,
             'uploader': video_uploader,
-            'uploader_id': remove_start(model_profile.get('modelProfileLink'), '/model/'),
             'upload_date': upload_date,
             'title': title,
             'thumbnail': thumbnail,