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

Properly update state on children refresh

Browse Source
This commit is contained in:
crschnick
2023-12-08 04:39:44 +00:00
parent 0a8881a9cf
commit bdcc6a1295
7 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/io/xpipe/core/process/ShellStoreState.java
+9
View File
@@ -27,4 +27,13 @@ public class ShellStoreState extends DataStoreState implements OsNameState {
public boolean isRunning() {
return running != null ? running : false;
}
@Override
public void merge(DataStoreState newer) {
var shellStoreState = (ShellStoreState) newer;
osType = useNewer(osType, shellStoreState.getOsType());
osName = useNewer(osName, shellStoreState.getOsName());
shellDialect = useNewer(shellDialect, shellStoreState.getShellDialect());
running = useNewer(running, shellStoreState.getRunning());
}
}
core/src/main/java/io/xpipe/core/store/DataStoreState.java
+7 -1
View File
@@ -5,10 +5,16 @@ import lombok.SneakyThrows;
import lombok.experimental.SuperBuilder;
@SuperBuilder
public class DataStoreState {
public abstract class DataStoreState {
public DataStoreState() {}
protected static <T> T useNewer(T older, T newer) {
return newer != null ? newer : older;
}
public abstract void merge(DataStoreState newer);
@SneakyThrows
public String toString() {
var tree = JacksonMapper.getDefault().valueToTree(this);
core/src/main/java/io/xpipe/core/util/DataStateProvider.java
+1 -1
View File
@@ -20,7 +20,7 @@ public abstract class DataStateProvider {
return INSTANCE;
}
public abstract void setState(DataStore store, Object value);
public abstract void setState(DataStore store, DataStoreState value);
public abstract <T extends DataStoreState> T getState(DataStore store, Supplier<T> def);