From c2a156221cd735a0adfe8552708848d7fb2c7a23 Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 30 Jun 2025 03:35:58 +0000 Subject: [PATCH] Fixes --- .../io/xpipe/app/action/ActionProvider.java | 17 +++++++++++++ ext/system/src/main/java/module-info.java | 25 ++++++++----------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/action/ActionProvider.java b/app/src/main/java/io/xpipe/app/action/ActionProvider.java index 8cf030d1d..d2e9e88a4 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionProvider.java +++ b/app/src/main/java/io/xpipe/app/action/ActionProvider.java @@ -1,6 +1,10 @@ package io.xpipe.app.action; import io.xpipe.app.ext.DataStoreProviders; +import io.xpipe.app.hub.action.BatchHubProvider; +import io.xpipe.app.hub.action.HubBranchProvider; +import io.xpipe.app.hub.action.HubLeafProvider; +import io.xpipe.app.hub.action.HubMenuItemProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.TrackEvent; import io.xpipe.core.util.ModuleLayerLoader; @@ -16,6 +20,19 @@ public interface ActionProvider { for (ActionProvider actionProvider : ALL) { try { actionProvider.init(); + + // For debugging +// if (actionProvider instanceof HubLeafProvider) { +// actionProvider.getActionClass().orElseThrow(); +// } +// if (actionProvider instanceof HubBranchProvider b) { +// for (HubMenuItemProvider child : b.getChildren(null)) { +// if (ALL.stream().noneMatch(a -> a.getClass().equals(child.getClass()))) { +// System.out.println(child.getClass()); +// } +// } +// } + } catch (Throwable t) { ErrorEventFactory.fromThrowable(t).handle(); } diff --git a/ext/system/src/main/java/module-info.java b/ext/system/src/main/java/module-info.java index 0786b65ef..69ced3475 100644 --- a/ext/system/src/main/java/module-info.java +++ b/ext/system/src/main/java/module-info.java @@ -1,18 +1,9 @@ import io.xpipe.app.action.ActionProvider; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.ScanProvider; -import io.xpipe.ext.system.incus.IncusContainerActionProviderMenu; -import io.xpipe.ext.system.incus.IncusContainerStoreProvider; -import io.xpipe.ext.system.incus.IncusInstallStoreProvider; -import io.xpipe.ext.system.incus.IncusScanProvider; -import io.xpipe.ext.system.lxd.LxdCmdStoreProvider; -import io.xpipe.ext.system.lxd.LxdContainerActionProviderMenu; -import io.xpipe.ext.system.lxd.LxdContainerStoreProvider; -import io.xpipe.ext.system.lxd.LxdScanProvider; -import io.xpipe.ext.system.podman.PodmanCmdStoreProvider; -import io.xpipe.ext.system.podman.PodmanContainerActionProviderMenu; -import io.xpipe.ext.system.podman.PodmanContainerStoreProvider; -import io.xpipe.ext.system.podman.PodmanScanProvider; +import io.xpipe.ext.system.incus.*; +import io.xpipe.ext.system.lxd.*; +import io.xpipe.ext.system.podman.*; open module io.xpipe.ext.system { requires com.fasterxml.jackson.databind; @@ -36,7 +27,13 @@ open module io.xpipe.ext.system { PodmanContainerStoreProvider, PodmanCmdStoreProvider; provides ActionProvider with - IncusContainerActionProviderMenu, + IncusContainerActionProviderMenu, IncusContainerConsoleActionProvider, + IncusContainerEditConfigActionProvider, + IncusContainerEditRunConfigActionProvider, LxdContainerConsoleActionProvider, + LxdContainerEditConfigActionProvider, + LxdContainerEditRunConfigActionProvider, LxdContainerActionProviderMenu, - PodmanContainerActionProviderMenu; + PodmanContainerActionProviderMenu, PodmanContainerInspectActionProvider, + PodmanContainerAttachActionProvider, + PodmanContainerLogsActionProvider; }