mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-12-23 23:59:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unhandled exception during backup restoration process. #2850

Browse Source
This commit is contained in:
morpheus65535
2025-02-22 09:23:19 -05:00
parent b38f1df99c
commit 2f16ae2e50
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bazarr/utilities/backup.py
View File

@@ -80,7 +80,7 @@ def backup_to_zip():
backupZip.write(database_backup_file, 'bazarr.db')
try:
os.remove(database_backup_file)
except OSError:
except (OSError, FileNotFoundError):
logging.exception(f'Unable to delete temporary database backup file: {database_backup_file}')
else:
logging.debug('Database file is not included in backup. See previous exception')
@@ -104,7 +104,7 @@ def restore_from_backup():
try:
shutil.copy(restore_config_path, dest_config_path)
os.remove(restore_config_path)
except OSError:
except (OSError, FileNotFoundError):
logging.exception(f'Unable to restore or delete config file to {dest_config_path}')
else:
if new_config:
@@ -117,7 +117,7 @@ def restore_from_backup():
try:
shutil.copy(restore_database_path, dest_database_path)
os.remove(restore_database_path)
except OSError:
except (OSError, FileNotFoundError):
logging.exception(f'Unable to restore or delete db to {dest_database_path}')
else:
try:
@@ -125,11 +125,11 @@ def restore_from_backup():
os.remove(f'{dest_database_path}-shm')
if os.path.isfile(f'{dest_database_path}-wal'):
os.remove(f'{dest_database_path}-wal')
except OSError:
except (OSError, FileNotFoundError):
logging.exception('Unable to delete SHM and WAL file.')
try:
os.remove(restore_database_path)
except OSError:
except (OSError, FileNotFoundError):
logging.exception(f'Unable to delete {dest_database_path}')
logging.info('Backup restored successfully. Bazarr will restart.')
@@ -144,7 +144,7 @@ def restore_from_backup():
os.remove(restore_config_path)
except FileNotFoundError:
pass
except OSError:
except (OSError, FileNotFoundError):
logging.exception(f'Unable to delete {dest_config_path}')
@@ -154,7 +154,7 @@ def prepare_restore(filename):
success = False
try:
shutil.copy(src_zip_file_path, dest_zip_file_path)
except OSError:
except (OSError, FileNotFoundError):
logging.exception(f'Unable to copy backup archive to {dest_zip_file_path}')
else:
try:
@@ -167,7 +167,7 @@ def prepare_restore(filename):
finally:
try:
os.remove(dest_zip_file_path)
except OSError:
except (OSError, FileNotFoundError):
logging.exception(f'Unable to delete backup archive {dest_zip_file_path}')
if success:
@@ -192,7 +192,7 @@ def backup_rotation():
logging.debug(f'Deleting old backup file {file}')
try:
os.remove(file)
except OSError:
except (OSError, FileNotFoundError):
logging.debug(f'Unable to delete backup file {file}')
logging.debug('Finished cleaning up old backup files')
@@ -202,7 +202,7 @@ def delete_backup_file(filename):
try:
os.remove(backup_file_path)
return True
except OSError:
except (OSError, FileNotFoundError):
logging.debug(f'Unable to delete backup file {backup_file_path}')
return False