Rework elevation function

JVVMEDIA · Apr 29, 2024 · 733df4c · 733df4c
1 parent 9c3eaa4
commit 733df4c
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 18 deletions.
diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
@@ -116,7 +116,9 @@ protected final Region createSimple() {
 
         var loading = LoadingOverlayComp.noProgress(
                 Comp.of(() -> button),
-                wrapper.getBusy().or(wrapper.getEntry().getProvider().busy(wrapper)));
+                wrapper.getEntry().getValidity().isUsable() ?
+                        wrapper.getBusy().or(wrapper.getEntry().getProvider().busy(wrapper)):
+                wrapper.getBusy());
         return loading.createRegion();
     }
 

diff --git a/core/src/main/java/io/xpipe/core/process/CommandControl.java b/core/src/main/java/io/xpipe/core/process/CommandControl.java
@@ -1,7 +1,6 @@
 package io.xpipe.core.process;
 
 import io.xpipe.core.util.FailableConsumer;
-import io.xpipe.core.util.FailableFunction;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -64,11 +63,7 @@ default boolean executeAndCheck() throws Exception {
 
     long getExitCode();
 
-    default CommandControl elevated(String message) {
-        return elevated(message, (v) -> true);
-    }
-
-    CommandControl elevated(String message, FailableFunction<ShellControl, Boolean, Exception> elevationFunction);
+    CommandControl elevated(ElevationFunction function);
 
     void withStdoutOrThrow(FailableConsumer<InputStreamReader, Exception> c);
 

diff --git a/core/src/main/java/io/xpipe/core/process/ElevationConfig.java b/core/src/main/java/io/xpipe/core/process/ElevationConfig.java
diff --git a/core/src/main/java/io/xpipe/core/process/ElevationFunction.java b/core/src/main/java/io/xpipe/core/process/ElevationFunction.java
@@ -0,0 +1,69 @@
+package io.xpipe.core.process;
+
+import io.xpipe.core.util.FailableFunction;
+
+public interface ElevationFunction {
+
+    static ElevationFunction of(String prefix, FailableFunction<ShellControl, Boolean, Exception> f) {
+        return new ElevationFunction() {
+            @Override
+            public String getPrefix() {
+                return prefix;
+            }
+
+            @Override
+            public boolean isSpecified() {
+                return true;
+            }
+
+            @Override
+            public boolean apply(ShellControl shellControl) throws Exception {
+                return f.apply(shellControl);
+            }
+        };
+    }
+
+    static ElevationFunction elevated(String prefix) {
+        return new ElevationFunction() {
+            @Override
+            public String getPrefix() {
+                return prefix;
+            }
+
+            @Override
+            public boolean isSpecified() {
+                return true;
+            }
+
+            @Override
+            public boolean apply(ShellControl shellControl) {
+                return true;
+            }
+        };
+    }
+
+    static ElevationFunction none() {
+        return new ElevationFunction() {
+            @Override
+            public String getPrefix() {
+                return null;
+            }
+
+            @Override
+            public boolean isSpecified() {
+                return false;
+            }
+
+            @Override
+            public boolean apply(ShellControl shellControl) {
+                return false;
+            }
+        };
+    }
+
+    String getPrefix();
+
+    boolean isSpecified();
+
+    boolean apply(ShellControl shellControl) throws Exception;
+}
diff --git a/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java
@@ -171,7 +171,7 @@ String buildElevatedCommand(CommandConfiguration input, String prefix, UUID requ
 
     OsType.Any getOsType();
 
-    ShellControl elevated(String message, FailableFunction<ShellControl, Boolean, Exception> elevationFunction);
+    ShellControl elevated(ElevationFunction elevationFunction);
 
     ShellControl withInitSnippet(ScriptSnippet snippet);
 

diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/SampleAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/SampleAction.java
@@ -5,6 +5,7 @@
 import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.app.storage.DataStoreEntryRef;
 import io.xpipe.core.process.CommandControl;
+import io.xpipe.core.process.ElevationFunction;
 import io.xpipe.core.process.ShellControl;
 import io.xpipe.core.process.ShellDialects;
 import io.xpipe.core.store.LocalStore;
@@ -125,7 +126,7 @@ public void execute() throws Exception {
                 // by using the information from the connection store.
                 // You can also set a custom working directory.
                 try (CommandControl cc = sc.command("kill <pid>")
-                        .elevated("kill")
+                        .elevated(ElevationFunction.elevated("kill"))
                         .withWorkingDirectory("/")
                         .start()) {
                     // Discard any output but throw an exception with the stderr contents if the exit code is not 0