Fix bug when exclude pattern is None

.gitignore

@@ -1,2 +1,3 @@
 .idea/
+__pycache__/
 test/

PKGBUILD

@@ -1,32 +1,41 @@
-#Arch Linux PKGBUILD
-#
+# PKGBUILD
+
 # Maintainer: Daniele Fucini <dfucini@gmail.com>
-#
 
 pkgname=simple_backup
-pkgver=2.0.0.r3.gc61c704
-pkgrel=1
 pkgdesc='Simple backup script that uses rsync to copy files'
+pkgver=3.2.5
+pkgrel=3
+epoch=1
+url="https://github.com/Fuxino/${pkgname}"
+install=simple_backup.install
 arch=('any')
-url="https://github.com/Fuxino/simple_backup.git"
 license=('GPL3')
-makedepends=('git')
-depends=('python3'
+makedepends=('python-setuptools'
+             'python-build'
+             'python-installer'
+             'python-wheel')
+depends=('python'
          'rsync'
-         'python-dotenv'
-         'python-dbus')
-install=${pkgname}.install
-source=(git+https://github.com/Fuxino/${pkgname}.git)
-sha256sums=('SKIP')
+         'python-dotenv')
+optdepends=('python-systemd: use systemd log'
+            'python-dbus: for desktop notifications')
+conflicts=('simple_backup-git')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/Fuxino/${pkgname}/archive/${pkgver}.tar.gz
+        https://github.com/Fuxino/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz.sig)
+validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
+sha256sums=('fd418a9c641d604c64bd0a8487b5ab431ff71f192d6021e55b194085951cb40d'
+            'SKIP')
 
-pkgver() 
+build()
 {
-   cd "$pkgname"
-   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+   cd ${srcdir}/${pkgname}-${pkgver}
+   python -m build --wheel --no-isolation
 }
 
 package()
 {
-   install -Dm755 "${srcdir}/${pkgname}/${pkgname}.py" "${pkgdir}/usr/bin/${pkgname}"
-   install -Dm644 "${srcdir}/${pkgname}/${pkgname}.config" "${pkgdir}/etc/${pkgname}/${pkgname}.config"
+   cd ${srcdir}/${pkgname}-${pkgver}
+   python -m installer --destdir=${pkgdir} dist/*.whl
+   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/${pkgname}.conf ${pkgdir}/etc/${pkgname}/${pkgname}.conf
 }

README.md

@@ -1,10 +1,47 @@
-# simple_backup
+simple_backup
+============
 A simple backup script
 
 ## Description
 simple_backup is a Python script that allows you to backup your files.
-It reads from a configuration file the files/directories that must be copied,
-the destination directory for the backup and a few other options.
+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
+```
+
+to print all possible command line options.
 
 ## Dependencies
-rsync is used to perform the backup.  
+The script uses rsync to actually run the backup, so you will have to install it on your system. For example on Arch Linux:
+
+```bash
+sudo pacman -Syu rsync
+```
+
+## Install
+To install the program, first clone the repository:
+
+```bash
+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.
+

pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ['setuptools']
+build-backend = 'setuptools.build_meta'

requirements.txt

@@ -1 +0,0 @@
-python-dotenv>=1.0.0

setup.cfg

@@ -0,0 +1,33 @@
+[metadata]
+name = simple_backup
+version = attr: simple_backup.__version__
+description = Simple backup script using rsync
+long_description = file: README.md
+author = Daniele Fucini
+author_email = dfucini@gmail.com
+license = GPL3
+url = https://github.com/Fuxino/simple_backup
+classifiers =
+   Development Status :: 5 - Production/Stable
+   Environment :: Console
+   License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+   Natural Language :: English
+   Operating System :: POSIX :: Linux
+   Programming Language :: Python :: 3.7
+   Programming Language :: Python :: 3.8
+   Programming Language :: Python :: 3.9
+   Programming Language :: Python :: 3.10
+   Programming Language :: Python :: 3.11
+   Topic :: System :: Archiving :: Backup
+
+[options]
+packages = simple_backup
+python_requires = >=3.7
+install_requires =
+   python-dotenv
+   systemd-python
+
+[options.entry_points]
+console_scripts =
+   simple_backup = simple_backup.simple_backup:simple_backup
+

simple_backup.install

@@ -1,6 +1,6 @@
 post_install() {
-   echo "An example configuration file is found in /etc/simple_backup/simple_backup.config."
-   echo "Copy it to ~/config/simple_backup/simple_backup.config and modify it as needed"
+   echo "An example configuration file is found in /etc/simple_backup/simple_backup.conf."
+   echo "Copy it to ~/config/simple_backup/simple_backup.conf and modify it as needed"
 }
 
 post_upgrade() {

simple_backup/__init__.py

@@ -0,0 +1,3 @@
+"""Init."""
+
+__version__ = '3.2.5'

simple_backup/simple_backup.py

@@ -12,11 +12,15 @@ 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:
+    journal = None
+
+try:
+    import dbus
 except ImportError:
     pass
 
@@ -25,7 +29,7 @@ load_dotenv()
 euid = os.geteuid()
 
 if euid == 0:
-    user = os.getenv("SUDO_USER")
+    user = os.getenv('SUDO_USER')
     homedir = os.path.expanduser(f'~{user}')
 else:
     homedir = os.getenv('HOME')
@@ -39,14 +43,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 +76,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,22 +95,18 @@ 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')
+
+            return False
 
         if not os.path.isdir(self.output):
             logger.critical('Output path for backup does not exist')
 
             return False
 
+        self.output = os.path.abspath(self.output)
+
         if self.keep is None:
             self.keep = -1
 
@@ -123,9 +122,7 @@ class Backup:
     def remove_old_backups(self):
         try:
             dirs = os.listdir(f'{self.output}/simple_backup')
-        except Exception:
-            logger.info('No older backups to remove')
-
+        except FileNotFoundError:
             return
 
         if dirs.count('last_backup') > 0:
@@ -142,8 +139,10 @@ class Backup:
                 try:
                     rmtree(f'{self.output}/simple_backup/{dirs[i]}')
                     count += 1
-                except Exception:
-                    logger.error(f'Error while removing backup {dirs[i]}')
+                except FileNotFoundError:
+                    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')
@@ -152,31 +151,28 @@ class Backup:
 
     def find_last_backup(self):
         if os.path.islink(f'{self.output}/simple_backup/last_backup'):
-            try:
-                self._last_backup = os.readlink(f'{self.output}/simple_backup/last_backup')
-            except Exception:
-                logger.warning('Previous backup could not be read')
+            link = os.readlink(f'{self.output}/simple_backup/last_backup')
+
+            if os.path.isdir(link):
+                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)
     def run(self):
         logger.info('Starting backup...')
 
+        try:
+            notify('Starting backup...')
+        except NameError:
+            pass
+
         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)
 
@@ -189,10 +185,14 @@ class Backup:
                     fp.write('\n')
 
         with open(self._exclude_path, 'w') as fp:
+            if self.exclude is not None:
                 for e in self.exclude:
                     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 == '':
@@ -207,18 +207,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')
-        except Exception:
-            logger.error('Failed to create last_backup link')
+                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.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)
@@ -229,18 +245,21 @@ class Backup:
         if self._err_flag:
             logger.warning('Some errors occurred (check log for details)')
 
-            return 1
-
-        return 0
+            try:
+                notify('Backup finished with errors (check log for details)')
+            except NameError:
+                pass
+        else:
+            notify('Backup finished')
 
 
 def _parse_arguments():
     parser = argparse.ArgumentParser(prog='simple_backup',
-                                     description='A simple backup script written in Python that uses rsync to copy files',
+                                     description='Simple backup script written in Python that uses rsync to copy files',
                                      epilog='Report bugs to dfucini<at>gmail<dot>com',
                                      formatter_class=MyFormatter)
 
-    parser.add_argument('-c', '--config', default=f'{homedir}/.config/simple_backup/simple_backup.config',
+    parser.add_argument('-c', '--config', default=f'{homedir}/.config/simple_backup/simple_backup.conf',
                         help='Specify location of configuration file')
     parser.add_argument('-i', '--input', nargs='+', help='Paths/files to backup')
     parser.add_argument('-o', '--output', help='Output directory for the backup')
@@ -248,6 +267,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()
 
@@ -273,6 +294,24 @@ def _read_config(config_file):
     return inputs, output, exclude, keep
 
 
+def notify(text):
+    euid = os.geteuid()
+
+    if euid == 0:
+        uid = os.getenv('SUDO_UID')
+    else:
+        uid = os.geteuid()
+
+    os.seteuid(int(uid))
+    os.environ['DBUS_SESSION_BUS_ADDRESS'] = f'unix:path=/run/user/{uid}/bus'
+
+    obj = dbus.SessionBus().get_object('org.freedesktop.Notifications', '/org/freedesktop/Notifications')
+    obj = dbus.Interface(obj, 'org.freedesktop.Notifications')
+    obj.Notify('', 0, '', 'simple_backup', text, [], {'urgency': 1}, 10000)
+
+    os.seteuid(int(euid))
+
+
 def simple_backup():
     args = _parse_arguments()
     inputs, output, exclude, keep = _read_config(args.config)
@@ -294,27 +333,14 @@ def simple_backup():
     else:
         backup_options = '-arvh -H -X'
 
-    output = os.path.abspath(output)
-
-    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:
-            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:
-            pass
+        backup.run()
 
-        status = backup.run()
+        return 0
 
-        try:
-            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)
-        except NameError:
-            pass
+    return 1
 
 
 if __name__ == '__main__':