danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[BACKEND] Handle case when collection url is missing from entry

Browse source
This commit is contained in:
Jesse Bannon 2023-03-21 13:18:15 -07:00
parent 7385aac1ee
commit ff824126cd
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ytdl_sub/downloaders/url/downloader.py
View file

@ -175,7 +175,7 @@ class UrlDownloaderThumbnailPlugin(BaseDownloaderPlugin):
""" """
Use the entry to download thumbnails (or move if LATEST_ENTRY) Use the entry to download thumbnails (or move if LATEST_ENTRY)
""" """
if entry.kwargs(COLLECTION_URL) in self._collection_url_mapping: if entry.kwargs_get(COLLECTION_URL) in self._collection_url_mapping:
self._download_url_thumbnails( self._download_url_thumbnails(
collection_url=self._collection_url_mapping[entry.kwargs(COLLECTION_URL)], collection_url=self._collection_url_mapping[entry.kwargs(COLLECTION_URL)],
entry=entry, entry=entry,
@ -205,10 +205,16 @@ class UrlDownloaderCollectionVariablePlugin(BaseDownloaderPlugin):
""" """
Add collection variables to the entry Add collection variables to the entry
""" """
collection_url: Optional[UrlValidator] = self._collection_url_mapping.get( # COLLECTION_URL is a recent variable that may not exist for old entries when updating.
entry.kwargs(COLLECTION_URL) # Try to use source_webpage_url if it does not exist
entry_collection_url = entry.kwargs_get(COLLECTION_URL, entry.source_webpage_url)
# If the collection URL cannot find its mapping, use the last URL
collection_url = (
self._collection_url_mapping.get(entry_collection_url)
or list(self._collection_url_mapping.values())[-1]
) )
if collection_url:
entry.add_variables(variables_to_add=collection_url.variables.dict_with_format_strings) entry.add_variables(variables_to_add=collection_url.variables.dict_with_format_strings)
return entry return entry