Merge 49a68705dc7c506b35b4c4e7f83a132acad43c91 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

@@ -746,6 +746,7 @@ from .myvi import (
 )
 from .myvideoge import MyVideoGeIE
 from .myvidster import MyVidsterIE
+from .namava import NamavaIE
 from .nationalgeographic import (
     NationalGeographicVideoIE,
     NationalGeographicTVIE,

youtube_dl/extractor/namava.py

@@ -0,0 +1,97 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    urlencode_postdata,
+    url_or_none,
+    str_or_none,
+)
+
+
+class NamavaIE(InfoExtractor):
+    IE_NAME = 'namava'
+    _NETRC_MACHINE = IE_NAME
+    _VALID_URL = r'https?://(?:www\.)?play\.namava\.ir/.*\bm=(?P<id>[0-9]+)'
+    _TEST = {
+        'url': 'https://play.namava.ir/?m=52396&p=desktop',
+        'md5': '15639792543cc8e830a3451db1f44c72',
+        'info_dict': {
+            'id': '52396',
+            'ext': 'mp4',
+            'title': 'پلنگ صورتی - فصل ۴ قسمت ۱',
+            'description': 'ماجراهای سرگرم‌کننده و طنز پلنگ صورتی و اتفاقات غیرمنتظره‌ای که همیشه برای او رخ می‌دهد و او با زیرکی خاص خودش، راه‌حلی را پیدا می‌کند و...'
+        },
+    }
+
+    _LOGIN_URL = 'https://www.namava.ir/api/v1.0/accounts/by-phone/login'
+    HOST = 'www.namava.ir'
+
+    def _real_initialize(self):
+        self._login()
+
+    def _login(self):
+        username, password = self._get_login_info()
+
+        if not username:
+            raise ExtractorError(
+                'Unable to login: you have to pass username and password to logging in.',
+                expected=True)
+
+        login_data = {
+            'UserName': username,
+            'Password': password,
+        }
+        response = self._download_json(
+            self._LOGIN_URL, None,
+            'Logging in', data=urlencode_postdata(login_data))
+
+        if response.get('succeeded') is True:
+            self._set_cookie(self.HOST, 'auth_v2', response.get('result'))
+            return True
+
+        error = response.get('error', {})
+        error_message = error.get('message', '')
+        raise ExtractorError(
+            'Unable to login: %s said: %s' % (self.IE_NAME, error_message),
+            expected=True)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        info = self._download_json(
+            'https://www.namava.ir/api2/movie/' + video_id,
+            video_id, 'Fetching video info', headers={
+                'Accept': 'application/json, text/plain, */*',
+            })
+
+        title = info.get('Name')
+        if title is None:
+            raise ExtractorError(
+                'Unable to fetch video info',
+                expected=True)
+
+        media_info = info.get('MediaInfoModel', {})
+        domain = media_info.get('Domain') or ''
+        m3u8_file = media_info.get('File') or ''
+        m3u8_url = url_or_none(domain + m3u8_file)
+
+        formats = self._extract_m3u8_formats(
+            m3u8_url, video_id, ext='mp4', fatal=False)
+        self._sort_formats(formats)
+
+        url = formats[-1]['url']
+        if len(formats) > 1:
+            url = formats[-2]['url']
+
+        result = {
+            'id': video_id,
+            'title': title,
+            'ext': 'mp4',
+            'description': str_or_none(info.get('ShortDescription')),
+            'formats': formats,
+            'thumbnail': url_or_none(info.get('ImageAbsoluteUrl')),
+            'url': url
+        }
+        return result

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: