From 24f854879601ce7d4e90b8801ff3d6d98fadf749 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Sun, 3 Mar 2024 16:38:16 +0700 Subject: [PATCH] clan_vm_manager: New directory structure --- pkgs/clan-vm-manager/clan_vm_manager/app.py | 4 ++-- .../{errors => components}/__init__.py | 0 .../{models => components}/executor.py | 0 .../{models => components}/gkvstore.py | 0 .../{models => components}/interfaces.py | 0 .../{ => components}/trayicon.py | 2 +- .../clan_vm_manager/errors/show_error.py | 23 ------------------- .../{models => singletons}/__init__.py | 0 .../{models => singletons}/use_join.py | 2 +- .../{models => singletons}/use_views.py | 0 .../{models => singletons}/use_vms.py | 5 ++-- .../clan_vm_manager/views/list.py | 6 ++--- .../clan_vm_manager/windows/main_window.py | 8 +++---- 13 files changed, 13 insertions(+), 37 deletions(-) rename pkgs/clan-vm-manager/clan_vm_manager/{errors => components}/__init__.py (100%) rename pkgs/clan-vm-manager/clan_vm_manager/{models => components}/executor.py (100%) rename pkgs/clan-vm-manager/clan_vm_manager/{models => components}/gkvstore.py (100%) rename pkgs/clan-vm-manager/clan_vm_manager/{models => components}/interfaces.py (100%) rename pkgs/clan-vm-manager/clan_vm_manager/{ => components}/trayicon.py (99%) delete mode 100644 pkgs/clan-vm-manager/clan_vm_manager/errors/show_error.py rename pkgs/clan-vm-manager/clan_vm_manager/{models => singletons}/__init__.py (100%) rename pkgs/clan-vm-manager/clan_vm_manager/{models => singletons}/use_join.py (98%) rename pkgs/clan-vm-manager/clan_vm_manager/{models => singletons}/use_views.py (100%) rename pkgs/clan-vm-manager/clan_vm_manager/{models => singletons}/use_vms.py (99%) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-vm-manager/clan_vm_manager/app.py index a20145ba9..5b1c9ee3e 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/app.py +++ b/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 diff --git a/pkgs/clan-vm-manager/clan_vm_manager/errors/__init__.py b/pkgs/clan-vm-manager/clan_vm_manager/components/__init__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/errors/__init__.py rename to pkgs/clan-vm-manager/clan_vm_manager/components/__init__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/models/executor.py b/pkgs/clan-vm-manager/clan_vm_manager/components/executor.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/models/executor.py rename to pkgs/clan-vm-manager/clan_vm_manager/components/executor.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/models/gkvstore.py b/pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/models/gkvstore.py rename to pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/models/interfaces.py b/pkgs/clan-vm-manager/clan_vm_manager/components/interfaces.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/models/interfaces.py rename to pkgs/clan-vm-manager/clan_vm_manager/components/interfaces.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/trayicon.py b/pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py similarity index 99% rename from pkgs/clan-vm-manager/clan_vm_manager/trayicon.py rename to pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py index ceb4fc31f..88caf4242 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/trayicon.py +++ b/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) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/errors/show_error.py b/pkgs/clan-vm-manager/clan_vm_manager/errors/show_error.py deleted file mode 100644 index 9c832d39e..000000000 --- a/pkgs/clan-vm-manager/clan_vm_manager/errors/show_error.py +++ /dev/null @@ -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() diff --git a/pkgs/clan-vm-manager/clan_vm_manager/models/__init__.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/__init__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/models/__init__.py rename to pkgs/clan-vm-manager/clan_vm_manager/singletons/__init__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/models/use_join.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py similarity index 98% rename from pkgs/clan-vm-manager/clan_vm_manager/models/use_join.py rename to pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py index 38197b5f8..6ef619b3d 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/models/use_join.py +++ b/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") diff --git a/pkgs/clan-vm-manager/clan_vm_manager/models/use_views.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_views.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/models/use_views.py rename to pkgs/clan-vm-manager/clan_vm_manager/singletons/use_views.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/models/use_vms.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py similarity index 99% rename from pkgs/clan-vm-manager/clan_vm_manager/models/use_vms.py rename to pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py index 8823de370..27a1a78f4 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/models/use_vms.py +++ b/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") diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py b/pkgs/clan-vm-manager/clan_vm_manager/views/list.py index 4ea89bdf2..483d7f368 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py +++ b/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 diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py index e1c472b9f..f1c45cc8c 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py +++ b/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__)