beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement terminal restart

Browse source
This commit is contained in:
crschnick 2024-09-19 06:20:28 +00:00
parent ef64e39fda
commit cab55594fb
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java
View file

@ -55,11 +55,17 @@ public class TerminalLauncherManager {
public static CountDownLatch submitAsync(
UUID request, ProcessControl processControl, TerminalInitScriptConfig config, String directory) {
synchronized (entries) {
var entry = new Entry(request, processControl, config, directory, null);
entries.put(request, entry);
var entry = entries.get(request);
if (entry == null) {
entry = new Entry(request, processControl, config, directory, null, false);
entries.put(request, entry);
} else {
entry.setResult(null);
}
var latch = new CountDownLatch(1);
Entry finalEntry = entry;
ThreadHelper.runAsync(() -> {
prepare(processControl, config, directory, entry);
prepare(processControl, config, directory, finalEntry);
latch.countDown();
});
return latch;
@ -67,16 +73,14 @@ public class TerminalLauncherManager {
}
public static Path waitForNextLaunch() throws BeaconClientException, BeaconServerException {
Map.Entry<UUID, Entry> first;
Entry first;
synchronized (entries) {
if (entries.isEmpty()) {
first = entries.values().stream().filter(entry -> !entry.isLaunched()).findFirst().orElse(null);
if (first == null) {
throw new BeaconClientException("Unknown launch request");
}
first = entries.firstEntry();
entries.remove(first.getKey());
}
return waitForCompletion(first.getValue());
return waitForCompletion(first);
}
public static Path waitForCompletion(UUID request) throws BeaconClientException, BeaconServerException {
@ -101,7 +105,6 @@ public class TerminalLauncherManager {
synchronized (entries) {
var r = e.getResult();
if (r instanceof ResultFailure failure) {
entries.remove(e.getRequest());
var t = failure.getThrowable();
throw new BeaconServerException(t);
}
@ -113,7 +116,7 @@ public class TerminalLauncherManager {
public static Path performLaunch(UUID request) throws BeaconClientException {
synchronized (entries) {
var e = entries.remove(request);
var e = entries.values().stream().filter(entry -> entry.getRequest().equals(request)).findFirst().orElse(null);
if (e == null) {
throw new BeaconClientException("Unknown launch request " + request);
}
@ -139,6 +142,10 @@ public class TerminalLauncherManager {
@Setter
@NonFinal
Result result;
@Setter
@NonFinal
boolean launched;
}
@Value

1
lang/app/strings/translations_en.properties
View file

@ -373,7 +373,6 @@ developerModeDescription=When enabled, you will have access to a variety of addi
editor=Editor
custom=Custom
passwordManagerCommand=Password manager command
#force
passwordManagerCommandDescription=The password manager implementation or custom command to execute to fetch passwords. For custom commands, the placeholder string $KEY will be replaced by the quoted password key when called. This should call your password manager CLI to print the password to stdout, e.g. mypassmgr get $KEY.\n\nYou can then set the key to be retrieved whenever you set up a connection which requires a password.
passwordManagerCommandTest=Test password manager
passwordManagerCommandTestDescription=You can test here whether the output looks correct if you have set up a password manager command. The command should only output the password itself to stdout, no other formatting should be included in the output.