lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-08-11 20:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework state and license checks

Browse Source
This commit is contained in:
crschnick
2024-11-24 14:29:08 +00:00
parent 51288823e6
commit b18f44eaf5
27 changed files with 102 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/base/src/main/java/io/xpipe/ext/base/action/RunScriptActionMenu.java
+8 -7
View File
@@ -10,6 +10,7 @@ import io.xpipe.app.storage.DataStoreEntryRef;
import io.xpipe.app.terminal.TerminalLauncher;
import io.xpipe.core.process.ShellStoreState;
import io.xpipe.core.process.ShellTtyState;
import io.xpipe.core.process.SystemState;
import io.xpipe.ext.base.script.ScriptHierarchy;
import javafx.beans.property.SimpleStringProperty;
@@ -259,14 +260,14 @@ public class RunScriptActionMenu implements ActionProvider {
@Override
public boolean isApplicable(DataStoreEntryRef<ShellStore> o) {
var state = o.get().getStorePersistentState();
if (state instanceof ShellStoreState shellStoreState) {
return (shellStoreState.getShellDialect() == null
|| shellStoreState
if (state instanceof SystemState systemState) {
return (systemState.getShellDialect() == null
|| systemState
.getShellDialect()
.getDumbMode()
.supportsAnyPossibleInteraction())
&& (shellStoreState.getTtyState() == null
|| shellStoreState.getTtyState() == ShellTtyState.NONE);
&& (systemState.getTtyState() == null
|| systemState.getTtyState() == ShellTtyState.NONE);
} else {
return false;
}
@@ -276,7 +277,7 @@ public class RunScriptActionMenu implements ActionProvider {
public List<? extends ActionProvider> getChildren(DataStoreEntryRef<ShellStore> store) {
var replacement = ProcessControlProvider.get().replace(store);
var state = replacement.getEntry().getStorePersistentState();
if (!(state instanceof ShellStoreState shellStoreState) || shellStoreState.getShellDialect() == null) {
if (!(state instanceof SystemState systemState) || systemState.getShellDialect() == null) {
return List.of(new NoScriptsActionProvider());
}
@@ -285,7 +286,7 @@ public class RunScriptActionMenu implements ActionProvider {
return false;
}
if (!ref.getStore().isCompatible(shellStoreState.getShellDialect())) {
if (!ref.getStore().isCompatible(systemState.getShellDialect())) {
return false;
}
ext/base/src/main/java/io/xpipe/ext/base/action/ScanStoreAction.java
+6 -5
View File
@@ -9,6 +9,7 @@ import io.xpipe.app.util.ScanAlert;
import io.xpipe.core.process.ShellStoreState;
import io.xpipe.core.process.ShellTtyState;
import io.xpipe.core.process.SystemState;
import javafx.beans.value.ObservableValue;
import lombok.Value;
@@ -37,14 +38,14 @@ public class ScanStoreAction implements ActionProvider {
@Override
public boolean isApplicable(DataStoreEntryRef<ShellStore> o) {
var state = o.get().getStorePersistentState();
if (state instanceof ShellStoreState shellStoreState) {
return (shellStoreState.getShellDialect() == null
|| shellStoreState
if (state instanceof SystemState systemState) {
return (systemState.getShellDialect() == null
|| systemState
.getShellDialect()
.getDumbMode()
.supportsAnyPossibleInteraction())
&& (shellStoreState.getTtyState() == null
|| shellStoreState.getTtyState() == ShellTtyState.NONE);
&& (systemState.getTtyState() == null
|| systemState.getTtyState() == ShellTtyState.NONE);
} else {
return true;
}
ext/base/src/main/java/io/xpipe/ext/base/store/ShellStoreProvider.java
+3 -2
View File
@@ -13,6 +13,7 @@ import io.xpipe.app.storage.DataStoreEntry;
import io.xpipe.app.terminal.TerminalLauncher;
import io.xpipe.app.util.ShellStoreFormat;
import io.xpipe.core.process.ShellStoreState;
import io.xpipe.core.process.SystemState;
import io.xpipe.ext.base.script.ScriptStore;
import javafx.beans.property.BooleanProperty;
@@ -29,8 +30,8 @@ public interface ShellStoreProvider extends DataStoreProvider {
ShellStore store = replacement.getStore().asNeeded();
var control = ScriptStore.controlWithDefaultScripts(store.tempControl());
control.onInit(sc -> {
if (entry.getStorePersistentState() instanceof ShellStoreState shellStoreState
&& shellStoreState.getShellDialect() == null) {
if (entry.getStorePersistentState() instanceof SystemState systemState
&& systemState.getShellDialect() == null) {
var found = SystemIcons.detectForSystem(sc);
if (found.isPresent()) {
entry.setIcon(found.get().getIconName(), false);