Better logs around sync

Author: xpierro

src/main/java/net/sony/dpt/fuse/DptFuseMounter.java

@@ -316,6 +316,13 @@ public void mountDpt(Path mountPoint) throws IOException, InterruptedException {
             documentEntriesMap.put(path, entry);
         }
         try {
+            logWriter.log("Mounted the Digital Paper on " + mountPoint + ", type Ctrl+C to unmount");
+
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                umount();
+                logWriter.log("Digital Paper unmounted from " + mountPoint);
+            }));
+
             mount(mountPoint, true, false);
         }
         finally {

src/main/java/net/sony/dpt/persistence/LastCommandRunStore.java

@@ -7,10 +7,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * This stores the last command parameters, which allows then to autofill the params for a next run
@@ -67,4 +64,21 @@ public List<String> retrieve(Command command) {
         Map<String, List<String>> persisted = retrieve();
         return persisted.getOrDefault(command.toString(), null);
     }
+
+    /**
+     * Utility function doing all the work to retrive just one argument for simple commands
+     * @param command The command we'll retrieve args for
+     * @param arguments The args list passed to the CLI
+     * @return The one argument, either from this store, or from the command-line.
+     */
+    public String retrieveOneArgument(Command command, List<String> arguments) {
+        String singleArgument;
+        if (arguments.size() - 1 < command.getArgumentNames().size()) {
+            singleArgument = retrieve(command).get(0);
+        } else {
+            singleArgument = arguments.get(1);
+            store(command, singleArgument);
+        }
+        return singleArgument;
+    }
 }

src/main/java/net/sony/dpt/ui/cli/Command.java

@@ -35,7 +35,7 @@ public enum Command {
     CHECK_FIRMWARE("check-firmware", "Check if a new firmware version has been published"),
     UPDATE_FIRMWARE("update-firmware", Arrays.asList(CommandOption.FORCE, CommandOption.DRYRUN), Collections.emptyList(), "Check for update and update the firmware if needed. Will ask for confirmation before triggering the update. Use -dryrun to test the process."),
     RAW_GET("get", Collections.emptyList(), Collections.singletonList("url"), "Sends and display a GET request to the Digital Paper"),
-    MOUNT("mount", Collections.emptyList(), Collections.singletonList("mount-point"), "FUSE-mount the DPT at the specified mount point."),
+    MOUNT("mount", Collections.emptyList(), Collections.singletonList("[mount-point]"), "FUSE-mount the DPT at the specified mount point. If not mount point is specified, it will attempt to use the one passed previously"),
     HELP(Arrays.asList("help", "command-help"), "Prints this message");
 
     private final List<String> commandNames;

src/main/java/net/sony/dpt/ui/cli/DigitalPaperCLI.java

@@ -222,14 +222,7 @@ public void execute(String[] args) throws Exception {
                 new Whiteboard(new TakeScreenshotCommand(digitalPaperEndpoint));
                 break;
             case SYNC:
-                String localSyncFolder;
-                if (arguments.size() - 1 < command.getArgumentNames().size()) {
-                    localSyncFolder = lastCommandRunStore.retrieve(command).get(0);
-                } else {
-                    localSyncFolder = arguments.get(1);
-                    lastCommandRunStore.store(command, localSyncFolder);
-                }
-                sync(localSyncFolder, dryrun);
+                sync(lastCommandRunStore.retrieveOneArgument(command, arguments), dryrun);
                 break;
             case DIALOG:
                 showDialog(arguments.get(1), arguments.get(2), arguments.get(3));
@@ -283,7 +276,7 @@ public void execute(String[] args) throws Exception {
                 whiteboardHtml();
                 break;
             case MOUNT:
-                mount(arguments.get(1));
+                mount(lastCommandRunStore.retrieveOneArgument(command, arguments));
                 break;
         }