Version bump

PKGBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Daniele Fucini <dfucini@gmail.com>
 
 pkgname=simple_backup
-pkgver=3.1.2.r1.ga4c4b88
+pkgver=3.2.3.r1.ga42ade4
 pkgrel=1
 pkgdesc='Simple backup script that uses rsync to copy files'
 arch=('any')
@@ -16,9 +16,8 @@ makedepends=('git'
              'python-wheel')
 depends=('python'
          'rsync'
-         'python-dotenv'
+         'python-dotenv')
-         'python-dbus'
+optdepends=('python-systemd: use systemd log')
-         'python-systemd')
 install=${pkgname}.install
 source=(git+https://github.com/Fuxino/${pkgname}.git)
 sha256sums=('SKIP')

README.md

@@ -4,7 +4,8 @@ A simple backup script
 
 ## Description
 simple_backup is a Python script that allows you to backup your files.
-Parameters like input files/directories, output directory etc. can be specified in a configuration file, or on the command line. Run:
+Parameters like input files/directories, output directory etc. can be specified in a configuration file, or on the command line.
+Run:
 
 ```bash
 simple_backup -h
@@ -26,12 +27,21 @@ To install the program, first clone the repository:
 git clone https://github.com/Fuxino/simple_backup.git
 ```
 
+Install tools required to build and install the package:
+
+```bash
+pip install --upgrade build installer wheel
+```
+
 Then run:
 
 ```bash
 cd simple_backup
 python -m build --wheel
 python -m installer dist/*.whl
+```
 
 For Arch Linux, a PKGBUILD that automates this process is provided.
 
+After installing, copy simple_backup.conf (if you used the PKGBUILD on Arch, it will be in /etc/simple_backup/) to $HOME/.config/simple_backup and edit is as needed.
+

setup.cfg

@@ -29,7 +29,5 @@ install_requires =
 
 [options.entry_points]
 console_scripts =
-   simple_backup = simple_backup:simple_backup
+   simple_backup = simple_backup.simple_backup:simple_backup
 
-[options.data_files]
-../etc/simple_backup = simple_backup/simple_backup.conf

simple_backup/__init__.py

@@ -1,3 +1,3 @@
 """Init."""
 
-__version__ = '3.1.2'
+__version__ = '3.2.4'

simple_backup/simple_backup.py

@@ -12,13 +12,12 @@ from timeit import default_timer
 from subprocess import Popen, PIPE, STDOUT
 from datetime import datetime
 from tempfile import mkstemp
-import dbus
 from dotenv import load_dotenv
 
 try:
     from systemd import journal
 except ImportError:
-    pass
+    journal = None
 
 
 load_dotenv()
@@ -39,14 +38,12 @@ c_format = logging.Formatter('%(name)s - %(levelname)s - %(message)s')
 c_handler.setFormatter(c_format)
 logger.addHandler(c_handler)
 
-try:
+if journal:
     j_handler = journal.JournalHandler()
     j_handler.setLevel(logging.INFO)
     j_format = logging.Formatter('%(levelname)s - %(message)s')
     j_handler.setFormatter(j_format)
     logger.addHandler(j_handler)
-except NameError:
-    pass
 
 
 def timing(_logger):
@@ -74,12 +71,13 @@ class MyFormatter(argparse.RawTextHelpFormatter, argparse.ArgumentDefaultsHelpFo
 
 class Backup:
 
-    def __init__(self, inputs, output, exclude, keep, options):
+    def __init__(self, inputs, output, exclude, keep, options, remove_before=False):
         self.inputs = inputs
         self.output = output
         self.exclude = exclude
         self.options = options
         self.keep = keep
+        self.remove_before = remove_before
         self._last_backup = ''
         self._output_dir = ''
         self._inputs_path = ''
@@ -92,17 +90,6 @@ class Backup:
 
             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:
             logger.critical('No output path specified. Use -o argument or specify output path in configuration file')
 
@@ -130,9 +117,7 @@ class Backup:
     def remove_old_backups(self):
         try:
             dirs = os.listdir(f'{self.output}/simple_backup')
-        except Exception:
+        except FileNotFoundError:
-            logger.info('No older backups to remove')
-
             return
 
         if dirs.count('last_backup') > 0:
@@ -149,8 +134,10 @@ class Backup:
                 try:
                     rmtree(f'{self.output}/simple_backup/{dirs[i]}')
                     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:
                 logger.info(f'Removed {count} backup')
@@ -159,15 +146,14 @@ class Backup:
 
     def find_last_backup(self):
         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:
             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
     @timing(logger)
@@ -177,13 +163,6 @@ class Backup:
         self.create_backup_dir()
         self.find_last_backup()
 
-        if os.path.islink(f'{self.output}/simple_backup/last_backup'):
-            try:
-                os.remove(f'{self.output}/simple_backup/last_backup')
-            except Exception:
-                logger.error('Failed to remove last_backup link')
-                self._err_flag = True
-
         _, self._inputs_path = mkstemp(prefix='tmp_inputs', text=True)
         _, self._exclude_path = mkstemp(prefix='tmp_exclude', text=True)
 
@@ -200,6 +179,9 @@ class Backup:
                 fp.write(e)
                 fp.write('\n')
 
+        if self.keep != -1 and self.remove_before:
+            self.remove_old_backups()
+
         logger.info('Copying files. This may take a long time...')
 
         if self._last_backup == '':
@@ -214,18 +196,34 @@ class Backup:
         p = Popen(rsync, stdout=PIPE, stderr=STDOUT, shell=True)
         output, _ = p.communicate()
 
+        if p.returncode != 0:
+            self._err_flag = True
+
         output = output.decode("utf-8").split('\n')
 
         logger.info(f'rsync: {output[-3]}')
         logger.info(f'rsync: {output[-2]}')
 
+        if os.path.islink(f'{self.output}/simple_backup/last_backup'):
             try:
-            os.symlink(self._output_dir, f'{self.output}/simple_backup/last_backup')
+                os.remove(f'{self.output}/simple_backup/last_backup')
-        except Exception:
+            except FileNotFoundError:
-            logger.error('Failed to create 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
 
-        if self.keep != -1:
+        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
+
+        if self.keep != -1 and not self.remove_before:
             self.remove_old_backups()
 
         os.remove(self._inputs_path)
@@ -236,10 +234,6 @@ class Backup:
         if self._err_flag:
             logger.warning('Some errors occurred (check log for details)')
 
-            return 1
-
-        return 0
-
 
 def _parse_arguments():
     parser = argparse.ArgumentParser(prog='simple_backup',
@@ -255,6 +249,8 @@ def _parse_arguments():
     parser.add_argument('-k', '--keep', type=int, help='Number of old backups to keep')
     parser.add_argument('-s', '--checksum', action='store_true',
                         help='Use checksum rsync option to compare files (MUCH SLOWER)')
+    parser.add_argument('--remove-before-backup', action='store_true',
+                        help='Remove old backups before executing the backup, instead of after')
 
     args = parser.parse_args()
 
@@ -301,24 +297,10 @@ def simple_backup():
     else:
         backup_options = '-arvh -H -X'
 
-    backup = Backup(inputs, output, exclude, keep, backup_options)
+    backup = Backup(inputs, output, exclude, keep, backup_options, remove_before=args.remove_before_backup)
 
     if backup.check_params():
-        try:
+        backup.run()
-            obj = dbus.SessionBus().get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications")
-            obj = dbus.Interface(obj, "org.freedesktop.Notifications")
-            obj.Notify("simple_backup", 0, "", "Starting backup...", "", [], {"urgency": 1}, 10000)
-        except dbus.exceptions.DBusException:
-            obj = None
-
-        status = backup.run()
-
-        if obj is not None:
-            if status == 0:
-                obj.Notify("simple_backup", 0, "", "Backup finished.", "", [], {"urgency": 1}, 10000)
-            else:
-                obj.Notify("simple_backup", 0, "", "Backup finished. Some errors occurred.",
-                           "", [], {"urgency": 1}, 10000)
 
         return 0