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

asdf

Browse source
This commit is contained in:
Jesse Bannon 2023-10-03 12:41:35 -07:00
parent 2b01827e84
commit 29b73ee299
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ytdl_sub/config/preset_options.py
View file

@ -368,8 +368,9 @@ class OutputOptions(StrictDictValidator):
def migrated_download_archive_name(self) -> Optional[OverridesStringFormatterValidator]: def migrated_download_archive_name(self) -> Optional[OverridesStringFormatterValidator]:
""" """
Optional. Intended to be used if you are migrating a subscription with either a new Optional. Intended to be used if you are migrating a subscription with either a new
subscription name or output directory. If ``download_archive_name`` cannot be found, subscription name or output directory. It will try to load the archive file using this name
it will try to find the first, and fallback to ``download_archive_name``. It will always save to this file
and remove the original ``download_archive_name``.
""" """
return self._migrated_download_archive_name return self._migrated_download_archive_name

7
src/ytdl_sub/ytdl_additions/enhanced_download_archive.py
View file

@ -371,7 +371,7 @@ class EnhancedDownloadArchive:
if os.path.isfile(migrated_mapping_file_path): if os.path.isfile(migrated_mapping_file_path):
logger.warning( logger.warning(
"Loading migrated archive file, can now replace " "Loading migrated archive file, can now replace "
"`output_options.download_archive` value with the contents of " "`output_options.download_archive` with the contents of "
"`output_options.migrated_download_archive`" "`output_options.migrated_download_archive`"
) )
return DownloadMappings.from_file(migrated_mapping_file_path) return DownloadMappings.from_file(migrated_mapping_file_path)
@ -578,8 +578,9 @@ class EnhancedDownloadArchive:
self.save_file_to_output_directory( self.save_file_to_output_directory(
file_name=self.file_name, output_file_name=self._migrated_file_name file_name=self.file_name, output_file_name=self._migrated_file_name
) )
# and delete the old one # and delete the old one if the name differs
self.delete_file_from_output_directory(file_name=self.file_name) if self._file_name != self._migrated_file_name:
self.delete_file_from_output_directory(file_name=self.file_name)
# Otherwise, only save if there are changes to the transaction log # Otherwise, only save if there are changes to the transaction log
elif not self.get_file_handler_transaction_log().is_empty: elif not self.get_file_handler_transaction_log().is_empty:
self._download_mapping.to_file(output_json_file=self.working_file_path) self._download_mapping.to_file(output_json_file=self.working_file_path)