lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-03 11:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust incus/lxd fixues

Browse Source
This commit is contained in:
crschnick
2026-04-02 22:14:00 +00:00
parent d55f8cf322
commit fcd275652e
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStore.java
+10 -11
View File
@@ -97,8 +97,7 @@ public class IncusContainerStore
@Override
public ShellControl control(ShellControl parent) throws Exception {
refreshContainerState(
getInstall().getStore().getHost().getStore().getOrStartSession());
refreshContainerState();
var user = identity != null ? identity.unwrap().getUsername().retrieveUsername() : null;
var sc = view(parent).exec(containerName, user, () -> {
@@ -136,9 +135,9 @@ public class IncusContainerStore
};
}
private void refreshContainerState(ShellControl sc) throws Exception {
private void refreshContainerState() throws Exception {
var state = getState();
var view = view(sc);
var view = view();
var displayState = view.queryContainerState(containerName);
if (displayState.isEmpty()) {
return;
@@ -156,27 +155,27 @@ public class IncusContainerStore
@Override
public void start() throws Exception {
var sc = getInstall().getStore().getHost().getStore().getOrStartSession();
var view = view();
view.start(containerName);
refreshContainerState(sc);
// Give the network some time to initialize so the state
// gets updated to include any IP address
ThreadHelper.sleep(500);
refreshContainerState();
}
@Override
public void stop() throws Exception {
stopSessionIfNeeded();
var sc = getInstall().getStore().getHost().getStore().getOrStartSession();
var view = view();
view.stop(containerName);
refreshContainerState(sc);
refreshContainerState();
}
@Override
public void pause() throws Exception {
var sc = getInstall().getStore().getHost().getStore().getOrStartSession();
var view = view();
view.pause(containerName);
refreshContainerState(sc);
refreshContainerState();
}
@Override
@@ -192,7 +191,7 @@ public class IncusContainerStore
@Override
public void refreshHostAddressOrThrow() throws Exception {
refreshContainerState(getInstall().getStore().getHost().getStore().getOrStartSession());
refreshContainerState();
}
@Override
ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java
+4 -3
View File
@@ -37,11 +37,12 @@ public class IncusContainerStoreProvider implements ShellStoreProvider {
@Override
public ObservableValue<String> informationString(StoreSection section) {
var c = (NetworkContainerStoreState) section.getWrapper().getPersistentState().getValue();
var missing = c.getShellMissing() != null && c.getShellMissing() ? "No shell available" : null;
return StoreStateFormat.shellStore(
section,
(ContainerStoreState s) -> new String[] {missing, DataStoreFormatter.capitalize(s.getContainerState()), c.getIpv4()},
(NetworkContainerStoreState s) -> {
var missing = s.getShellMissing() != null && s.getShellMissing() ? "No shell available" : null;
return new String[] {missing, DataStoreFormatter.capitalize(s.getContainerState()), s.getIpv4()};
},
null);
}
ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStore.java
+3
View File
@@ -157,6 +157,9 @@ public class LxdContainerStore
public void start() throws Exception {
var view = view();
view.start(containerName);
// Give the network some time to initialize so the state
// gets updated to include any IP address
ThreadHelper.sleep(500);
refreshContainerState();
}
ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java
+4 -3
View File
@@ -37,11 +37,12 @@ public class LxdContainerStoreProvider implements ShellStoreProvider {
@Override
public ObservableValue<String> informationString(StoreSection section) {
var c = (NetworkContainerStoreState) section.getWrapper().getPersistentState().getValue();
var missing = c.getShellMissing() != null && c.getShellMissing() ? "No shell available" : null;
return StoreStateFormat.shellStore(
section,
(ContainerStoreState s) -> new String[] {missing, DataStoreFormatter.capitalize(s.getContainerState()), c.getIpv4()},
(NetworkContainerStoreState s) -> {
var missing = s.getShellMissing() != null && s.getShellMissing() ? "No shell available" : null;
return new String[] {missing, DataStoreFormatter.capitalize(s.getContainerState()), s.getIpv4()};
},
null);
}