Fix bug when exclude pattern is None

.gitignore

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

PKGBUILD

@@ -3,45 +3,39 @@
 # Maintainer: Daniele Fucini <dfucini@gmail.com>
 
 pkgname=simple_backup
-pkgver=3.2.3.r1.ga42ade4
-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'
+makedepends=('python-setuptools'
-             'python-setuptools'
              'python-build'
              'python-installer'
              'python-wheel')
 depends=('python'
          'rsync'
          'python-dotenv')
-optdepends=('python-systemd: use systemd log')
+optdepends=('python-systemd: use systemd log'
-install=${pkgname}.install
+            'python-dbus: for desktop notifications')
-source=(git+https://github.com/Fuxino/${pkgname}.git)
+conflicts=('simple_backup-git')
-sha256sums=('SKIP')
+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)
-pkgver() 
+validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-{  
+sha256sums=('fd418a9c641d604c64bd0a8487b5ab431ff71f192d6021e55b194085951cb40d'
-   cd ${pkgname}
+            'SKIP')
-   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare()
-{
-   git -C ${srcdir}/${pkgname} clean -dfx
-}
 
 build()
 {
-   cd ${srcdir}/${pkgname}
+   cd ${srcdir}/${pkgname}-${pkgver}
    python -m build --wheel --no-isolation
 }
 
 package()
 {
-   cd ${srcdir}/${pkgname}
+   cd ${srcdir}/${pkgname}-${pkgver}
    python -m installer --destdir=${pkgdir} dist/*.whl
-   install -Dm644 ${srcdir}/${pkgname}/${pkgname}.conf ${pkgdir}/etc/${pkgname}/${pkgname}.conf
+   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/${pkgname}.conf ${pkgdir}/etc/${pkgname}/${pkgname}.conf
 }

simple_backup/__init__.py

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

simple_backup/simple_backup.conf

@@ -1,14 +0,0 @@
-#Example config file for simple_backup
-
-[default]
-#Input directories. Use a comma to separate items
-inputs=/home/my_home,/etc
-
-#Output directory
-backup_dir=/media/Backup
-
-#Exclude patterns. Use a comma to separate items
-exclude=.gvfs,.local/share/gvfs-metadata,.cache,.dbus,.Trash,.local/share/Trash,.macromedia,.adobe,.recently-used,.recently-used.xbel,.thumbnails
-
-#Number of snapshots to keep (use -1 to keep all)
-keep=-1

simple_backup/simple_backup.py

@@ -19,12 +19,17 @@ try:
 except ImportError:
     journal = None
 
+try:
+    import dbus
+except ImportError:
+    pass
+
 
 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')
@@ -160,6 +165,11 @@ class Backup:
     def run(self):
         logger.info('Starting backup...')
 
+        try:
+            notify('Starting backup...')
+        except NameError:
+            pass
+
         self.create_backup_dir()
         self.find_last_backup()
 
@@ -175,9 +185,10 @@ class Backup:
                     fp.write('\n')
 
         with open(self._exclude_path, 'w') as fp:
-            for e in self.exclude:
+            if self.exclude is not None:
-                fp.write(e)
+                for e in self.exclude:
-                fp.write('\n')
+                    fp.write(e)
+                    fp.write('\n')
 
         if self.keep != -1 and self.remove_before:
             self.remove_old_backups()
@@ -234,6 +245,13 @@ class Backup:
         if self._err_flag:
             logger.warning('Some errors occurred (check log for details)')
 
+            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',
@@ -276,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)