Rework launchable stores

Author: crschnick

core/src/main/java/io/xpipe/core/process/ShellTtyState.java

@@ -9,7 +9,7 @@ public enum ShellTtyState {
     @JsonProperty("none")
     NONE(true, false, false, true, true),
     @JsonProperty("merged")
-    MERGED_STDERR(false, false, false, false, true),
+    MERGED_STDERR(false, true, false, false, false),
     @JsonProperty("pty")
     PTY_ALLOCATED(false, true, true, false, false);
 

core/src/main/java/io/xpipe/core/store/LaunchableStore.java

@@ -3,7 +3,7 @@
 import io.xpipe.core.process.ProcessControl;
 import io.xpipe.core.process.ShellControl;
 
-public interface ShellStore extends DataStore, LaunchableStore, FileSystemStore, ValidatableStore {
+public interface ShellStore extends DataStore, FileSystemStore, ValidatableStore {
 
     static boolean isLocal(ShellStore s) {
         return s instanceof LocalStore;

core/src/main/java/io/xpipe/core/store/ShellStore.java

@@ -2,19 +2,10 @@
 
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.ext.ActionProvider;
-import io.xpipe.app.storage.DataStorage;
-import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.app.storage.DataStoreEntryRef;
-import io.xpipe.app.util.TerminalLauncher;
 import io.xpipe.core.store.DataStore;
-import io.xpipe.core.store.LaunchableStore;
-import io.xpipe.core.store.ShellStore;
-import io.xpipe.ext.base.script.ScriptStore;
-
 import javafx.beans.value.ObservableValue;
 
-import lombok.Value;
-
 public class LaunchStoreAction implements ActionProvider {
 
     @Override
@@ -33,7 +24,7 @@ public boolean canLinkTo() {
 
             @Override
             public ActionProvider.Action createAction(DataStoreEntryRef<DataStore> store) {
-                return new Action(store.get());
+                return store.get().getProvider().launchAction(store.get());
             }
 
             @Override
@@ -44,8 +35,7 @@ public Class<DataStore> getApplicableClass() {
             @Override
             public boolean isApplicable(DataStoreEntryRef<DataStore> o) {
                 return o.get().getValidity().isUsable()
-                        && (o.getStore() instanceof LaunchableStore
-                                || o.get().getProvider().launchAction(o.get()) != null);
+                        && (o.get().getProvider().launchAction(o.get()) != null);
             }
 
             @Override
@@ -66,7 +56,7 @@ public DefaultDataStoreCallSite<?> getDefaultDataStoreCallSite() {
 
             @Override
             public ActionProvider.Action createAction(DataStoreEntryRef<DataStore> store) {
-                return new Action(store.get());
+                return store.get().getProvider().launchAction(store.get());
             }
 
             @Override
@@ -77,33 +67,8 @@ public Class<DataStore> getApplicableClass() {
             @Override
             public boolean isApplicable(DataStoreEntryRef<DataStore> o) {
                 return o.get().getValidity().isUsable()
-                        && (o.getStore() instanceof LaunchableStore
-                                || o.get().getProvider().launchAction(o.get()) != null);
+                        && (o.get().getProvider().launchAction(o.get()) != null);
             }
         };
     }
-
-    @Value
-    static class Action implements ActionProvider.Action {
-
-        DataStoreEntry entry;
-
-        @Override
-        public void execute() throws Exception {
-            var storeName = DataStorage.get().getStoreEntryDisplayName(entry);
-            if (entry.getStore() instanceof ShellStore s) {
-                TerminalLauncher.open(entry, storeName, null, ScriptStore.controlWithDefaultScripts(s.control()));
-                return;
-            }
-
-            if (entry.getStore() instanceof LaunchableStore s) {
-                s.launch();
-                return;
-            }
-
-            if (entry.getProvider().launchAction(entry) != null) {
-                entry.getProvider().launchAction(entry).execute();
-            }
-        }
-    }
 }

ext/base/src/main/java/io/xpipe/ext/base/action/LaunchStoreAction.java

@@ -43,7 +43,8 @@ public Action createAction(List<String> args) throws Exception {
                         if (!entry.getValidity().isUsable()) {
                             return null;
                         }
-                        return new LaunchStoreAction.Action(entry);
+                        var p = entry.getProvider();
+                        return p.launchAction(entry);
                     }
                     case "action" -> {
                         var id = args.get(1);