From 1061570d517257563e5d5e3ded3df4acb44daba4 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Mon, 8 Jan 2024 17:26:20 -0800 Subject: [PATCH] lint, max iter 3 --- src/ytdl_sub/downloaders/url/downloader.py | 1 - src/ytdl_sub/downloaders/ytdlp.py | 6 ++++-- src/ytdl_sub/entries/entry_parent.py | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ytdl_sub/downloaders/url/downloader.py b/src/ytdl_sub/downloaders/url/downloader.py index b1be016b..f6f32605 100644 --- a/src/ytdl_sub/downloaders/url/downloader.py +++ b/src/ytdl_sub/downloaders/url/downloader.py @@ -404,7 +404,6 @@ class MultiUrlDownloader(SourcePlugin[MultiUrlValidator]): ) parents = EntryParent.from_entry_dicts( - url=url, entry_dicts=entry_dicts, working_directory=self.working_directory, include_sibling_metadata=include_sibling_metadata, diff --git a/src/ytdl_sub/downloaders/ytdlp.py b/src/ytdl_sub/downloaders/ytdlp.py index 30ab3bac..0f43b606 100644 --- a/src/ytdl_sub/downloaders/ytdlp.py +++ b/src/ytdl_sub/downloaders/ytdlp.py @@ -238,15 +238,17 @@ class YTDLP: cls.logger.info("MaxDownloadsReached, stopping additional downloads.") # For YouTube playlists in particular, channel metadata is not fetched. Attempt to get - # channel metadata via grabbing uploader_url info json + # channel metadata via grabbing uploader_url info json a max of 3 times + current_iter = 0 url = kwargs.get("url") uploader_url = parent_dict.get("uploader_url") - while uploader_url and url != uploader_url: + while current_iter < 3 and uploader_url and url != uploader_url: cls.logger.debug("Attempting to get parent metadata from URL %s", uploader_url) parent_dict = cls.extract_info( ytdl_options_overrides=ytdl_options_overrides | {"playlist_items": "0:0"}, url=uploader_url, ) + current_iter += 1 url = uploader_url uploader_url = parent_dict.get("uploader_url") diff --git a/src/ytdl_sub/entries/entry_parent.py b/src/ytdl_sub/entries/entry_parent.py index 79891a30..3257d17c 100644 --- a/src/ytdl_sub/entries/entry_parent.py +++ b/src/ytdl_sub/entries/entry_parent.py @@ -178,7 +178,6 @@ class EntryParent(BaseEntry): @classmethod def from_entry_dicts( cls, - url: str, entry_dicts: List[Dict], working_directory: str, include_sibling_metadata: bool,