yt_dlp/extractor/peekvids.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
+from ..utils import remove_end
 
 
 class PeekVidsIE(InfoExtractor):
@@ -12,17 +13,11 @@ class PeekVidsIE(InfoExtractor):
     '''
     _TESTS = [{
         'url': 'https://peekvids.com/pc/dane-jones-cute-redhead-with-perfect-tits-with-mini-vamp/BSyLMbN0YCd',
-        'md5': 'a00940646c428e232407e3e62f0e8ef5',
+        'md5': '2ff6a357a9717dc9dc9894b51307e9a2',
         'info_dict': {
             'id': 'BSyLMbN0YCd',
-            'title': ' Dane Jones - Cute redhead with perfect tits with Mini Vamp, SEXYhub',
             'ext': 'mp4',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'description': 'Watch  Dane Jones - Cute redhead with perfect tits with Mini Vamp (7 min), uploaded by SEXYhub.com',
-            'timestamp': 1642579329,
-            'upload_date': '20220119',
-            'duration': 416,
-            'view_count': int,
+            'title': 'Dane Jones - Cute redhead with perfect tits with Mini Vamp',
             'age_limit': 18,
         },
     }]
@@ -45,37 +40,46 @@ class PeekVidsIE(InfoExtractor):
             formats = [{'url': url} for url in srcs.values()]
         self._sort_formats(formats)
 
-        info = self._search_json_ld(webpage, video_id, expected_type='VideoObject')
-        info.update({
+        title = remove_end(self._html_search_regex(
+            (r'<h1.*?>\s*(.+?)\s*</h1>', r'<title>\s*(.+?)\s*</title>'),
+            webpage, 'video title', default=None), ' - PeekVids')
+
+        return {
             'id': video_id,
+            'title': title,
             'age_limit': 18,
             'formats': formats,
-        })
-        return info
+        }
 
 
 class PlayVidsIE(PeekVidsIE):
     _VALID_URL = r'https?://(?:www\.)?playvids\.com/(?:embed/|[^/]{2}/)?(?P<id>[^/?#]*)'
     _TESTS = [{
         'url': 'https://www.playvids.com/U3pBrYhsjXM/pc/dane-jones-cute-redhead-with-perfect-tits-with-mini-vamp',
-        'md5': 'cd7dfd8a2e815a45402369c76e3c1825',
+        'md5': '2f12e50213dd65f142175da633c4564c',
         'info_dict': {
             'id': 'U3pBrYhsjXM',
-            'title': ' Dane Jones - Cute redhead with perfect tits with Mini Vamp, SEXYhub',
             'ext': 'mp4',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'description': 'Watch  Dane Jones - Cute redhead with perfect tits with Mini Vamp video in HD, uploaded by SEXYhub.com',
-            'timestamp': 1640435839,
-            'upload_date': '20211225',
-            'duration': 416,
-            'view_count': int,
+            'title': 'Dane Jones - Cute redhead with perfect tits with Mini Vamp',
             'age_limit': 18,
         },
     }, {
         'url': 'https://www.playvids.com/es/U3pBrYhsjXM/pc/dane-jones-cute-redhead-with-perfect-tits-with-mini-vamp',
-        'only_matching': True,
+        'md5': '2f12e50213dd65f142175da633c4564c',
+        'info_dict': {
+            'id': 'U3pBrYhsjXM',
+            'ext': 'mp4',
+            'title': 'Dane Jones - Cute redhead with perfect tits with Mini Vamp',
+            'age_limit': 18,
+        },
     }, {
         'url': 'https://www.playvids.com/embed/U3pBrYhsjXM',
-        'only_matching': True,
+        'md5': '2f12e50213dd65f142175da633c4564c',
+        'info_dict': {
+            'id': 'U3pBrYhsjXM',
+            'ext': 'mp4',
+            'title': 'U3pBrYhsjXM',
+            'age_limit': 18,
+        },
     }]
     _DOMAIN = 'www.playvids.com'

yt_dlp/extractor/twitcasting.py

@@ -220,17 +220,6 @@ class TwitCastingLiveIE(InfoExtractor):
             (r'data-type="movie" data-id="(\d+)">',
              r'tw-sound-flag-open-link" data-id="(\d+)" style=',),
             webpage, 'current live ID', default=None)
-        if not current_live:
-            # fetch unfiltered /show to find running livestreams; we can't get ID of the password-protected livestream above
-            webpage = self._download_webpage(
-                f'https://twitcasting.tv/{uploader_id}/show/', uploader_id,
-                note='Downloading live history')
-            is_live = self._search_regex(r'(?s)(<span\s*class="tw-movie-thumbnail-badge"\s*data-status="live">\s*LIVE)', webpage, 'is live?', default=None)
-            if is_live:
-                # get the first live; running live is always at the first
-                current_live = self._search_regex(
-                    r'(?s)<a\s+class="tw-movie-thumbnail"\s*href="/[^/]+/movie/(?P<video_id>\d+)"\s*>.+?</a>',
-                    webpage, 'current live ID 2', default=None, group='video_id')
         if not current_live:
             raise ExtractorError('The user is not currently live')
         return self.url_result('https://twitcasting.tv/%s/movie/%s' % (uploader_id, current_live))