From 0366ae875692bbe38867761952db70a62e32fd53 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 15 Nov 2020 09:03:40 +1300 Subject: [PATCH 1/2] Fix search to not depend on index position for videoRenderer and token items. --- youtube_dlc/extractor/youtube.py | 39 ++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/youtube_dlc/extractor/youtube.py b/youtube_dlc/extractor/youtube.py index 97cc793f9..76c98ba36 100644 --- a/youtube_dlc/extractor/youtube.py +++ b/youtube_dlc/extractor/youtube.py @@ -3336,10 +3336,33 @@ class YoutubeSearchIE(SearchInfoExtractor, YoutubePlaylistBaseInfoExtractor): list) if not slr_contents: break - isr_contents = try_get( - slr_contents, - lambda x: x[0]['itemSectionRenderer']['contents'], - list) + + isr_contents = [] + continuation_token = None + # Youtube sometimes adds promoted content to searches, + # changing the index location of videos and token. + # So we search through all entries till we find them. + for index, isr in enumerate(slr_contents): + if len(isr_contents) == 0: + isr_contents = try_get( + slr_contents, + (lambda x: x[index]['itemSectionRenderer']['contents']), + list) + for content in isr_contents: + if content.get('videoRenderer') is not None: + break + else: + isr_contents = [] + + if continuation_token is None: + continuation_token = try_get( + slr_contents, + lambda x: x[index]['continuationItemRenderer']['continuationEndpoint']['continuationCommand'][ + 'token'], + compat_str) + if continuation_token is not None and isr_contents != []: + break + if not isr_contents: break for content in isr_contents: @@ -3373,13 +3396,9 @@ class YoutubeSearchIE(SearchInfoExtractor, YoutubePlaylistBaseInfoExtractor): } if total == n: return - token = try_get( - slr_contents, - lambda x: x[1]['continuationItemRenderer']['continuationEndpoint']['continuationCommand']['token'], - compat_str) - if not token: + if not continuation_token: break - data['continuation'] = token + data['continuation'] = continuation_token def _get_n_results(self, query, n): """Get a specified number of results for a query""" From 9da76d30decd079dbd3ca3d708e475a6201754e4 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 15 Nov 2020 09:34:59 +1300 Subject: [PATCH 2/2] code consistency --- youtube_dlc/extractor/youtube.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dlc/extractor/youtube.py b/youtube_dlc/extractor/youtube.py index 76c98ba36..a9b591125 100644 --- a/youtube_dlc/extractor/youtube.py +++ b/youtube_dlc/extractor/youtube.py @@ -3343,7 +3343,7 @@ class YoutubeSearchIE(SearchInfoExtractor, YoutubePlaylistBaseInfoExtractor): # changing the index location of videos and token. # So we search through all entries till we find them. for index, isr in enumerate(slr_contents): - if len(isr_contents) == 0: + if not isr_contents: isr_contents = try_get( slr_contents, (lambda x: x[index]['itemSectionRenderer']['contents']), @@ -3360,7 +3360,7 @@ class YoutubeSearchIE(SearchInfoExtractor, YoutubePlaylistBaseInfoExtractor): lambda x: x[index]['continuationItemRenderer']['continuationEndpoint']['continuationCommand'][ 'token'], compat_str) - if continuation_token is not None and isr_contents != []: + if continuation_token is not None and isr_contents: break if not isr_contents: