Remove broken desktop notifications

.gitignore

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

PKGBUILD

@@ -1,31 +1,47 @@
-#Arch Linux PKGBUILD
+# PKGBUILD
-#
+
-#Maintainer: Daniele Fucini <dfucini@gmail.com>
+# Maintainer: Daniele Fucini <dfucini@gmail.com>
-#
 
 pkgname=simple_backup
-pkgver=2.0.0.r3.gc61c704
+pkgver=3.1.2.r1.ga4c4b88
 pkgrel=1
 pkgdesc='Simple backup script that uses rsync to copy files'
 arch=('any')
 url="https://github.com/Fuxino/simple_backup.git"
 license=('GPL3')
-makedepends=('git')
+makedepends=('git'
-depends=('python3'
+             'python-setuptools'
+             'python-build'
+             'python-installer'
+             'python-wheel')
+depends=('python'
          'rsync'
          'python-dotenv')
+optdepends=('python-systemd: use systemd log')
 install=${pkgname}.install
 source=(git+https://github.com/Fuxino/${pkgname}.git)
 sha256sums=('SKIP')
 
 pkgver() 
 {  
-   cd "$pkgname"
+   cd ${pkgname}
    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare()
+{
+   git -C ${srcdir}/${pkgname} clean -dfx
+}
+
+build()
+{
+   cd ${srcdir}/${pkgname}
+   python -m build --wheel --no-isolation
+}
+
 package()
 {
-   install -Dm755 "${srcdir}/${pkgname}/${pkgname}.py" "${pkgdir}/usr/bin/${pkgname}"
+   cd ${srcdir}/${pkgname}
-   install -Dm644 "${srcdir}/${pkgname}/config" "${pkgdir}/etc/${pkgname}/config"
+   python -m installer --destdir=${pkgdir} dist/*.whl
+   install -Dm644 ${srcdir}/${pkgname}/${pkgname}.conf ${pkgdir}/etc/${pkgname}/${pkgname}.conf
 }

README.md

@@ -1,10 +1,40 @@
-# 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,
+Parameters like input files/directories, output directory etc. can be specified in a configuration file, or on the command line.
-the destination directory for the backup and a few other options.
+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
+```
+
+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.install

@@ -1,6 +1,6 @@
 post_install() {
-   echo "An example configuration file is found in /etc/simple_backup/config."
+   echo "An example configuration file is found in /etc/simple_backup/simple_backup.conf."
-   echo "Copy it to ~/.simple_backup/simple_backup.config and modify it as needed"
+   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.1.2'

simple_backup/simple_backup.conf

@@ -0,0 +1,14 @@
+#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

@@ -1,17 +1,70 @@
 #!/usr/bin/python3
 
 # Import libraries
-from dotenv import load_dotenv
 import os
+from functools import wraps
 from shutil import rmtree
 import argparse
 import configparser
 import logging
 from logging import StreamHandler
-from logging.handlers import RotatingFileHandler
+from timeit import default_timer
 from subprocess import Popen, PIPE, STDOUT
 from datetime import datetime
 from tempfile import mkstemp
+from dotenv import load_dotenv
+
+try:
+    from systemd import journal
+except ImportError:
+    pass
+
+
+load_dotenv()
+euid = os.geteuid()
+
+if euid == 0:
+    user = os.getenv("SUDO_USER")
+    homedir = os.path.expanduser(f'~{user}')
+else:
+    homedir = os.getenv('HOME')
+
+logging.getLogger().setLevel(logging.DEBUG)
+logger = logging.getLogger(os.path.basename(__file__))
+c_handler = StreamHandler()
+
+c_handler.setLevel(logging.INFO)
+c_format = logging.Formatter('%(name)s - %(levelname)s - %(message)s')
+c_handler.setFormatter(c_format)
+logger.addHandler(c_handler)
+
+try:
+    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):
+    def decorator_timing(func):
+        @wraps(func)
+        def wrapper_timing(*args, **kwargs):
+            start = default_timer()
+
+            value = func(*args, **kwargs)
+
+            end = default_timer()
+
+            _logger.info(f'Elapsed time: {end - start:.3f} seconds')
+
+            return value
+
+        return wrapper_timing
+
+    return decorator_timing
 
 
 class MyFormatter(argparse.RawTextHelpFormatter, argparse.ArgumentDefaultsHelpFormatter):
@@ -47,13 +100,20 @@ class Backup:
                     self.inputs.append(i_new)
                 except Exception:
                     logger.warning(f'Input {i} is a link and cannot be read. Skipping')
-                    self.inpts.remove(i)
+                    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
 
@@ -78,6 +138,7 @@ class Backup:
             dirs.remove('last_backup')
 
         n_backup = len(dirs) - 1
+        count = 0
 
         if n_backup > self.keep:
             logger.info('Removing old backups...')
@@ -86,17 +147,29 @@ class Backup:
             for i in range(n_backup - self.keep):
                 try:
                     rmtree(f'{self.output}/simple_backup/{dirs[i]}')
+                    count += 1
                 except Exception:
                     logger.error(f'Error while removing backup {dirs[i]}')
 
+            if count == 1:
+                logger.info(f'Removed {count} backup')
+            else:
+                logger.info(f'Removed {count} backups')
+
     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.error('Previous backup could not be read')
+                logger.warning('Previous backup could not be read')
+        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...')
 
@@ -110,8 +183,8 @@ class Backup:
                 logger.error('Failed to remove last_backup link')
                 self._err_flag = True
 
-        inputs_handle, self._inputs_path = mkstemp(prefix='tmp_inputs', text=True)
+        _, self._inputs_path = mkstemp(prefix='tmp_inputs', text=True)
-        exclude_handle, self._exclude_path = mkstemp(prefix='tmp_exclude', text=True)
+        _, self._exclude_path = mkstemp(prefix='tmp_exclude', text=True)
 
         with open(self._inputs_path, 'w') as fp:
             for i in self.inputs:
@@ -140,7 +213,10 @@ class Backup:
         p = Popen(rsync, stdout=PIPE, stderr=STDOUT, shell=True)
         output, _ = p.communicate()
 
-        logger.info(f'Output of rsync command: {output.decode("utf-8")}')
+        output = output.decode("utf-8").split('\n')
+
+        logger.info(f'rsync: {output[-3]}')
+        logger.info(f'rsync: {output[-2]}')
 
         try:
             os.symlink(self._output_dir, f'{self.output}/simple_backup/last_backup')
@@ -160,43 +236,13 @@ class Backup:
             logger.warning('Some errors occurred (check log for details)')
 
 
-load_dotenv()
-euid = os.geteuid()
-
-if euid == 0:
-    user = os.getenv("SUDO_USER")
-    homedir = os.path.expanduser(f'~{user}')
-else:
-    homedir = os.getenv('HOME')
-
-logging.getLogger().setLevel(logging.DEBUG)
-logger = logging.getLogger(os.path.basename(__file__))
-c_handler = StreamHandler()
-
-try:
-    f_handler = RotatingFileHandler(f'{homedir}/.simple_backup/simple_backup.log', maxBytes=1024000, backupCount=5)
-except Exception:
-    f_handler = None
-
-c_handler.setLevel(logging.INFO)
-c_format = logging.Formatter('%(name)s - %(levelname)s - %(message)s')
-c_handler.setFormatter(c_format)
-logger.addHandler(c_handler)
-
-if f_handler:
-    f_handler.setLevel(logging.INFO)
-    f_format = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    f_handler.setFormatter(f_format)
-    logger.addHandler(f_handler)
-
-
 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}/.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')
@@ -255,6 +301,10 @@ def simple_backup():
     if backup.check_params():
         backup.run()
 
+        return 0
+
+    return 1
+
 
 if __name__ == '__main__':
     simple_backup()