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

Make paramiko optional

Browse Source
This commit is contained in:
daniele 2023-06-18 22:53:29 +02:00
parent a26182cedd
commit 22a3e8d60f
Signed by: fuxino
GPG Key ID: 981A2B2A3BBF5514
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/simple_backup.1
View File

@ -172,6 +172,12 @@ Permission denied to access the output directory
.TP .TP
.B 4 .B 4
rsync error (rsync returned a non-zero value) rsync error (rsync returned a non-zero value)
.TP
.B 5
SSH connection failed
.TP
.B 6
Bad configuration file
.SH SEE ALSO .SH SEE ALSO
.BR rsync (1) .BR rsync (1)
.SH AUTHORS .SH AUTHORS

21
simple_backup/simple_backup.py
View File

@ -29,11 +29,16 @@ from getpass import getpass
from glob import glob from glob import glob
from dotenv import load_dotenv from dotenv import load_dotenv
import paramiko
from paramiko import RSAKey, Ed25519Key, ECDSAKey, DSSKey
warnings.filterwarnings('error') warnings.filterwarnings('error')
try:
raise ImportError
import paramiko
from paramiko import RSAKey, Ed25519Key, ECDSAKey, DSSKey
except ImportError:
pass
try: try:
from systemd import journal from systemd import journal
except ImportError: except ImportError:
@ -181,7 +186,7 @@ class Backup:
self._ssh = self._ssh_connect() self._ssh = self._ssh_connect()
if self._ssh is None: if self._ssh is None:
sys.exit(1) sys.exit(5)
_, stdout, _ = self._ssh.exec_command(f'if [ -d "{self.output}" ]; then echo "ok"; fi') _, stdout, _ = self._ssh.exec_command(f'if [ -d "{self.output}" ]; then echo "ok"; fi')
@ -279,7 +284,7 @@ class Backup:
if self._remote: if self._remote:
if self._ssh is None: if self._ssh is None:
logger.critical('SSH connection to server failed') logger.critical('SSH connection to server failed')
sys.exit(1) sys.exit(5)
_, stdout, _ = self._ssh.exec_command(f'find {self.output}/simple_backup/ -mindepth 1 -maxdepth 1 -type d | sort') _, stdout, _ = self._ssh.exec_command(f'find {self.output}/simple_backup/ -mindepth 1 -maxdepth 1 -type d | sort')
output = stdout.read().decode('utf-8').strip().split('\n') output = stdout.read().decode('utf-8').strip().split('\n')
@ -311,7 +316,11 @@ class Backup:
logger.info('No previous backups available') logger.info('No previous backups available')
def _ssh_connect(self): def _ssh_connect(self):
ssh = paramiko.SSHClient() try:
ssh = paramiko.SSHClient()
except NameError:
logger.error('Install paramiko for ssh support')
return None
try: try:
ssh.load_host_keys(filename=f'{homedir}/.ssh/known_hosts') ssh.load_host_keys(filename=f'{homedir}/.ssh/known_hosts')
@ -709,7 +718,7 @@ def simple_backup():
config_args = _read_config(args.config) config_args = _read_config(args.config)
except (configparser.NoSectionError, configparser.NoOptionError): except (configparser.NoSectionError, configparser.NoOptionError):
logger.critical('Bad configuration file') logger.critical('Bad configuration file')
sys.exit(1) sys.exit(6)
inputs = args.inputs if args.inputs is not None else config_args['inputs'] inputs = args.inputs if args.inputs is not None else config_args['inputs']
output = args.output if args.output is not None else config_args['output'] output = args.output if args.output is not None else config_args['output']