frontend: Revamp Import

bottles/frontend/main.py

@@ -37,6 +37,10 @@
 from bottles.frontend.windows.main_window import MainWindow
 from bottles.frontend.views.preferences import PreferencesWindow
 from bottles.backend.health import HealthChecker
+from bottles.backend.utils.threading import RunAsync
+from bottles.backend.managers.backup import BackupManager
+
+from bottles.frontend.utils.filters import add_yaml_filters, add_all_filters
 
 logging = Logger()
 
@@ -88,7 +92,8 @@ def __init__(self):
         )
         self.__create_action('quit', self.__quit, ['<primary>q', '<primary>w'])
         self.__create_action('about', self.__show_about_window)
-        self.__create_action('import', self.__show_importer_view, ['<primary>i'])
+        self.__create_action('import', self.__import_conf, ['<primary>i'])
+        self.__create_action('restore', self.__restore_backup, ['<primary>r'])
         self.__create_action('preferences', self.__show_preferences, ['<primary>comma'])
         self.__create_action('help', self.__help, ['F1'])
 
@@ -233,6 +238,7 @@ def do_activate(self):
                 arg_bottle=self.arg_bottle
             )
         self.win = win
+        self.manager = win.manager
         win.present()
 
     @staticmethod
@@ -352,6 +358,90 @@ def __create_action(self, name, callback, shortcuts=None, param=None):
         if shortcuts:
             self.set_accels_for_action(f"app.{name}", shortcuts)
 
+    def __import_conf(self, *_args):
+        """
+        This function shows a dialog to the user, from which it can choose an
+        archive backup to import into Bottles. It supports only .yml files
+        which are the Bottles' configuration file. Once selected, it will
+        be imported.
+        """
+        def set_path(_dialog, response):
+            if response != Gtk.ResponseType.ACCEPT:
+                return
+
+            def finish(_widget, result, error=False):
+                if result.status:
+                    self.win.show_toast(_("Configuration imported successfully"))
+                else:
+                    self.win.show_toast(_("Importing configuration failed"))
+
+            self.win.show_toast(_("Importing backup…"))
+            RunAsync(
+                task_func=BackupManager.import_backup,
+                callback=finish,
+                window=self.win,
+                scope="config",
+                path=dialog.get_file().get_path(),
+                manager=self.manager
+            )
+
+        dialog = Gtk.FileChooserNative.new(
+            title=_("Select Configuration"),
+            action=Gtk.FileChooserAction.OPEN,
+            parent=self.win,
+            accept_label=_("Import")
+        )
+
+        add_yaml_filters(dialog)
+        add_all_filters(dialog)
+        dialog.set_modal(True)
+        dialog.connect("response", set_path)
+        dialog.show()
+
+    def __restore_backup(self, *_args):
+        """
+        This function shows a dialog to the user, from which it can choose an
+        archive backup to import into Bottles. It supports only .tar.gz files
+        as Bottles export bottles in this format. Once selected, it will
+        be imported.
+        """
+        def set_path(_dialog, response):
+            if response != Gtk.ResponseType.ACCEPT:
+                return
+
+            def finish(_widget, result, error=False):
+                if result.status:
+                    self.win.show_toast(_("Backup restored successfully"))
+                else:
+                    self.win.show_toast(_("Restoring backup failed"))
+
+            self.win.show_toast(_("Importing backup…"))
+            RunAsync(
+                task_func=BackupManager.import_backup,
+                callback=finish,
+                window=self.win,
+                scope="full",
+                path=dialog.get_file().get_path(),
+                manager=self.manager
+            )
+
+        dialog = Gtk.FileChooserNative.new(
+            title=_("Select Backup Archive"),
+            action=Gtk.FileChooserAction.OPEN,
+            parent=self.win,
+            accept_label=_("Import")
+        )
+
+        filter = Gtk.FileFilter()
+        filter.set_name("GNU Gzip Archive")
+        filter.add_mime_type("application/gzip")
+
+        dialog.add_filter(filter)
+        add_all_filters(dialog)
+        dialog.set_modal(True)
+        dialog.connect("response", set_path)
+        dialog.show()
+
 GObject.threads_init()
 
 

bottles/frontend/ui/bottles.gresource.xml

@@ -11,7 +11,6 @@
         <file>task-entry.ui</file>
         <file>dependency-entry.ui</file>
         <file>program-entry.ui</file>
-        <file>importer-entry.ui</file>
         <file>state-entry.ui</file>
         <file>installer-entry.ui</file>
         <file>dll-override-entry.ui</file>
@@ -29,7 +28,6 @@
         <file>details-versioning.ui</file>
         <file>details-taskmanager.ui</file>
         <file>preferences.ui</file>
-        <file>importer.ui</file>
         <file>library.ui</file>
         <file>dialog-launch-options.ui</file>
         <file>dialog-dll-overrides.ui</file>

bottles/frontend/ui/meson.build

@@ -35,8 +35,6 @@ blueprints = custom_target('blueprints',
     'drive-entry.blp',
     'env-var-entry.blp',
     'exclusion-pattern-entry.blp',
-    'importer-entry.blp',
-    'importer.blp',
     'installer-entry.blp',
     'library-entry.blp',
     'library.blp',

bottles/frontend/ui/window.blp

@@ -76,9 +76,13 @@ template MainWindow : .AdwApplicationWindow {
 menu primary_menu {
   section {
     item {
-      label: _("Import…");
+      label: _("Import Configuration…");
       action: "app.import";
     }
+    item {
+      label: _("Restore Backup…");
+      action: "app.restore";
+    }
   }
 
   section {

bottles/frontend/views/meson.build

@@ -8,7 +8,6 @@ bottles_sources = [
   'library.py',
   'details.py',
   'preferences.py',
-  'importer.py',
   'loading.py',
 
   'bottle_details.py',

bottles/frontend/windows/main_window.py

@@ -38,7 +38,6 @@
 from bottles.frontend.params import *
 from bottles.frontend.utils.gtk import GtkUtils
 from bottles.frontend.views.details import DetailsView
-from bottles.frontend.views.importer import ImporterView
 from bottles.frontend.views.library import LibraryView
 from bottles.frontend.views.list import BottleView
 from bottles.frontend.views.loading import LoadingView
@@ -176,14 +175,11 @@ def set_manager(result: Manager, error=None):
             # Pages
             self.page_details = DetailsView(self)
             self.page_list = BottleView(self, arg_bottle=self.arg_bottle)
-            self.page_importer = ImporterView(self)
             self.page_library = LibraryView(self)
 
             self.main_leaf.append(self.page_details)
-            self.main_leaf.append(self.page_importer)
 
             self.main_leaf.get_page(self.page_details).set_navigatable(False)
-            self.main_leaf.get_page(self.page_importer).set_navigatable(False)
 
             self.stack_main.add_titled(
                 child=self.page_list,
@@ -276,9 +272,6 @@ def show_add_view(self, widget=False):
     def show_list_view(self, widget=False):
         self.stack_main.set_visible_child_name("page_list")
 
-    def show_importer_view(self, widget=False):
-        self.main_leaf.set_visible_child(self.page_importer)
-
     def show_prefs_view(self, widget=False, view=0):
         preferences_window = PreferencesWindow(self)
         preferences_window.present()