MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-24 05:36:56 +01:00
Code Issues Projects Releases Wiki Activity

[youtube] Extract even more thumbnails and reduce testing

Browse Source 
* Also fix bug where `_test_url` was being ignored

Ref: https://stackoverflow.com/a/20542029
Related: #340
This commit is contained in:
pukkandan 2021-07-20 03:40:35 +05:30
parent c634ad2a3c
commit cca80fe611
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yt_dlp/YoutubeDL.py
View File

@ -1949,12 +1949,15 @@ def _sanitize_thumbnails(self, info_dict):
def thumbnail_tester(): def thumbnail_tester():
if self.params.get('check_formats'): if self.params.get('check_formats'):
def to_screen(msg): test_all = True
return self.to_screen(f'[info] {msg}') to_screen = lambda msg: self.to_screen(f'[info] {msg}')
else: else:
test_all = False
to_screen = self.write_debug to_screen = self.write_debug
def test_thumbnail(t): def test_thumbnail(t):
if not test_all and not t.get('_test_url'):
return True
to_screen('Testing thumbnail %s' % t['id']) to_screen('Testing thumbnail %s' % t['id'])
try: try:
self.urlopen(HEADRequest(t['url'])) self.urlopen(HEADRequest(t['url']))

18
yt_dlp/extractor/youtube.py
View File

@ -2658,8 +2658,6 @@ def feed_entry(name):
owner_profile_url = microformat.get('ownerProfileUrl') owner_profile_url = microformat.get('ownerProfileUrl')
thumbnails = [] thumbnails = []
thumbnail_types = ['maxresdefault', 'sddefault', 'hqdefault', '0', 'mqdefault', 'default', '1', '2', '3']
for container in (video_details, microformat): for container in (video_details, microformat):
for thumbnail in (try_get( for thumbnail in (try_get(
container, container,
@ -2684,14 +2682,24 @@ def feed_entry(name):
}) })
# The best resolution thumbnails sometimes does not appear in the webpage # The best resolution thumbnails sometimes does not appear in the webpage
# See: https://github.com/ytdl-org/youtube-dl/issues/29049, https://github.com/yt-dlp/yt-dlp/issues/340 # See: https://github.com/ytdl-org/youtube-dl/issues/29049, https://github.com/yt-dlp/yt-dlp/issues/340
# List of possible thumbnails - Ref: <https://stackoverflow.com/a/20542029>
hq_thumbnail_names = ['maxresdefault', 'hq720', 'sddefault', 'sd1', 'sd2', 'sd3']
guaranteed_thumbnail_names = [
'hqdefault', 'hq1', 'hq2', 'hq3', '0',
'mqdefault', 'mq1', 'mq2', 'mq3',
'default', '1', '2', '3'
]
thumbnail_names = hq_thumbnail_names + guaranteed_thumbnail_names
n_thumbnail_names = len(thumbnail_names)
thumbnails.extend({ thumbnails.extend({
'url': 'https://i.ytimg.com/vi{webp}/{video_id}/{name}{live}.{ext}'.format( 'url': 'https://i.ytimg.com/vi{webp}/{video_id}/{name}{live}.{ext}'.format(
video_id=video_id, name=name, ext=ext, video_id=video_id, name=name, ext=ext,
webp='_webp' if ext == 'webp' else '', live='_live' if is_live else ''), webp='_webp' if ext == 'webp' else '', live='_live' if is_live else ''),
'_test_url': True, '_test_url': name in hq_thumbnail_names,
} for name in thumbnail_types for ext in ('webp', 'jpg')) } for name in thumbnail_names for ext in ('webp', 'jpg'))
for thumb in thumbnails: for thumb in thumbnails:
i = next((i for i, t in enumerate(thumbnail_types) if f'/{video_id}/{t}' in thumb['url']), 20) i = next((i for i, t in enumerate(thumbnail_names) if f'/{video_id}/{t}' in thumb['url']), n_thumbnail_names)
thumb['preference'] = (0 if '.webp' in thumb['url'] else -1) - (2 * i) thumb['preference'] = (0 if '.webp' in thumb['url'] else -1) - (2 * i)
self._remove_duplicate_formats(thumbnails) self._remove_duplicate_formats(thumbnails)