From 8dcfebd9f9027a8cd6ef72ed39a59ab4bfa5ad81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 12 Mar 2024 17:23:12 +0100 Subject: [PATCH 1/2] Revert "workaround gitea bug" This reverts commit 8697d6462524c29309048f304188e5ac6a82f106. --- .gitea/workflows/{build.yaml => checks.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename .gitea/workflows/{build.yaml => checks.yaml} (91%) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/checks.yaml similarity index 91% rename from .gitea/workflows/build.yaml rename to .gitea/workflows/checks.yaml index 7fa8d3370..7804a1659 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/checks.yaml @@ -5,17 +5,17 @@ on: branches: - main jobs: - test: + checks: runs-on: nix steps: - uses: actions/checkout@v3 - run: nix run --refresh github:Mic92/nix-fast-build -- --no-nom --eval-workers 20 - test-links: + check-links: runs-on: nix steps: - uses: actions/checkout@v3 - run: nix run --refresh --inputs-from .# nixpkgs#lychee . - test-impure: + checks-impure: runs-on: nix steps: - uses: actions/checkout@v3 From 40ee794be9904617e059c157d055ac1fdc596c8a Mon Sep 17 00:00:00 2001 From: Qubasa Date: Tue, 12 Mar 2024 23:19:20 +0700 Subject: [PATCH 2/2] clan_vm_manager: Fix mypy errors for clan_cli types --- .../clan_vm_manager/components/vmobj.py | 3 ++- .../clan_vm_manager/singletons/use_join.py | 1 + .../clan_vm_manager/singletons/use_vms.py | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py index 0c885b1ae..5caf7b02c 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py @@ -116,7 +116,7 @@ class VMObject(GObject.Object): @contextmanager def _create_machine(self) -> Generator[Machine, None, None]: uri = ClanURI.from_str( - url=self.data.flake.flake_url, machine_name=self.data.flake.flake_attr + url=str(self.data.flake.flake_url), machine_name=self.data.flake.flake_attr ) if uri.flake_id.is_local(): self.machine = Machine( @@ -128,6 +128,7 @@ class VMObject(GObject.Object): name=self.data.flake.flake_attr, flake=uri.flake_id.url, ) + assert self.machine is not None yield self.machine self.machine = None diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py index b52b41ef2..6e71d1663 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py @@ -97,6 +97,7 @@ class JoinList: def _on_join_finished(self, source: JoinValue) -> None: log.info(f"Join finished: {source.url}") self.discard(source) + assert source.entry is not None ClanStore.use().push_history_entry(source.entry) def discard(self, value: JoinValue) -> None: diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py index 71854844d..8a7254825 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py @@ -73,18 +73,18 @@ class ClanStore: def push_history_entry(self, entry: HistoryEntry) -> None: # TODO: We shouldn't do this here but in the list view if entry.flake.icon is None: - icon = assets.loc / "placeholder.jpeg" + icon: Path = assets.loc / "placeholder.jpeg" else: - icon = entry.flake.icon + icon = Path(entry.flake.icon) vm = VMObject( - icon=Path(icon), + icon=icon, data=entry, ) self.push(vm) def push(self, vm: VMObject) -> None: - url = vm.data.flake.flake_url + url = str(vm.data.flake.flake_url) # Only write to the store if the Clan is not already in it # Every write to the KVStore rerenders bound widgets to the clan_store @@ -108,7 +108,7 @@ class ClanStore: vm_store.append(vm) def remove(self, vm: VMObject) -> None: - del self.clan_store[vm.data.flake.flake_url][vm.data.flake.flake_attr] + del self.clan_store[str(vm.data.flake.flake_url)][vm.data.flake.flake_attr] def get_vm(self, uri: ClanURI) -> None | VMObject: vm_store = self.clan_store.get(str(uri.flake_id))