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

Clean code

Browse Source
This commit is contained in:
daniele 2019-09-17 16:30:06 +02:00
parent 5f0742874e
commit fbd9520845
Signed by: fuxino
GPG Key ID: 6FE25B4A3EE16FDA
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
simple-backup.py
View File

@ -84,7 +84,7 @@ class Backup():
self.logfile.close() self.logfile.close()
self.errfile.close() self.errfile.close()
self.warnfile.close() self.warnfile.close()
move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log') move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log')
move(self.err_path, self.homedir + '/.simple_backup/errors.log') move(self.err_path, self.homedir + '/.simple_backup/errors.log')
move(self.warn_path, self.homedir + '/.simple_backup/warnings.log') move(self.warn_path, self.homedir + '/.simple_backup/warnings.log')
@ -105,7 +105,7 @@ class Backup():
self.logfile.close() self.logfile.close()
self.errfile.close() self.errfile.close()
self.warnfile.close() self.warnfile.close()
move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log') move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log')
move(self.err_path, self.homedir + '/.simple_backup/errors.log') move(self.err_path, self.homedir + '/.simple_backup/errors.log')
move(self.warn_path, self.homedir + '/.simple_backup/warnings.log') move(self.warn_path, self.homedir + '/.simple_backup/warnings.log')
@ -172,7 +172,7 @@ class Backup():
self.logfile.close() self.logfile.close()
self.errfile.close() self.errfile.close()
self.warnfile.close() self.warnfile.close()
move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log') move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log')
move(self.err_path, self.homedir + '/.simple_backup/errors.log') move(self.err_path, self.homedir + '/.simple_backup/errors.log')
move(self.warn_path, self.homedir + '/.simple_backup/warnings.log') move(self.warn_path, self.homedir + '/.simple_backup/warnings.log')
@ -194,7 +194,7 @@ class Backup():
exit(1) exit(1)
else: else:
self.last_backup = '' self.last_backup = ''
self.backup_dir = self.backup_dir + '/' + date self.backup_dir = self.backup_dir + '/' + date
try: try:
@ -254,16 +254,10 @@ class Backup():
self.errfile.write(err_message) self.errfile.write(err_message)
self.errfile.write('\n') self.errfile.write('\n')
if self.user is not None:
pass
# chown $USER:$USER $LOG && chmod 644 $LOG
# chown $USER:$USER $ERR && chmod 644 $ERR
# chown $USER:$USER $WARN && chmod 644 $WARN
self.logfile.close() self.logfile.close()
self.errfile.close() self.errfile.close()
self.warnfile.close() self.warnfile.close()
move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log') move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log')
move(self.err_path, self.homedir + '/.simple_backup/errors.log') move(self.err_path, self.homedir + '/.simple_backup/errors.log')
move(self.warn_path, self.homedir + '/.simple_backup/warnings.log') move(self.warn_path, self.homedir + '/.simple_backup/warnings.log')
@ -272,7 +266,7 @@ class Backup():
self.backup_dir = self.backup_dev + '/simple_backup' self.backup_dir = self.backup_dev + '/simple_backup'
date = str(datetime.now()) date = str(datetime.now())
# Create the backup subdirectory using date # Create the backup subdirectory using date
if isdir(self.backup_dir): if isdir(self.backup_dir):
#If previous backups exist, save link to the last backup #If previous backups exist, save link to the last backup
@ -285,7 +279,7 @@ class Backup():
exit(1) exit(1)
else: else:
self.last_backup = '' self.last_backup = ''
self.backup_dir = self.backup_dir + '/' + date self.backup_dir = self.backup_dir + '/' + date
try: try:
@ -326,16 +320,10 @@ class Backup():
self.errfile.write(err_message) self.errfile.write(err_message)
self.errfile.write('\n') self.errfile.write('\n')
if self.user is not None:
pass
# chown $USER:$USER $LOG && chmod 644 $LOG
# chown $USER:$USER $ERR && chmod 644 $ERR
# chown $USER:$USER $WARN && chmod 644 $WARN
self.logfile.close() self.logfile.close()
self.errfile.close() self.errfile.close()
self.warnfile.close() self.warnfile.close()
move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log') move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log')
move(self.err_path, self.homedir + '/.simple_backup/errors.log') move(self.err_path, self.homedir + '/.simple_backup/errors.log')
move(self.warn_path, self.homedir + '/.simple_backup/warnings.log') move(self.warn_path, self.homedir + '/.simple_backup/warnings.log')
@ -367,7 +355,7 @@ class Backup():
self.logfile.close() self.logfile.close()
self.errfile.close() self.errfile.close()
self.warnfile.close() self.warnfile.close()
move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log') move(self.log_path, self.homedir + '/.simple_backup/simple_backup.log')
move(self.err_path, self.homedir + '/.simple_backup/errors.log') move(self.err_path, self.homedir + '/.simple_backup/errors.log')
move(self.warn_path, self.homedir + '/.simple_backup/warnings.log') move(self.warn_path, self.homedir + '/.simple_backup/warnings.log')
@ -394,7 +382,7 @@ class Backup():
'" --ignore-missing-args >> ' + self.log_path + ' 2>> ' + self.err_path '" --ignore-missing-args >> ' + self.log_path + ' 2>> ' + self.err_path
subprocess.run(rsync, shell=True) subprocess.run(rsync, shell=True)
return return
def main(): def main():
@ -448,7 +436,7 @@ def main():
backup.logfile.close() backup.logfile.close()
backup.errfile.close() backup.errfile.close()
backup.warnfile.close() backup.warnfile.close()
move(backup.log_path, backup.homedir + '/.simple_backup/simple_backup.log') move(backup.log_path, backup.homedir + '/.simple_backup/simple_backup.log')
move(backup.err_path, backup.homedir + '/.simple_backup/errors.log') move(backup.err_path, backup.homedir + '/.simple_backup/errors.log')
move(backup.warn_path, backup.homedir + '/.simple_backup/warnings.log') move(backup.warn_path, backup.homedir + '/.simple_backup/warnings.log')
@ -482,7 +470,7 @@ def main():
backup.logfile.close() backup.logfile.close()
backup.errfile.close() backup.errfile.close()
backup.warnfile.close() backup.warnfile.close()
move(backup.log_path, backup.homedir + '/.simple_backup/simple_backup.log') move(backup.log_path, backup.homedir + '/.simple_backup/simple_backup.log')
move(backup.err_path, backup.homedir + '/.simple_backup/errors.log') move(backup.err_path, backup.homedir + '/.simple_backup/errors.log')
move(backup.warn_path, backup.homedir + '/.simple_backup/warnings.log') move(backup.warn_path, backup.homedir + '/.simple_backup/warnings.log')