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

Merge branch 'nolink' into development

Browse Source
This commit is contained in:
daniele 2023-06-02 20:12:53 +02:00
commit cd558e8608
Signed by: fuxino
GPG Key ID: 981A2B2A3BBF5514
2 changed files with 17 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
simple_backup.conf → simple_backup/simple_backup.conf
View File

87
simple_backup/simple_backup.py
View File

@ -217,9 +217,6 @@ class Backup:
dirs = stdout.read().decode('utf-8').strip().split('\n') dirs = stdout.read().decode('utf-8').strip().split('\n')
if dirs.count('last_backup') > 0:
dirs.remove('last_backup')
n_backup = len(dirs) - 1 n_backup = len(dirs) - 1
count = 0 count = 0
@ -275,29 +272,24 @@ class Backup:
logger.critical('SSH connection to server failed') logger.critical('SSH connection to server failed')
sys.exit(1) sys.exit(1)
_, stdout, _ = self._ssh.exec_command(f'readlink -v {self.output}/simple_backup/last_backup') _, stdout, _ = self._ssh.exec_command(f'find {self.output}/simple_backup/ -mindepth 1 -maxdepth 1 -type d | sort')
last_backup = stdout.read().decode('utf-8').strip() output = stdout.read().decode('utf-8').strip().split('\n')
if last_backup != '': if output[-1] != '':
_, stdout, _ = self._ssh.exec_command(f'if [ -d "{last_backup}" ]; then echo "ok"; fi') self._last_backup = output[-1]
output = stdout.read().decode('utf-8').strip()
if output == 'ok':
self._last_backup = last_backup
else:
logger.info('No previous backups available')
else: else:
logger.info('No previous backups available') logger.info('No previous backups available')
else: else:
if os.path.islink(f'{self.output}/simple_backup/last_backup'): try:
link = os.readlink(f'{self.output}/simple_backup/last_backup') dirs = sorted([f.path for f in os.scandir(f'{self.output}/simple_backup') if f.is_dir(follow_symlinks=False)])
except FileNotFoundError:
logger.info('No previous backups available')
if os.path.isdir(link): return
self._last_backup = link
else: try:
logger.info('No previous backups available') self._last_backup = dirs[-1]
else: except IndexError:
logger.info('No previous backups available') logger.info('No previous backups available')
def _ssh_connection(self): def _ssh_connection(self):
@ -445,7 +437,10 @@ class Backup:
with Popen(args, stdin=PIPE, stdout=PIPE, stderr=STDOUT, shell=False) as p: with Popen(args, stdin=PIPE, stdout=PIPE, stderr=STDOUT, shell=False) as p:
output, _ = p.communicate() output, _ = p.communicate()
del os.environ['SSHPASS'] try:
del os.environ['SSHPASS']
except KeyError:
pass
if p.returncode != 0: if p.returncode != 0:
self._err_flag = True self._err_flag = True
@ -458,54 +453,6 @@ class Backup:
logger.info('rsync: %s', output[-3]) logger.info('rsync: %s', output[-3])
logger.info('rsync: %s', output[-2]) logger.info('rsync: %s', output[-2])
if self._remote and not self._err_flag:
_, stdout, _ = \
self._ssh.exec_command(f'if [ -L "{self.output}/simple_backup/last_backup" ]; then echo "ok"; fi')
output = stdout.read().decode('utf-8').strip()
if output == 'ok':
_, _, stderr = self._ssh.exec_command(f'rm "{self.output}/simple_backup/last_backup"')
err = stderr.read().decode('utf-8').strip()
if err != '':
logger.error(err)
self._err_flag = True
elif not self._err_flag:
if os.path.islink(f'{self.output}/simple_backup/last_backup'):
try:
os.remove(f'{self.output}/simple_backup/last_backup')
except FileNotFoundError:
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
if self._remote and not self._err_flag:
_, _, stderr =\
self._ssh.exec_command(f'ln -s "{self._output_dir}" "{self.output}/simple_backup/last_backup"')
err = stderr.read().decode('utf-8').strip()
if err != '':
logger.error(err)
self._err_flag = True
elif not self._err_flag:
try:
os.symlink(self._output_dir, f'{self.output}/simple_backup/last_backup', target_is_directory=True)
except FileExistsError:
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
except FileNotFoundError:
logger.critical('Failed to create backup')
return 1
if self.keep != -1 and not self.remove_before: if self.keep != -1 and not self.remove_before:
self.remove_old_backups() self.remove_old_backups()