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

Fix nested script hierarchy display

Browse Source
This commit is contained in:
crschnick
2026-04-04 00:45:32 +00:00
parent b20aed0d3c
commit 594795a27d
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/base/src/main/java/io/xpipe/ext/base/script/ScriptHierarchy.java
+6 -12
View File
@@ -21,7 +21,7 @@ public class ScriptHierarchy {
var enabled =
ScriptStoreSetup.getEnabledScripts().stream().filter(include).toList();
var categories = new HashSet<DataStoreCategory>();
var categories = new LinkedHashSet<DataStoreCategory>();
for (DataStoreEntryRef<ScriptStore> ref : enabled) {
var cat = DataStorage.get().getStoreCategory(ref.get());
var catParents = DataStorage.get().getCategoryParentHierarchy(cat);
@@ -40,7 +40,8 @@ public class ScriptHierarchy {
var toAdd = new ScriptHierarchy(cat.getName(), cat, null, new ArrayList<>());
if (cat.getParentCategory().equals(DataStorage.ALL_SCRIPTS_CATEGORY_UUID)) {
if (!hierarchy.getChildren().contains(toAdd)) {
if (hierarchy.getChildren().stream().noneMatch(scriptHierarchy ->
scriptHierarchy.getCategory() != null && scriptHierarchy.getCategory().getUuid().equals(cat.getUuid()))) {
hierarchy.getChildren().add(toAdd);
changed = true;
}
@@ -52,7 +53,8 @@ public class ScriptHierarchy {
continue;
}
var alreadyAdded = parentHierarchy.get().getChildren().contains(toAdd);
var alreadyAdded = parentHierarchy.get().getChildren().stream().anyMatch(scriptHierarchy ->
scriptHierarchy.getCategory() != null && cat.getUuid().equals(scriptHierarchy.getCategory().getUuid()));
if (alreadyAdded) {
continue;
}
@@ -90,7 +92,7 @@ public class ScriptHierarchy {
}
private static Optional<ScriptHierarchy> findParent(ScriptHierarchy hierarchy, DataStoreCategory category) {
if (category.equals(hierarchy.getCategory())) {
if (hierarchy.getCategory() != null && category.getParentCategory().equals(hierarchy.getCategory().getUuid())) {
return Optional.of(hierarchy);
}
@@ -121,14 +123,6 @@ public class ScriptHierarchy {
}
}
public boolean isEmptyBranch() {
if (category == null) {
return false;
}
return children.isEmpty();
}
public boolean isLeaf() {
return script != null;
}