Add ability to create backups from command line using existing profiles

src/vorta/application.py

@@ -1,9 +1,13 @@
+import logging
 import os
 import sys
 import sip
+import time
+
 from PyQt5 import QtCore
 from PyQt5.QtWidgets import QMessageBox
 
+from vorta.borg.borg_thread import BorgThread
 from vorta.borg.create import BorgCreateThread
 from vorta.borg.version import BorgVersionThread
 from vorta.config import TEMP_DIR
@@ -16,6 +20,8 @@
 from vorta.views.main_window import MainWindow
 from vorta.notifications import VortaNotifications
 
+logger = logging.getLogger(__name__)
+
 APP_ID = os.path.join(TEMP_DIR, "socket")
 
 
@@ -49,20 +55,45 @@ def __init__(self, args_raw, single_app=False):
         self.tray = TrayMenu(self)
 
         args = parse_args()
-        if getattr(args, 'daemonize', False):
+        if getattr(args, 'daemonize', False) or args.profile:
             pass
         elif SettingsModel.get(key='foreground').value:
             self.open_main_window_action()
 
+        if args.profile:
+            self.completedProfiles = []
+            self.validProfiles = []
+            for profile_name in args.profile:
+                profile = BackupProfileModel.get_or_none(name=profile_name)
+                if profile is not None:
+                    if profile.repo is None:
+                        logger.warning(f"Add a repository to {profile_name}")
+                        continue
+                    self.validProfiles.append(profile_name)
+                    # Wait a bit in case something is running
+                    while BorgThread.is_running():
+                        time.sleep(0.1)
+                    self.create_backup_action(profile_id=profile.id, from_cmdline=True)
+                else:
+                    logger.warning(f"Invalid profile name {profile_name}")
+
         self.backup_started_event.connect(self.backup_started_event_response)
         self.backup_finished_event.connect(self.backup_finished_event_response)
         self.backup_cancelled_event.connect(self.backup_cancelled_event_response)
         self.message_received_event.connect(self.message_received_event_response)
         self.set_borg_details_action()
         self.installEventFilter(self)
 
+    def exit_checker(self, result):
+        """Exit when all profiles have been run"""
+        profile_name = result['params']['profile_name']
+        logger.info(f"Backup complete for {profile_name}")
+        self.completedProfiles.append(profile_name)
+        if self.validProfiles == self.completedProfiles:
+            os._exit(0)
+
     def eventFilter(self, source, event):
-        if event.type() == QtCore.QEvent.ApplicationPaletteChange and type(source) == MainWindow:
+        if event.type() == QtCore.QEvent.ApplicationPaletteChange and isinstance(source, MainWindow):
             self.main_window.set_icons()
             self.main_window.repoTab.set_icons()
             self.main_window.archiveTab.set_icons()
@@ -71,14 +102,16 @@ def eventFilter(self, source, event):
             self.tray.set_tray_icon()
         return False
 
-    def create_backup_action(self, profile_id=None):
+    def create_backup_action(self, profile_id=None, from_cmdline=False):
         if not profile_id:
             profile_id = self.main_window.current_profile.id
 
         profile = BackupProfileModel.get(id=profile_id)
         msg = BorgCreateThread.prepare(profile)
         if msg['ok']:
             thread = BorgCreateThread(msg['cmd'], msg, parent=self)
+            if from_cmdline:
+                thread.result.connect(self.exit_checker)
             thread.start()
         else:
             notifier = VortaNotifications.pick()

src/vorta/borg/create.py

@@ -43,6 +43,7 @@ def started_event(self):
 
     def finished_event(self, result):
         self.app.backup_finished_event.emit(result)
+        self.result.emit(result)
         self.pre_post_backup_cmd(self.params, cmd='post_backup_cmd', returncode=result['returncode'])
 
     @classmethod

src/vorta/utils.py

@@ -96,7 +96,7 @@ def get_private_keys():
 def pretty_bytes(size):
     """from https://stackoverflow.com/questions/12523586/
             python-format-size-application-converting-b-to-kb-mb-gb-tb/37423778"""
-    if type(size) != int:
+    if not isinstance(size, int):
         return ''
     power = 1000  # GiB is base 2**10, GB is base 10**3.
     n = 0
@@ -192,6 +192,11 @@ def parse_args():
     parser.add_argument('--daemonize', '-d',
                         action='store_true',
                         help="Fork to background and don't open window on startup.")
+    parser.add_argument(
+        '--create',
+        nargs='+',
+        dest='profile',
+        help='Create a backup in the background using the given profile(s). Will automatically close once complete')
 
     return parser.parse_known_args()[0]