Temporary fix for #1: don't parse lines ending with backslash

Chuckame · Nov 7, 2020 · fb1892f · fb1892f
1 parent bd0d9db
commit fb1892f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/src/main/java/fr/chuckame/marlinfw/configurator/command/CommandRunner.java b/src/main/java/fr/chuckame/marlinfw/configurator/command/CommandRunner.java
@@ -8,6 +8,7 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 
@@ -29,6 +30,9 @@ public void run(final String[] args) throws Exception {
             if (e.getCause() instanceof NoSuchFileException) {
                 consoleHelper.writeErrorLine("File not found: " + Path.of(e.getCause().getMessage()).toAbsolutePath());
                 System.exit(4);
+            } else if (e.getCause() instanceof FileAlreadyExistsException) {
+                consoleHelper.writeErrorLine("File already present: " + Path.of(e.getCause().getMessage()).toAbsolutePath());
+                System.exit(6);
             } else {
                 consoleHelper.writeErrorLine(e.getMessage());
                 System.exit(5);

diff --git a/src/main/java/fr/chuckame/marlinfw/configurator/constant/ConstantLineInterpreter.java b/src/main/java/fr/chuckame/marlinfw/configurator/constant/ConstantLineInterpreter.java
@@ -23,11 +23,16 @@ public static class ParsedConstant {
 
     public Mono<ParsedConstant> parseLine(final String line) {
         return Mono.just(line)
+                   .filter(this::isNotMultilineValue)
                    .map(CONSTANT_REGEX::matcher)
                    .filter(Matcher::matches)
                    .map(this::toConstant);
     }
 
+    private boolean isNotMultilineValue(final String line) {
+        return !line.endsWith("\\");
+    }
+
     public Mono<String> disableLine(final ConstantLineDetails constantLineDetails) {
         return Mono.just(constantLineDetails)
                    .map(ConstantLineDetails::getLine)

diff --git a/src/main/java/fr/chuckame/marlinfw/configurator/profile/ProfilePropertiesParser.java b/src/main/java/fr/chuckame/marlinfw/configurator/profile/ProfilePropertiesParser.java
@@ -61,6 +61,13 @@ protected DumperOptions buildDumperOptions(final int jsonFeatures, final int yam
                         opts.setIndicatorIndent(indentation);
                         return opts;
                     }
+
+                    @Override
+                    public void writeNull() throws IOException {
+                        _verifyValueWrite("write null value");
+                        // no real type for this, is there?
+                        _writeScalar("", "object", DumperOptions.ScalarStyle.PLAIN);
+                    }
                 };
             }
         };

diff --git a/src/test/java/fr/chuckame/marlinfw/configurator/constant/ConstantLineInterpreterTest.java b/src/test/java/fr/chuckame/marlinfw/configurator/constant/ConstantLineInterpreterTest.java
@@ -1,5 +1,6 @@
 package fr.chuckame.marlinfw.configurator.constant;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -9,6 +10,16 @@
 class ConstantLineInterpreterTest {
     private final ConstantLineInterpreter constantLineInterpreter = new ConstantLineInterpreter();
 
+    // fixme cannot parse following lines when first line ending with backslash '\': https://github.com/Chuckame/marlin-console-configurator/issues/1
+    @Test
+    void TEMPORARY_FIX_parseLineShouldReturnNothingWhenValueEndsWithBackslash() {
+        final var line = "#define CONSTANT value \\";
+
+        final var constant = constantLineInterpreter.parseLine(line);
+
+        assertThat(constant.blockOptional()).isEmpty();
+    }
+
     @ParameterizedTest
     @CsvSource({
             "'#define   coNsTANT   ',coNsTANT,",