Various fixes

This commit is contained in:
crschnick
2024-04-25 18:55:41 +00:00
parent 45e2e9a95c
commit 09ffad1ec6
32 changed files with 59 additions and 113 deletions
@@ -74,7 +74,7 @@ public class ShellDialects {
CSH = byId("csh");
ASH = byId("ash");
SH = byId("sh");
NO_INTERACTION = byId("unsupported");
NO_INTERACTION = byId("noInteraction");
CISCO = byId("cisco");
MIKROTIK = byId("mikrotik");
RBASH = byId("rbash");
@@ -10,6 +10,6 @@ public class TerminalInitScriptConfig {
TerminalInitFunction terminalSpecificCommands;
public static TerminalInitScriptConfig ofName(String name) {
return new TerminalInitScriptConfig(name, true, null);
return new TerminalInitScriptConfig(name, true, TerminalInitFunction.none());
}
}
@@ -1,32 +0,0 @@
package io.xpipe.core.store;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
@Getter
public enum DataFlow {
@JsonProperty("input")
INPUT("Input"),
@JsonProperty("output")
OUTPUT("Output"),
@JsonProperty("inputOrOutput")
INPUT_OR_OUTPUT("Input or Output"),
@JsonProperty("inputOutput")
INPUT_OUTPUT("Input/Output"),
@JsonProperty("transformer")
TRANSFORMER("Transformer");
private final String displayName;
DataFlow(String displayName) {
this.displayName = displayName;
}
public boolean hasInput() {
return this == INPUT || this == INPUT_OUTPUT;
}
public boolean hasOutput() {
return this == OUTPUT || this == INPUT_OUTPUT;
}
}
@@ -5,4 +5,8 @@ import java.util.OptionalInt;
public interface FixedChildStore extends DataStore {
OptionalInt getFixedId();
default FixedChildStore merge(FixedChildStore other) {
return this;
}
}
@@ -56,10 +56,15 @@ public interface SingletonSessionStore<T extends SingletonSessionStore.Session>
return;
}
s = newSession();
s.start();
setCache("session", s);
onSessionUpdate(true);
try {
s = newSession();
s.start();
setCache("session", s);
onSessionUpdate(true);
} catch (Exception ex) {
onSessionUpdate(false);
throw ex;
}
}
}