fixed stuff, added forEach methods.

Author: Manered

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'dev.manere.inscript'
-version = '1.0.0'
+version = '1.0.1'
 
 repositories {
     mavenCentral()

src/main/java/dev/manere/inscript/Inscript.java

@@ -52,8 +52,16 @@ public Optional<Path> getPath() {
     }
 
     public void saveToDisk() {
-        if (!getPath().orElseThrow(() -> new InscriptError("Attempted to save to disk with a null path")).toFile().exists()) {
-            throw new InscriptError("Failed to save Inscript - file not found");
+        if (getPath().isEmpty()) {
+            throw new InscriptError("Attempted to save to disk with a null path");
+        }
+
+        final File file = getPath().get().toFile();
+
+        if (!file.exists()) try {
+            if (!file.createNewFile()) throw new InscriptError("Failed to save " + file + " to disk, couldn't create file.");
+        } catch (final IOException e) {
+            throw new InscriptError(e);
         }
 
         try (final BufferedWriter writer = Files.newBufferedWriter(getPath().get())) {
@@ -145,9 +153,8 @@ private void writeNode(final @NotNull BufferedWriter writer, final @NotNull Insc
     }
 
     public void loadFromDisk() {
-        if (!getPath().orElseThrow(() -> new InscriptError("Attempted to load from disk with a null path")).toFile().exists()) {
-            throw new InscriptError("Failed to load Inscript - file not found");
-        }
+        if (getPath().isEmpty()) throw new InscriptError("Attempted to load from disk with a null path");
+        if (!getPath().get().toFile().exists()) return;
 
         try (final BufferedReader reader = Files.newBufferedReader(getPath().get())) {
             getEditor().reset();

src/main/java/dev/manere/inscript/InscriptEditor.java

@@ -94,4 +94,38 @@ default InscriptEditor reset() {
         getSection().getChildren().clear();
         return this;
     }
+
+    @NotNull
+    @CanIgnoreReturnValue
+    default InscriptEditor forEachSection(final @NotNull Consumer<InscriptEditor> sectionConsumer) {
+        for (final InscriptNode node : getSection().getChildren()) {
+            getSection(node.getKey()).ifPresent(sectionConsumer);
+        }
+
+        return this;
+    }
+
+    @NotNull
+    @CanIgnoreReturnValue
+    default InscriptEditor forEachScalar(final @NotNull Consumer<ScalarNode<?>> scalarConsumer) {
+        for (final InscriptNode node : getSection().getChildren()) {
+            if (node instanceof ScalarNode<?> scalar) scalarConsumer.accept(scalar);
+        }
+
+        return this;
+    }
+
+    @NotNull
+    @CanIgnoreReturnValue
+    default InscriptEditor forEach(final @NotNull Consumer<ScalarNode<?>> scalarConsumer, final @NotNull Consumer<InscriptEditor> sectionConsumer) {
+        for (final InscriptNode node : getSection().getChildren()) {
+            if (node instanceof ScalarNode<?> scalar) {
+                scalarConsumer.accept(scalar);
+            } else if (node instanceof SectionNode section) {
+                sectionConsumer.accept(new SimpleInscriptEditor(section));
+            }
+        }
+
+        return this;
+    }
 }

src/main/java/dev/manere/inscript/node/ScalarNode.java

@@ -2,10 +2,21 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Optional;
+
 public abstract class ScalarNode<V> extends InscriptNode {
     @NotNull
     public abstract V getValue();
 
+    @NotNull
+    public <T> Optional<T> getValueAs(final @NotNull Class<T> type) {
+        try {
+            return (Optional<T>) type.cast(getValue());
+        } catch (final Exception e) {
+            return Optional.empty();
+        }
+    }
+
     @NotNull
     @Override
     public String toString() {

src/main/java/dev/manere/inscript/value/ValueRegistry.java

@@ -15,6 +15,7 @@ public class ValueRegistry {
 
     static {
         REGISTRY = new ValueRegistry()
+            .register(byte[].class, new ByteArrayValue())
             .register(Boolean.class, new BooleanValue())
             .register(Byte.class, new ByteValue())
             .register(Short.class, new ShortValue())
@@ -25,7 +26,6 @@ public class ValueRegistry {
             .register(UUID.class, new UUIDValue())
             .register(Character.class, new CharacterValue());
 
-        // Ensure String is always registered last.
         REGISTRY.register(String.class, new StringValue());
     }
 

src/main/java/dev/manere/inscript/value/impl/ByteArrayValue.java

@@ -0,0 +1,31 @@
+package dev.manere.inscript.value.impl;
+
+import dev.manere.inscript.value.InlineValue;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Base64;
+
+public class ByteArrayValue implements InlineValue<byte[]> {
+    @Override
+    public boolean matches(final @NotNull String text) {
+        return text.startsWith("base64(") || text.endsWith(")");
+    }
+
+    @Override
+    public byte @Nullable [] deserialize(final @NotNull String text) {
+        if (!text.startsWith("base64(") && !text.endsWith(")")) return null;
+        final String content = text.substring(7, text.length() - 1);
+
+        try {
+            return Base64.getDecoder().decode(content);
+        } catch (final Exception e) {
+            return null;
+        }
+    }
+
+    @Override
+    public @Nullable String serialize(final byte @NotNull [] bytes) {
+        return "base64(" + Base64.getEncoder().encodeToString(bytes) + ")";
+    }
+}