fuxino/simple_backup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix minor bugs and improve exception handling

Browse Source
This commit is contained in:
daniele 2023-05-11 20:18:42 +02:00
parent ca0e3d133f
commit 5a4a26f9a7
Signed by: fuxino
GPG Key ID: 981A2B2A3BBF5514
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
simple_backup/simple_backup.py
View File

@ -17,7 +17,7 @@ from dotenv import load_dotenv
try: try:
from systemd import journal from systemd import journal
except ImportError: except ImportError:
pass journal = None
load_dotenv() load_dotenv()
@ -38,14 +38,12 @@ c_format = logging.Formatter('%(name)s - %(levelname)s - %(message)s')
c_handler.setFormatter(c_format) c_handler.setFormatter(c_format)
logger.addHandler(c_handler) logger.addHandler(c_handler)
try: if journal:
j_handler = journal.JournalHandler() j_handler = journal.JournalHandler()
j_handler.setLevel(logging.INFO) j_handler.setLevel(logging.INFO)
j_format = logging.Formatter('%(levelname)s - %(message)s') j_format = logging.Formatter('%(levelname)s - %(message)s')
j_handler.setFormatter(j_format) j_handler.setFormatter(j_format)
logger.addHandler(j_handler) logger.addHandler(j_handler)
except NameError:
pass
def timing(_logger): def timing(_logger):
@ -91,17 +89,6 @@ class Backup:
return False return False
for i in self.inputs:
if os.path.islink(i):
try:
i_new = os.readlink(i)
logger.info(f'Input {i} is a symbolic link referencing {i_new}. Copying {i_new} instead')
self.inputs.remove(i)
self.inputs.append(i_new)
except Exception:
logger.warning(f'Input {i} is a link and cannot be read. Skipping')
self.inputs.remove(i)
if self.output is None: if self.output is None:
logger.critical('No output path specified. Use -o argument or specify output path in configuration file') logger.critical('No output path specified. Use -o argument or specify output path in configuration file')
@ -129,9 +116,7 @@ class Backup:
def remove_old_backups(self): def remove_old_backups(self):
try: try:
dirs = os.listdir(f'{self.output}/simple_backup') dirs = os.listdir(f'{self.output}/simple_backup')
except Exception: except FileNotFoundError:
logger.info('No older backups to remove')
return return
if dirs.count('last_backup') > 0: if dirs.count('last_backup') > 0:
@ -148,8 +133,10 @@ class Backup:
try: try:
rmtree(f'{self.output}/simple_backup/{dirs[i]}') rmtree(f'{self.output}/simple_backup/{dirs[i]}')
count += 1 count += 1
except Exception: except FileNotFoundError:
logger.error(f'Error while removing backup {dirs[i]}') logger.error(f'Error while removing backup {dirs[i]}. Directory not found')
except PermissionError:
logger.error(f'Error while removing backup {dirs[i]}. Permission denied')
if count == 1: if count == 1:
logger.info(f'Removed {count} backup') logger.info(f'Removed {count} backup')
@ -158,15 +145,14 @@ class Backup:
def find_last_backup(self): def find_last_backup(self):
if os.path.islink(f'{self.output}/simple_backup/last_backup'): if os.path.islink(f'{self.output}/simple_backup/last_backup'):
try: link = os.readlink(f'{self.output}/simple_backup/last_backup')
self._last_backup = os.readlink(f'{self.output}/simple_backup/last_backup')
except Exception: if os.path.isdir(link):
logger.warning('Previous backup could not be read') self._last_backup = link
else:
logger.info('No previous backups available')
else: else:
logger.info('No previous backups available') logger.info('No previous backups available')
if not os.path.isdir(self._last_backup):
logger.warning('Previous backup could not be read')
# Function to read configuration file # Function to read configuration file
@timing(logger) @timing(logger)
@ -179,8 +165,11 @@ class Backup:
if os.path.islink(f'{self.output}/simple_backup/last_backup'): if os.path.islink(f'{self.output}/simple_backup/last_backup'):
try: try:
os.remove(f'{self.output}/simple_backup/last_backup') os.remove(f'{self.output}/simple_backup/last_backup')
except Exception: except FileNotFoundError:
logger.error('Failed to remove last_backup link') logger.error('Failed to remove last_backup link. File not found')
self._err_flag = True
except PermissionError:
logger.error('Failed to remove last_backup link. Permission denied')
self._err_flag = True self._err_flag = True
_, self._inputs_path = mkstemp(prefix='tmp_inputs', text=True) _, self._inputs_path = mkstemp(prefix='tmp_inputs', text=True)
@ -219,9 +208,12 @@ class Backup:
logger.info(f'rsync: {output[-2]}') logger.info(f'rsync: {output[-2]}')
try: try:
os.symlink(self._output_dir, f'{self.output}/simple_backup/last_backup') os.symlink(self._output_dir, f'{self.output}/simple_backup/last_backup', target_is_directory=True)
except Exception: except FileExistsError:
logger.error('Failed to create last_backup link') logger.error('Failed to create last_backup link. Link already exists')
self._err_flag = True
except PermissionError:
logger.error('Failed to create last_backup link. Permission denied')
self._err_flag = True self._err_flag = True
if self.keep != -1: if self.keep != -1: