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

cleanup files in any case

Browse source
This commit is contained in:
Jesse Bannon 2022-11-30 10:19:18 -08:00
parent 8cf2507952
commit df622206b6
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/ytdl_sub/subscriptions/subscription_download.py
View file

@ -190,21 +190,23 @@ class SubscriptionDownload(BaseSubscription, ABC):
if self.maintain_download_archive: if self.maintain_download_archive:
self._enhanced_download_archive.save_download_mappings() self._enhanced_download_archive.save_download_mappings()
# Clean up any files that remain
self._cleanup_entry_files(entry=entry)
def _process_entry( def _process_entry(
self, plugins: List[Plugin], dry_run: bool, entry: Entry, entry_metadata: FileMetadata self, plugins: List[Plugin], dry_run: bool, entry: Entry, entry_metadata: FileMetadata
) -> None: ) -> None:
entry_: Optional[Entry] = entry
# First, modify the entry with all plugins # First, modify the entry with all plugins
for plugin in sorted(plugins, key=lambda _plugin: _plugin.priority.modify_entry): for plugin in sorted(plugins, key=lambda _plugin: _plugin.priority.modify_entry):
# Return if it is None, it is indicated to not process any further # Break if it is None, it is indicated to not process any further
if (entry := plugin.modify_entry(entry)) is None: if (entry_ := plugin.modify_entry(entry_)) is None:
return break
self._post_process_entry( if entry_:
plugins=plugins, dry_run=dry_run, entry=entry, entry_metadata=entry_metadata self._post_process_entry(
) plugins=plugins, dry_run=dry_run, entry=entry, entry_metadata=entry_metadata
)
self._cleanup_entry_files(entry)
def _process_split_entry( def _process_split_entry(
self, split_plugin: Plugin, plugins: List[Plugin], dry_run: bool, entry: Entry self, split_plugin: Plugin, plugins: List[Plugin], dry_run: bool, entry: Entry
@ -227,22 +229,25 @@ class SubscriptionDownload(BaseSubscription, ABC):
# Then, perform the split # Then, perform the split
for split_entry, split_entry_metadata in split_plugin.split(entry=entry): for split_entry, split_entry_metadata in split_plugin.split(entry=entry):
split_entry_: Optional[Entry] = split_entry
for plugin in plugins_post_split: for plugin in plugins_post_split:
# Return if it is None, it is indicated to not process any further. # Return if it is None, it is indicated to not process any further.
# Break out of the plugin loop # Break out of the plugin loop
if (split_entry := plugin.modify_entry(split_entry)) is None: if (split_entry_ := plugin.modify_entry(split_entry_)) is None:
break break
# If split_entry is None from modify_entry, do not post process # If split_entry is None from modify_entry, do not post process
if split_entry: if split_entry_:
self._post_process_entry( self._post_process_entry(
plugins=plugins, plugins=plugins,
dry_run=dry_run, dry_run=dry_run,
entry=split_entry, entry=split_entry_,
entry_metadata=split_entry_metadata, entry_metadata=split_entry_metadata,
) )
self._cleanup_entry_files(split_entry)
def download(self, dry_run: bool = False) -> FileHandlerTransactionLog: def download(self, dry_run: bool = False) -> FileHandlerTransactionLog:
""" """
Performs the subscription download Performs the subscription download
@ -287,8 +292,6 @@ class SubscriptionDownload(BaseSubscription, ABC):
plugins=plugins, dry_run=dry_run, entry=entry, entry_metadata=entry_metadata plugins=plugins, dry_run=dry_run, entry=entry, entry_metadata=entry_metadata
) )
self._cleanup_entry_files(entry=entry)
for plugin in plugins: for plugin in plugins:
plugin.post_process_subscription() plugin.post_process_subscription()