clan_vm_manager: New directory structure

pkgs/clan-vm-manager/clan_vm_manager/app.py

@@ -12,8 +12,8 @@ gi.require_version("Adw", "1")
 from clan_cli.custom_logger import setup_logging
 from gi.repository import Adw, Gdk, Gio, Gtk
 
-from clan_vm_manager.models.interfaces import ClanConfig
-from clan_vm_manager.models.use_join import GLib, GObject
+from clan_vm_manager.components.interfaces import ClanConfig
+from clan_vm_manager.singletons.use_join import GLib, GObject
 
 from .windows.main_window import MainWindow
 

pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py

@@ -559,7 +559,7 @@ class StatusNotifierImplementation(BaseImplementation):
             )
             self.tray_icon.register()
 
-            from .assets import loc
+            from clan_vm_manager.assets import loc
 
             icon_path = str(loc / "clan_white_notext.png")
             self.set_icon(icon_path)

pkgs/clan-vm-manager/clan_vm_manager/errors/show_error.py

@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-
-import logging
-from typing import Literal
-
-import gi
-
-gi.require_version("Gtk", "4.0")
-gi.require_version("Adw", "1")
-from clan_cli.errors import ClanError
-from gi.repository import Adw
-
-Severity = Literal["Error"] | Literal["Warning"] | Literal["Info"] | str
-
-log = logging.getLogger(__name__)
-
-
-def show_error_dialog(error: ClanError, severity: Severity | None = "Error") -> None:
-    message = str(error)
-    dialog = Adw.MessageDialog(parent=None, heading=severity, body=message)
-    log.error(message)
-    dialog.add_response("ok", "ok")
-    dialog.choose()

pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py

@@ -7,7 +7,7 @@ import gi
 from clan_cli.clan_uri import ClanURI
 from clan_cli.history.add import HistoryEntry, add_history
 
-from clan_vm_manager.models.use_vms import VMs
+from clan_vm_manager.singletons.use_vms import VMs
 
 gi.require_version("Gtk", "4.0")
 gi.require_version("Adw", "1")

pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py

@@ -19,9 +19,8 @@ from clan_cli.history.add import HistoryEntry
 from clan_cli.machines.machines import Machine
 
 from clan_vm_manager import assets
-
-from .executor import MPProcess, spawn
-from .gkvstore import GKVStore
+from clan_vm_manager.components.executor import MPProcess, spawn
+from clan_vm_manager.components.gkvstore import GKVStore
 
 gi.require_version("GObject", "2.0")
 gi.require_version("Gtk", "4.0")

pkgs/clan-vm-manager/clan_vm_manager/views/list.py

@@ -7,9 +7,9 @@ import gi
 from clan_cli import history, machines
 from clan_cli.clan_uri import ClanURI
 
-from clan_vm_manager.models.interfaces import ClanConfig
-from clan_vm_manager.models.use_join import JoinList, JoinValue
-from clan_vm_manager.models.use_vms import VM, VMs, VMStore
+from clan_vm_manager.components.interfaces import ClanConfig
+from clan_vm_manager.singletons.use_join import JoinList, JoinValue
+from clan_vm_manager.singletons.use_vms import VM, VMs, VMStore
 
 gi.require_version("Adw", "1")
 from gi.repository import Adw, Gdk, Gio, GLib, GObject, Gtk

pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py

@@ -5,9 +5,9 @@ from typing import Any
 import gi
 from clan_cli.history.list import list_history
 
-from clan_vm_manager.models.interfaces import ClanConfig
-from clan_vm_manager.models.use_views import Views
-from clan_vm_manager.models.use_vms import VMs
+from clan_vm_manager.components.interfaces import ClanConfig
+from clan_vm_manager.singletons.use_views import Views
+from clan_vm_manager.singletons.use_vms import VMs
 from clan_vm_manager.views.details import Details
 from clan_vm_manager.views.list import ClanList
 
@@ -15,7 +15,7 @@ gi.require_version("Adw", "1")
 
 from gi.repository import Adw, Gio, GLib, Gtk
 
-from ..trayicon import TrayIcon
+from clan_vm_manager.components.trayicon import TrayIcon
 
 log = logging.getLogger(__name__)