mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-06-22 22:40:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Squash merge branch 15-release into master

Browse Source
This commit is contained in:
crschnick
2025-02-11 11:17:48 +00:00
parent c7171ce204
commit b494c69ded
4295 changed files with 5438 additions and 64653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/system/src/main/java/io/xpipe/ext/system/incus/IncusCommandView.java
View File

@@ -139,9 +139,10 @@ public class IncusCommandView extends CommandViewBase {
}
public ShellControl exec(String container, String user) {
return shellControl
.subShell(createOpenFunction(container, user, false), createOpenFunction(container, user, true))
.withErrorFormatter(IncusCommandView::formatErrorMessage)
var sub = shellControl.subShell();
sub.setDumbOpen(createOpenFunction(container, user, false));
sub.setTerminalOpen(createOpenFunction(container, user, true));
return sub.withErrorFormatter(IncusCommandView::formatErrorMessage)
.withExceptionConverter(IncusCommandView::convertException)
.elevated(requiresElevation());
}

4
ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java
View File

@@ -104,8 +104,8 @@ public class IncusContainerStoreProvider implements ShellStoreProvider {
}
@Override
public List<String> getPossibleNames() {
return List.of("incusContainer");
public String getId() {
return "incusContainer";
}
@Override

4
ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java
View File

@@ -73,8 +73,8 @@ public class IncusInstallStoreProvider implements DataStoreProvider {
}
@Override
public List<String> getPossibleNames() {
return List.of("incusInstall");
public String getId() {
return "incusInstall";
}
@Override

4
ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java
View File

@@ -73,8 +73,8 @@ public class LxdCmdStoreProvider implements DataStoreProvider {
}
@Override
public List<String> getPossibleNames() {
return List.of("lxdCmd");
public String getId() {
return "lxdCmd";
}
@Override

7
ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCommandView.java
View File

@@ -151,9 +151,10 @@ public class LxdCommandView extends CommandViewBase {
}
public ShellControl exec(String container, String user) {
return shellControl
.subShell(createOpenFunction(container, user, false), createOpenFunction(container, user, true))
.withErrorFormatter(LxdCommandView::formatErrorMessage)
var sub = shellControl.subShell();
sub.setDumbOpen(createOpenFunction(container, user, false));
sub.setTerminalOpen(createOpenFunction(container, user, true));
return sub.withErrorFormatter(LxdCommandView::formatErrorMessage)
.withExceptionConverter(LxdCommandView::convertException)
.elevated(requiresElevation());
}

4
ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java
View File

@@ -101,8 +101,8 @@ public class LxdContainerStoreProvider implements ShellStoreProvider {
}
@Override
public List<String> getPossibleNames() {
return List.of("lxd", "lxd_container");
public String getId() {
return "lxd";
}
@Override

4
ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java
View File

@@ -73,8 +73,8 @@ public class PodmanCmdStoreProvider implements DataStoreProvider {
}
@Override
public List<String> getPossibleNames() {
return List.of("podmanCmd");
public String getId() {
return "podmanCmd";
}
@Override

7
ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCommandView.java
View File

@@ -112,9 +112,10 @@ public class PodmanCommandView extends CommandViewBase {
}
public ShellControl exec(String container) {
return shellControl
.subShell(createOpenFunction(container, false), createOpenFunction(container, true))
.withErrorFormatter(PodmanCommandView::formatErrorMessage)
var sub = shellControl.subShell();
sub.setDumbOpen(createOpenFunction(container, false));
sub.setTerminalOpen(createOpenFunction(container, true));
return sub.withErrorFormatter(PodmanCommandView::formatErrorMessage)
.withExceptionConverter(PodmanCommandView::convertException);
}

4
ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java
View File

@@ -104,8 +104,8 @@ public class PodmanContainerStoreProvider implements ShellStoreProvider {
}
@Override
public List<String> getPossibleNames() {
return List.of("podman", "podman_container");
public String getId() {
return "podman";
}
@Override