CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-28 23:31:43 +12:00
Code Issues Projects Releases Packages Wiki Activity

Don't minimize detached windows applications

Browse source
This commit is contained in:
crschnick 2024-01-19 21:16:59 +00:00
parent a1ec6cb422
commit 00a36628e9
6 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/xpipe/app/browser/action/ExecuteApplicationAction.java
View file

@ -2,7 +2,7 @@ package io.xpipe.app.browser.action;
import io.xpipe.app.browser.BrowserEntry; import io.xpipe.app.browser.BrowserEntry;
import io.xpipe.app.browser.OpenFileSystemModel; import io.xpipe.app.browser.OpenFileSystemModel;
import io.xpipe.app.util.ScriptHelper; import io.xpipe.app.util.ApplicationHelper;
import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellControl;
import java.util.List; import java.util.List;
@ -14,7 +14,7 @@ public abstract class ExecuteApplicationAction implements LeafAction, Applicatio
ShellControl sc = model.getFileSystem().getShell().orElseThrow(); ShellControl sc = model.getFileSystem().getShell().orElseThrow();
for (BrowserEntry entry : entries) { for (BrowserEntry entry : entries) {
var command = detach() var command = detach()
? ScriptHelper.createDetachCommand(sc, createCommand(model, entry)) ? ApplicationHelper.createDetachCommand(sc, createCommand(model, entry))
: createCommand(model, entry); : createCommand(model, entry);
try (var cc = sc.command(command) try (var cc = sc.command(command)
.withWorkingDirectory(model.getCurrentDirectory().getPath()) .withWorkingDirectory(model.getCurrentDirectory().getPath())

4
app/src/main/java/io/xpipe/app/browser/action/MultiExecuteAction.java
View file

@ -3,7 +3,7 @@ package io.xpipe.app.browser.action;
import io.xpipe.app.browser.BrowserEntry; import io.xpipe.app.browser.BrowserEntry;
import io.xpipe.app.browser.OpenFileSystemModel; import io.xpipe.app.browser.OpenFileSystemModel;
import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.app.util.ScriptHelper; import io.xpipe.app.util.ApplicationHelper;
import io.xpipe.app.util.TerminalHelper; import io.xpipe.app.util.TerminalHelper;
import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellControl;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
@ -51,7 +51,7 @@ public abstract class MultiExecuteAction implements BranchAction {
model.withShell( model.withShell(
pc -> { pc -> {
for (BrowserEntry entry : entries) { for (BrowserEntry entry : entries) {
var cmd = ScriptHelper.createDetachCommand(pc, createCommand(pc, model, entry)); var cmd = ApplicationHelper.createDetachCommand(pc, createCommand(pc, model, entry));
pc.command(cmd) pc.command(cmd)
.withWorkingDirectory(model.getCurrentDirectory() .withWorkingDirectory(model.getCurrentDirectory()
.getPath()) .getPath())

2
app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java
View file

@ -555,7 +555,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
.resolve("wezterm-gui").toString()) .resolve("wezterm-gui").toString())
.add("start") .add("start")
.addFile(configuration.getScriptFile()).buildString(LocalShell.getShell()); .addFile(configuration.getScriptFile()).buildString(LocalShell.getShell());
c = ScriptHelper.createDetachCommand(LocalShell.getShell(), c); c = ApplicationHelper.createDetachCommand(LocalShell.getShell(), c);
LocalShell.getShell().executeSimpleCommand(c); LocalShell.getShell().executeSimpleCommand(c);
} }
}; };

2
app/src/main/java/io/xpipe/app/prefs/TroubleshootComp.java
View file

@ -67,7 +67,7 @@ public class TroubleshootComp extends Comp<CompStructure<?>> {
XPipeInstallation.getDaemonDebugScriptPath(sc.getOsType())); XPipeInstallation.getDaemonDebugScriptPath(sc.getOsType()));
if (sc.getOsType().equals(OsType.WINDOWS)) { if (sc.getOsType().equals(OsType.WINDOWS)) {
sc.executeSimpleCommand( sc.executeSimpleCommand(
ScriptHelper.createDetachCommand(sc, "\"" + script + "\"")); ApplicationHelper.createDetachCommand(sc, "\"" + script + "\""));
} else { } else {
TerminalHelper.open("XPipe Debug", LocalShell.getShell().command("\"" + script + "\"")); TerminalHelper.open("XPipe Debug", LocalShell.getShell().command("\"" + script + "\""));
} }

19
app/src/main/java/io/xpipe/app/util/ApplicationHelper.java
View file

@ -3,7 +3,9 @@ package io.xpipe.app.util;
import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.issue.TrackEvent;
import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntry;
import io.xpipe.core.process.OsType;
import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellControl;
import io.xpipe.core.process.ShellDialects;
import io.xpipe.core.util.FailableSupplier; import io.xpipe.core.util.FailableSupplier;
import java.io.IOException; import java.io.IOException;
@ -24,7 +26,7 @@ public class ApplicationHelper {
public static void executeLocalApplication(Function<ShellControl, String> s, boolean detach) throws Exception { public static void executeLocalApplication(Function<ShellControl, String> s, boolean detach) throws Exception {
try (var sc = LocalShell.getShell().start()) { try (var sc = LocalShell.getShell().start()) {
var cmd = detach ? ScriptHelper.createDetachCommand(sc, s.apply(sc)) : s.apply(sc); var cmd = detach ? createDetachCommand(sc, s.apply(sc)) : s.apply(sc);
TrackEvent.withDebug("proc", "Executing local application") TrackEvent.withDebug("proc", "Executing local application")
.tag("command", cmd) .tag("command", cmd)
.handle(); .handle();
@ -34,6 +36,21 @@ public class ApplicationHelper {
} }
} }
public static String createDetachCommand(ShellControl pc, String command) {
if (pc.getShellDialect().equals(ShellDialects.POWERSHELL)) {
var script = ScriptHelper.createExecScript(pc, command);
return String.format(
"Start-Process -FilePath powershell.exe -ArgumentList \"-NoProfile\", \"-File\", %s",
ShellDialects.POWERSHELL.fileArgument(script));
}
if (pc.getOsType().equals(OsType.WINDOWS)) {
return "start \"\" " + command;
} else {
return "nohup " + command + " </dev/null &>/dev/null & disown";
}
}
public static boolean isInPath(ShellControl processControl, String executable) throws Exception { public static boolean isInPath(ShellControl processControl, String executable) throws Exception {
return processControl.executeSimpleBooleanCommand( return processControl.executeSimpleBooleanCommand(
processControl.getShellDialect().getWhichCommand(executable)); processControl.getShellDialect().getWhichCommand(executable));

15
app/src/main/java/io/xpipe/app/util/ScriptHelper.java
View file

@ -11,21 +11,6 @@ import java.util.Random;
public class ScriptHelper { public class ScriptHelper {
public static String createDetachCommand(ShellControl pc, String command) {
if (pc.getShellDialect().equals(ShellDialects.POWERSHELL)) {
var script = ScriptHelper.createExecScript(pc, command);
return String.format(
"Start-Process -WindowStyle Minimized -FilePath powershell.exe -ArgumentList \"-NoProfile\", \"-File\", %s",
ShellDialects.POWERSHELL.fileArgument(script));
}
if (pc.getOsType().equals(OsType.WINDOWS)) {
return "start \"\" /MIN " + command;
} else {
return "nohup " + command + " </dev/null &>/dev/null & disown";
}
}
public static int getScriptId() { public static int getScriptId() {
// A deterministic approach can cause permission problems when two different users execute the same command on a // A deterministic approach can cause permission problems when two different users execute the same command on a
// system // system