[tenplay] Improve extractor (#3280)

Authored by: aarubui

yt_dlp/extractor/tenplay.py

@@ -7,6 +7,7 @@ import base64
 from .common import InfoExtractor
 from ..utils import (
     HEADRequest,
+    int_or_none,
     urlencode_postdata,
 )
 
@@ -15,6 +16,28 @@ class TenPlayIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?10play\.com\.au/(?:[^/]+/)+(?P<id>tpv\d{6}[a-z]{5})'
     _NETRC_MACHINE = '10play'
     _TESTS = [{
+        'url': 'https://10play.com.au/neighbours/web-extras/season-39/nathan-borg-is-the-first-aussie-actor-with-a-cochlear-implant-to-join-neighbours/tpv210128qupwd',
+        'info_dict': {
+            'id': '6226844312001',
+            'ext': 'mp4',
+            'title': 'Nathan Borg Is The First Aussie Actor With A Cochlear Implant To Join Neighbours',
+            'alt_title': 'Nathan Borg Is The First Aussie Actor With A Cochlear Implant To Join Neighbours',
+            'description': 'md5:a02d0199c901c2dd4c796f1e7dd0de43',
+            'duration': 186,
+            'season': 39,
+            'series': 'Neighbours',
+            'thumbnail': r're:https://.*\.jpg',
+            'uploader': 'Channel 10',
+            'age_limit': 15,
+            'timestamp': 1611810000,
+            'upload_date': '20210128',
+            'uploader_id': '2199827728001',
+        },
+        'params': {
+            'skip_download': True,
+        },
+        'skip': 'Only available in Australia',
+    }, {
         'url': 'https://10play.com.au/todd-sampsons-body-hack/episodes/season-4/episode-7/tpv200921kvngh',
         'info_dict': {
             'id': '6192880312001',
@@ -62,12 +85,17 @@ class TenPlayIE(InfoExtractor):
 
     def _real_extract(self, url):
         content_id = self._match_id(url)
-        _token = self._get_bearer_token(content_id)
         data = self._download_json(
             'https://10play.com.au/api/v1/videos/' + content_id, content_id)
+        headers = {}
+
+        if data.get('memberGated') is True:
+            _token = self._get_bearer_token(content_id)
+            headers = {'Authorization': _token}
+
         _video_url = self._download_json(
             data.get('playbackApiEndpoint'), content_id, 'Downloading video JSON',
-            headers={'Authorization': _token}).get('source')
+            headers=headers).get('source')
         m3u8_url = self._request_webpage(HEADRequest(
             _video_url), content_id).geturl()
         if '10play-not-in-oz' in m3u8_url:
@@ -77,12 +105,16 @@ class TenPlayIE(InfoExtractor):
 
         return {
             'formats': formats,
+            'subtitles': {'en': [{'url': data.get('captionUrl')}]} if data.get('captionUrl') else None,
             'id': data.get('altId') or content_id,
-            'title': data.get('title'),
+            'duration': data.get('duration'),
+            'title': data.get('subtitle'),
+            'alt_title': data.get('title'),
             'description': data.get('description'),
             'age_limit': self._AUS_AGES.get(data.get('classification')),
-            'series': data.get('showName'),
-            'season': data.get('showContentSeason'),
+            'series': data.get('tvShow'),
+            'season': int_or_none(data.get('season')),
+            'episode_number': int_or_none(data.get('episode')),
             'timestamp': data.get('published'),
             'thumbnail': data.get('imageUrl'),
             'uploader': 'Channel 10',

yt_dlp/extractor/youtube.py

@@ -3777,7 +3777,7 @@ class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
     def _extract_basic_item_renderer(item):
         # Modified from _extract_grid_item_renderer
         known_basic_renderers = (
-            'playlistRenderer', 'videoRenderer', 'channelRenderer', 'showRenderer'
+            'playlistRenderer', 'videoRenderer', 'channelRenderer', 'showRenderer', 'reelItemRenderer'
         )
         for key, renderer in item.items():
             if not isinstance(renderer, dict):
@@ -3992,7 +3992,8 @@ class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
                 known_renderers = {
                     'playlistVideoListRenderer': self._playlist_entries,
                     'gridRenderer': self._grid_entries,
-                    'shelfRenderer': lambda x: self._shelf_entries(x),
+                    'reelShelfRenderer': self._grid_entries,
+                    'shelfRenderer': self._shelf_entries,
                     'musicResponsiveListItemRenderer': lambda x: [self._music_reponsive_list_entry(x)],
                     'backstagePostThreadRenderer': self._post_thread_entries,
                     'videoRenderer': lambda x: [self._video_entry(x)],
@@ -4170,7 +4171,7 @@ class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
                 })
 
         primary_thumbnails = self._extract_thumbnails(
-            primary_sidebar_renderer, ('thumbnailRenderer', 'playlistVideoThumbnailRenderer', 'thumbnail'))
+            primary_sidebar_renderer, ('thumbnailRenderer', ('playlistVideoThumbnailRenderer', 'playlistCustomThumbnailRenderer'), 'thumbnail'))
 
         if playlist_id is None:
             playlist_id = item_id