Reload database when extracting database over it

src/vorta/__main__.py

@@ -2,11 +2,9 @@
 import signal
 import sys
 
-import peewee
 from vorta._version import __version__
-from vorta.config import SETTINGS_DIR
 from vorta.log import init_logger
-from vorta.models import init_db
+from vorta.models import connect_db
 from vorta.updater import get_updater
 from vorta.utils import parse_args
 
@@ -28,9 +26,7 @@ def main():
 
     init_logger(background=want_background)
 
-    # Init database
-    sqlite_db = peewee.SqliteDatabase(os.path.join(SETTINGS_DIR, 'settings.db'))
-    init_db(sqlite_db)
+    connect_db()
 
     # Init app after database is available
     from vorta.application import VortaApp

src/vorta/borg/borg_thread.py

@@ -12,7 +12,7 @@
 from subprocess import Popen, PIPE
 
 from vorta.i18n import trans_late
-from vorta.models import EventLogModel, BackupProfileMixin
+from vorta.models import EventLogModel, BackupProfileMixin, connect_db
 from vorta.utils import borg_compat, pretty_bytes
 from vorta.keyring.abc import get_keyring
 from vorta.keyring.db import VortaDBKeyring
@@ -239,6 +239,9 @@ def read_async(fd):
         except ValueError:
             result['data'] = stdout
 
+        if result['cmd'][1] == "extract":
+            connect_db()
+
         log_entry.returncode = p.returncode
         log_entry.repo_url = self.params.get('repo_url', None)
         log_entry.save()

src/vorta/models.py

@@ -13,6 +13,7 @@
 import peewee as pw
 from playhouse.migrate import SqliteMigrator, migrate
 
+from vorta.config import SETTINGS_DIR
 from vorta.i18n import trans_late
 from vorta.utils import slugify
 
@@ -252,6 +253,12 @@ def get_misc_settings():
     return settings
 
 
+def connect_db():
+    # Init database
+    sqlite_db = pw.SqliteDatabase(os.path.join(SETTINGS_DIR, 'settings.db'))
+    init_db(sqlite_db)
+
+
 def init_db(con=None):
     if con is not None:
         os.umask(0o0077)

src/vorta/views/archive_tab.py

@@ -371,6 +371,8 @@ def receive():
 
     def extract_archive_result(self, result):
         self._toggle_all_buttons(True)
+        if result['returncode'] == 0:
+            self.list_action()
 
     def update_mount_button_text(self):
         archive_name = self.selected_archive_name()