From 530361126f556f8ff4a9ab1eab3f7fffdb59d89a Mon Sep 17 00:00:00 2001 From: nose-gnome <71675376+nose-gnome@users.noreply.github.com> Date: Wed, 27 Oct 2021 22:55:55 +0100 Subject: [PATCH] Modified code to account for extractors that do not specify field names. --- youtube_dl/extractor/common.py | 12 +++++++++--- youtube_dl/extractor/youtube.py | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 83b6db2f1..5b9844474 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -968,11 +968,17 @@ class InfoExtractor(object): urls, playlist_id=playlist_id, playlist_title=playlist_title) @staticmethod - def playlist_result(entries, **kwargs): + def playlist_result(entries, playlist_id=None, playlist_title=None, playlist_description=None, **kwargs): """Returns a playlist""" video_info = {'_type': 'playlist', - 'entries': entries, - **kwargs} + 'entries': entries} + video_info.update(kwargs) + if playlist_id: + video_info['id'] = playlist_id + if playlist_title: + video_info['title'] = playlist_title + if playlist_description is not None: + video_info['description'] = playlist_description return video_info def _search_regex(self, pattern, string, name, default=NO_DEFAULT, fatal=True, flags=0, group=None): diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 0b8093446..0983357f5 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -2806,8 +2806,8 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor): self._entries(selected_tab, item_id, webpage), playlist_id=playlist_id, playlist_title=title, playlist_description=description, - playlist_view_count=view_count, - playlist_last_update=last_updated) + view_count=view_count, + last_update=last_updated) playlist.update(self._extract_uploader(data)) return playlist