beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parse legacy colors

Browse source
This commit is contained in:
crschnick 2024-08-23 19:31:07 +00:00
parent 3ca8db6ed4
commit 7992ef7a64
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
View file

@ -186,6 +186,15 @@ public class DataStoreEntry extends StorageElement {
.map(jsonNode -> UUID.fromString(jsonNode.textValue())) .map(jsonNode -> UUID.fromString(jsonNode.textValue()))
.orElse(DataStorage.DEFAULT_CATEGORY_UUID); .orElse(DataStorage.DEFAULT_CATEGORY_UUID);
var name = json.required("name").textValue().trim(); var name = json.required("name").textValue().trim();
var color = Optional.ofNullable(json.get("color"))
.map(node -> {
try {
return mapper.treeToValue(node, DataColor.class);
} catch (JsonProcessingException e) {
return null;
}
})
.orElse(null);
var persistentState = stateJson.get("persistentState"); var persistentState = stateJson.get("persistentState");
var lastUsed = Optional.ofNullable(stateJson.get("lastUsed")) var lastUsed = Optional.ofNullable(stateJson.get("lastUsed"))
@ -217,15 +226,16 @@ public class DataStoreEntry extends StorageElement {
var expanded = Optional.ofNullable(stateJson.get("expanded")) var expanded = Optional.ofNullable(stateJson.get("expanded"))
.map(jsonNode -> jsonNode.booleanValue()) .map(jsonNode -> jsonNode.booleanValue())
.orElse(true); .orElse(true);
var color = Optional.ofNullable(stateJson.get("color"))
.map(node -> { if (color == null) {
try { color = Optional.ofNullable(stateJson.get("color")).map(node -> {
return mapper.treeToValue(node, DataColor.class); try {
} catch (JsonProcessingException e) { return mapper.treeToValue(node, DataColor.class);
return null; } catch (JsonProcessingException e) {
} return null;
}) }
.orElse(null); }).orElse(null);
}
String notes = null; String notes = null;
if (Files.exists(notesFile)) { if (Files.exists(notesFile)) {