Update dockerfile + don't write non-modified file

Author: Chuckame

Diff for: .gitignore

@@ -152,3 +152,6 @@ gradle-app.setting
 # End of https://www.toptal.com/developers/gitignore/api/gradle,java,intellij
 
 .idea/
+
+### MacOS ###
+.DS_Store

Diff for: Dockerfile

@@ -1,6 +1,5 @@
 FROM adoptopenjdk/openjdk11:alpine-jre
-RUN mkdir /opt/app
-COPY build/distributions/marlin-console-configurator.zip /opt/app
-RUN tar xvf /opt/app/marlin-console-configurator.zip -C /opt/app
-RUN chmod +x /opt/app/bin/marlin-console-configurator
-CMD ["/opt/app/bin/marlin-console-configurator"]
+ADD build/bootScripts/* /app/bin/
+ADD build/libs/* /app/lib/
+WORKDIR /app/files
+CMD ["/app/bin/marlin-console-configurator"]

Diff for: src/main/java/fr/chuckame/marlinfw/configurator/command/ApplyCommand.java

@@ -15,6 +15,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 
 import java.nio.file.Path;
 import java.util.Collection;
@@ -49,17 +50,29 @@ public Mono<Void> run() {
         return profilePropertiesParser.parseFromFile(profilePath)
                                       .map(changeAdapter::profileToConstants)
                                       .flatMap(wantedConstants ->
-                                                       prepareChanges(filesPath, wantedConstants)
+                                                       prepareChanges(wantedConstants)
                                                                .flatMap(changes -> printChanges(changes)
                                                                        .then(printUnusedConstants(changes, wantedConstants))
                                                                        .then(doSave ? checkIfUserAgree().then(applyAndSaveChanges(changes)) : Mono.empty()))
                                       );
     }
 
+    public Mono<Map<Path, List<LineChange>>> prepareChanges(final Map<String, Constant> wantedConstants) {
+        return fileHelper.listFiles(filesPath)
+                         .flatMap(filePath -> fileHelper.lines(filePath)
+                                                        .index()
+                                                        .concatMap(line -> lineChangeManager.prepareChange(line.getT2(), line.getT1().intValue(), wantedConstants))
+                                                        .collectList()
+                                                        .filter(changes -> changes.stream().anyMatch(LineChange::isConstant))
+                                                        .map(changes -> Tuples.of(filePath, changes)))
+                         .collectMap(Tuple2::getT1, Tuple2::getT2);
+    }
+
     private Mono<Void> printChanges(final Map<Path, List<LineChange>> changes) {
         return Flux.fromIterable(changes.entrySet())
                    .concatMap(fileChanges -> Flux.concat(
-                           Flux.just(String.format("%s change(s) for file %s:", fileChanges.getValue().size(), fileChanges.getKey())),
+                           Flux.just(String.format("%s change(s) to apply for file %s:", fileChanges.getValue().stream().filter(this::isModifyingChange).count(), fileChanges
+                                   .getKey())),
                            Flux.fromIterable(fileChanges.getValue()).filter(LineChange::isConstant).map(lineChangeFormatter::format),
                            Flux.just("")
                    ))
@@ -72,7 +85,7 @@ private Mono<Void> printUnusedConstants(final Map<Path, List<LineChange>> change
         return lineChangeManager.getUnusedWantedConstants(changes.values().stream().flatMap(List::stream).collect(Collectors.toList()), wantedConstants)
                                 .collectList()
                                 .filter(Predicate.not(List::isEmpty))
-                                .doOnNext(unusedConstants -> consoleHelper.writeLine(String.format("Still some unused constants: %s%n", unusedConstants)))
+                                .doOnNext(unusedConstants -> consoleHelper.writeLine(String.format("Still some unused constants: %s", unusedConstants)))
                                 .then();
     }
 
@@ -87,23 +100,22 @@ private Mono<Void> checkIfUserAgree() {
                    .then();
     }
 
-    public Mono<Map<Path, List<LineChange>>> prepareChanges(final List<Path> filesPath, final Map<String, Constant> wantedConstants) {
-        return fileHelper.listFiles(filesPath)
-                         .flatMap(filePath -> fileHelper.lines(filePath)
-                                                        .index()
-                                                        .concatMap(line -> lineChangeManager.prepareChange(line.getT2(), line.getT1().intValue(), wantedConstants))
-                                                        .collectList()
-                                                        .zipWith(Mono.just(filePath)))
-                         .collectMap(Tuple2::getT2, Tuple2::getT1);
-    }
-
     public Mono<Void> applyAndSaveChanges(final Map<Path, List<LineChange>> changes) {
         return Flux.fromIterable(changes.entrySet())
+                   .filter(e -> onlyChangedFile(e.getValue()))
                    .groupBy(Map.Entry::getKey, Map.Entry::getValue)
                    .flatMap(fileChanges -> fileHelper.write(fileChanges.key(), true, fileChanges.flatMap(this::applyChanges)))
                    .then();
     }
 
+    private boolean onlyChangedFile(final List<LineChange> changes) {
+        return changes.stream().anyMatch(this::isModifyingChange);
+    }
+
+    private boolean isModifyingChange(final LineChange change) {
+        return !LineChange.DiffEnum.DO_NOTHING.equals(change.getDiff());
+    }
+
     public Flux<String> applyChanges(final Collection<LineChange> changes) {
         return Flux.fromIterable(changes).flatMap(lineChangeManager::applyChange);
     }

Diff for: src/main/java/fr/chuckame/marlinfw/configurator/command/CommandRunner.java

@@ -4,9 +4,14 @@
 import com.beust.jcommander.ParameterException;
 import fr.chuckame.marlinfw.configurator.util.ConsoleHelper;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class CommandRunner implements CommandLineRunner {
@@ -20,6 +25,14 @@ public void run(final String[] args) throws Exception {
         } catch (final ManuallyStoppedException e) {
             consoleHelper.writeErrorLine(e.getMessage());
             System.exit(e.getExitCode());
+        } catch (final Exception e) {
+            if (e.getCause() instanceof NoSuchFileException) {
+                consoleHelper.writeErrorLine("File not found: " + Path.of(e.getCause().getMessage()).toAbsolutePath());
+                System.exit(4);
+            } else {
+                consoleHelper.writeErrorLine(e.getMessage());
+                System.exit(5);
+            }
         }
     }