Merge ee3c3aec1720e2bf1ec500153970922bd677aa3d into 673277e510ebd996b62a2fcc76169bf3cce29910

* [YouTube] Extract playlist items from LOCKUP_VIEW_MODEL_...
* resolves #33073
* thx seproDev (yt-dlp/yt-dlp#11615)

Co-authored-by: sepro <sepro@sepr0.com>

youtube_dl/extractor/extractors.py

@@ -621,6 +621,10 @@ from .lifenews import (
     LifeNewsIE,
     LifeEmbedIE,
 )
+from .likee import (
+    LikeeIE,
+    LikeeUserIE,
+)
 from .limelight import (
     LimelightMediaIE,
     LimelightChannelIE,

youtube_dl/extractor/likee.py

@@ -0,0 +1,83 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+
+class LikeeIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?likee\.video/v/(?P<id>\w+)'
+    _TEST = {
+        'url': 'https://likee.video/v/k6QcOp',
+        'md5': '5e0988b2ea7615075735cef87c2ca14d',
+        'info_dict': {
+            'id': 'k6QcOp',
+            'ext': 'mp4',
+            'title': 'Agua challenge     😳😱',
+            'thumbnail': 'https://videosnap.like.video/na_live/3a2/1tVVI4_1.jpg?type=8',
+            'uploader': 'fernanda_rivasg'
+        }
+    }
+
+    def _real_initialize(self):
+        # Setup session (will set necessary cookies)
+        self._request_webpage(
+            'https://likee.video/', None, note='Setting up session')
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        # set title
+        title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title')
+        print(title + 'f')
+        # set thumbnail
+        thumbnail = self._html_search_regex(r'<meta property=\"og:image\" content=\"(.+?)\">', webpage, 'thumbnail')
+        # set uploader
+        uploader = self._html_search_regex(r'<meta name=\"keywords\"(.+?)>', webpage, 'uploader')
+        uploader = uploader.split(',')[1]
+        uploader = uploader.strip()
+
+        return {
+            'id': video_id,
+            'title': title,
+            'thumbnail': thumbnail,
+            'uploader': uploader,
+            'ext': 'mp4',
+            'url': url,
+        }
+
+
+class LikeeUserIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?likee\.video/p/(?P<id>\w+)'
+    _TEST = {
+        'url': 'https://l.likee.video/p/Gp6YGd',
+        'info_dict': {
+            'id': 'Gp6YGd'
+        },
+        'playlist_mincount': 10,
+    }
+
+    def _real_initialize(self):
+        # Setup session (will set necessary cookies)
+        self._request_webpage(
+            'https://likee.video/', None, note='Setting up session')
+
+    def _real_extract(self, url):
+        user_id = self._match_id(url)
+        webpage = self._download_webpage(url, user_id)
+        current_list = self._html_search_regex(r'\"itemListElement\": \[(.+?)\]', webpage, 'baseVideoList__list')
+        entries = []
+        for i in range(10):
+            next_result = self._html_search_regex(r'\{\"@type\":\"VideoObject\",(.+?)\},?', current_list, 'baseVideoList__list')
+            entry = {}
+            entry["title"] = self._html_search_regex(r'on Likee Mobile: (.+?)\"', next_result, 'title')
+            temp_url = self._html_search_regex(r'\"url\":\"(.+?)\"', next_result, 'url')
+            entry["url"] = temp_url.replace('\\', '')
+            entry["thumbnail"] = self._html_search_regex(r'\"thumbnailUrl\":\"(.+?)\"', next_result, 'thumbnail')
+            entry["uploader"] = self._html_search_regex(r'/@(.+?)\/', next_result, 'uploader')
+            entry["ext"] = 'mp4'
+            entry["description"] = self._html_search_regex(r'\"description\":\"(.+?)\"', next_result, 'description')
+            entry["id"] = self._html_search_regex(r'\/video\\\/(.+?)\"', next_result, 'id')
+            entries.append(entry)
+            current_list = current_list[len(next_result):]
+
+        return self.playlist_result(entries, user_id)

youtube_dl/extractor/youtube.py

@@ -27,6 +27,7 @@ from ..compat import (
 )
 from ..jsinterp import JSInterpreter
 from ..utils import (
+    bug_reports_message,
     clean_html,
     dict_get,
     error_to_compat_str,
@@ -65,6 +66,7 @@ from ..utils import (
     url_or_none,
     urlencode_postdata,
     urljoin,
+    variadic,
 )
 
 
@@ -460,6 +462,26 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
             'uploader': uploader,
         }
 
+    @staticmethod
+    def _extract_thumbnails(data, *path_list, **kw_final_key):
+        """
+        Extract thumbnails from thumbnails dict
+        @param path_list: path list to level that contains 'thumbnails' key
+        """
+        final_key = kw_final_key.get('final_key', 'thumbnails')
+
+        return traverse_obj(data, ((
+            tuple(variadic(path) + (final_key, Ellipsis)
+                  for path in path_list or [()])), {
+            'url': ('url', T(url_or_none),
+                    # Sometimes youtube gives a wrong thumbnail URL. See:
+                    # https://github.com/yt-dlp/yt-dlp/issues/233
+                    # https://github.com/ytdl-org/youtube-dl/issues/28023
+                    T(lambda u: update_url(u, query=None) if u and 'maxresdefault' in u else u)),
+            'height': ('height', T(int_or_none)),
+            'width': ('width', T(int_or_none)),
+        }, T(lambda t: t if t.get('url') else None)))
+
     def _search_results(self, query, params):
         data = {
             'context': {
@@ -3183,8 +3205,12 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             expected_type=txt_or_none)
 
     def _grid_entries(self, grid_renderer):
-        for item in grid_renderer['items']:
-            if not isinstance(item, dict):
+        for item in traverse_obj(grid_renderer, ('items', Ellipsis, T(dict))):
+            lockup_view_model = traverse_obj(item, ('lockupViewModel', T(dict)))
+            if lockup_view_model:
+                entry = self._extract_lockup_view_model(lockup_view_model)
+                if entry:
+                    yield entry
                 continue
             renderer = self._extract_grid_item_renderer(item)
             if not isinstance(renderer, dict):
@@ -3268,6 +3294,25 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
                 continue
             yield self._extract_video(renderer)
 
+    def _extract_lockup_view_model(self, view_model):
+        content_id = view_model.get('contentId')
+        if not content_id:
+            return
+        content_type = view_model.get('contentType')
+        if content_type not in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):
+            self.report_warning(
+                'Unsupported lockup view model content type "{0}"{1}'.format(content_type, bug_reports_message()), only_once=True)
+            return
+        return merge_dicts(self.url_result(
+            update_url_query('https://www.youtube.com/playlist', {'list': content_id}),
+            ie=YoutubeTabIE.ie_key(), video_id=content_id), {
+                'title': traverse_obj(view_model, (
+                    'metadata', 'lockupMetadataViewModel', 'title', 'content', T(compat_str))),
+                'thumbnails': self._extract_thumbnails(view_model, (
+                    'contentImage', 'collectionThumbnailViewModel', 'primaryThumbnail',
+                    'thumbnailViewModel', 'image'), final_key='sources'),
+        })
+
     def _video_entry(self, video_renderer):
         video_id = video_renderer.get('videoId')
         if video_id: