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

Small shell fixes and cleanup

Browse source
This commit is contained in:
Christopher Schnick 2022-12-11 03:45:51 +01:00
parent 87d0830f3c
commit e9340c40a8
6 changed files with 20 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/main/java/io/xpipe/core/process/CommandProcessControl.java
View file

@ -58,7 +58,6 @@ public interface CommandProcessControl extends ProcessControl {
@Override @Override
CommandProcessControl start() throws Exception; CommandProcessControl start() throws Exception;
@Override
CommandProcessControl exitTimeout(Integer timeout); CommandProcessControl exitTimeout(Integer timeout);
String readOnlyStdout() throws Exception; String readOnlyStdout() throws Exception;

2
core/src/main/java/io/xpipe/core/process/ProcessControl.java
View file

@ -24,8 +24,6 @@ public interface ProcessControl extends Closeable, AutoCloseable {
void close() throws IOException; void close() throws IOException;
void kill() throws Exception; void kill() throws Exception;
ProcessControl exitTimeout(Integer timeout);
ProcessControl start() throws Exception; ProcessControl start() throws Exception;
InputStream getStdout(); InputStream getStdout();

6
core/src/main/java/io/xpipe/core/process/ShellProcessControl.java
View file

@ -35,12 +35,6 @@ public interface ShellProcessControl extends ProcessControl {
} }
} }
default void executeSimpleCommand(List<String> command) throws Exception {
try (CommandProcessControl c = command(command).start()) {
c.discardOrThrow();
}
}
default String executeStringSimpleCommand(ShellType type, String command) throws Exception { default String executeStringSimpleCommand(ShellType type, String command) throws Exception {
try (var sub = subShell(type).start()) { try (var sub = subShell(type).start()) {
return sub.executeStringSimpleCommand(command); return sub.executeStringSimpleCommand(command);

2
core/src/main/java/io/xpipe/core/util/SimpleProxyFunction.java
View file

@ -5,6 +5,7 @@ import lombok.SneakyThrows;
public abstract class SimpleProxyFunction<T> extends ProxyFunction { public abstract class SimpleProxyFunction<T> extends ProxyFunction {
@SneakyThrows @SneakyThrows
@SuppressWarnings("unchecked")
public T getResult() { public T getResult() {
var fields = getClass().getDeclaredFields(); var fields = getClass().getDeclaredFields();
var last = fields[fields.length - 1]; var last = fields[fields.length - 1];
@ -13,6 +14,7 @@ public abstract class SimpleProxyFunction<T> extends ProxyFunction {
} }
@SneakyThrows @SneakyThrows
@SuppressWarnings("unchecked")
public T callAndGet() { public T callAndGet() {
var result = callAndCopy(); var result = callAndCopy();
return ((SimpleProxyFunction<T>) result).getResult(); return ((SimpleProxyFunction<T>) result).getResult();

18
extension/src/main/java/io/xpipe/extension/util/ApplicationHelper.java Normal file
View file

@ -0,0 +1,18 @@
package io.xpipe.extension.util;
import io.xpipe.core.process.ShellProcessControl;
import java.io.IOException;
public class ApplicationHelper {
public static boolean isInPath(ShellProcessControl processControl, String executable) throws Exception {
return processControl.executeBooleanSimpleCommand(processControl.getShellType().createWhichCommand(executable));
}
public static void checkSupport(ShellProcessControl processControl, String executable, String displayName) throws Exception {
if (!isInPath(processControl, executable)) {
throw new IOException(displayName + " executable " + executable + " not found in PATH");
}
}
}

41
extension/src/main/java/io/xpipe/extension/util/ExpectHelper.java
View file

@ -1,41 +0,0 @@
package io.xpipe.extension.util;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.List;
import java.util.stream.Collectors;
public class ExpectHelper {
private static Path extractedExecutable = null;
private static Path getExtractedExecutable() {
if (extractedExecutable == null) {
XPipeDaemon.getInstance().withResource("io.xpipe.extension", "bin/expect.exe", path -> {
extractedExecutable = Files.createTempFile(null, ".exe");
Files.copy(path, extractedExecutable, StandardCopyOption.REPLACE_EXISTING);
});
}
return extractedExecutable;
}
public static List<String> executeExpect(List<String> command, String password) throws IOException {
var file = Files.createTempFile(null, ".lua");
Files.writeString(file, expectFile(command, password));
return List.of(getExtractedExecutable().toString(), file.toString());
}
private static String expectFile(List<String> command, String password) {
return String.format("""
echo(false)
if spawn(%s) then
expect(":")
sendln("%s")
echo(true)
end
""", command.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(", ")), password);
}
}