reformat command output

src/main/java/unimelb/mf/client/instrument/Upload.java

@@ -9,6 +9,7 @@ import java.util.TreeSet;
 
 import arc.utils.DateTime;
 import arc.xml.XmlDoc;
+import unimelb.utils.FileSizeUtils;
 import unimelb.utils.StringUtils;
 
 public class Upload {
@@ -55,6 +56,10 @@ public class Upload {
     public final Date completedAt() {
         return _completedAt;
     }
+    
+    public final String namespace() {
+        return _namespace;
+    }
 
     public final String parentName() {
         if (_namespace != null) {
@@ -124,6 +129,10 @@ public class Upload {
     public final Long totalFileSize() {
         return _totalFileSize;
     }
+    
+    public final String totalFileSizeHR() {
+        return FileSizeUtils.toHumanReadable(_totalFileSize);
+    }
 
     public final boolean pathContextMatches(String srcPath) {
         // TODO

src/main/java/unimelb/mf/client/instrument/cli/InstrumentUploadMissingFind.java

@@ -33,6 +33,7 @@ import unimelb.mf.client.session.MFConfigBuilder;
 import unimelb.mf.client.session.MFSession;
 import unimelb.picocli.converters.DateTimeConverter;
 import unimelb.picocli.converters.PathConverter;
+import unimelb.utils.FileSizeUtils;
 
 @Command(name = "instrument-upload-missing-find", abbreviateSynopsis = true, synopsisHeading = "\nUSAGE:\n  ", parameterListHeading = "\nPARAMETERS:\n", optionListHeading = "\nOPTIONS:\n", separator = " ", sortOptions = false)
 public class InstrumentUploadMissingFind implements MFCommand {
@@ -123,19 +124,45 @@ public class InstrumentUploadMissingFind implements MFCommand {
                 missingDirectories, mismatchDirectories);
 
         if (!missingDirectories.isEmpty()) {
+            long totalMissingFiles = 0;
+            long totalMissingSize = 0;
+            System.out.println("=== Missing Directories ===");
             for (LocalDirectory missingDir : missingDirectories) {
-                System.out.printf("Directory(missing): %s%n", missingDir.path);
+                System.out.printf("local_directory: %s%n", missingDir.path);
+                System.out.printf("    file_count: %d%n", missingDir.nbFiles);
+                System.out.printf("    size: %d bytes (%s)%n", missingDir.totalSize, missingDir.totalSizeHR());
+                System.out.println();
+                totalMissingFiles += missingDir.nbFiles;
+                totalMissingSize += missingDir.totalSize;
             }
-            System.out.println("Count(missing): " + missingDirectories.size());
+            System.out.printf("total_missing_directories: %d%n", missingDirectories.size());
+            System.out.printf("total_missing_files: %d%n", totalMissingFiles);
+            System.out.printf("total_missing_size: %d bytes (%s)%n", totalMissingSize,
+                    FileSizeUtils.toHumanReadable(totalMissingSize));
             System.out.println();
         }
 
         if (!mismatchDirectories.isEmpty()) {
+            long totalMismatchFiles = 0;
+            long totalMismatchSize = 0;
+            System.out.println("=== Mismatch Directories ===");
             Set<LocalDirectory> mismatchDirs = mismatchDirectories.keySet();
             for (LocalDirectory mismatchDir : mismatchDirs) {
-                System.out.printf("Directory(mismatch): %s%n", mismatchDir.path);
+                System.out.printf("local_directory: %s%n", mismatchDir.path);
+                System.out.printf("    file_count: %d%n", mismatchDir.nbFiles);
+                System.out.printf("    size: %d bytes (%s)%n", mismatchDir.totalSize, mismatchDir.totalSizeHR());
+                Upload upload = mismatchDirectories.get(mismatchDir);
+                System.out.printf("upload_namespace: %s%n", upload.namespace());
+                System.out.printf("    file_count: %d%n", upload.totalFileCount());
+                System.out.printf("    size: %d bytes (%s)%n", upload.totalFileSize(), upload.totalFileSizeHR());
+                System.out.println();
+                totalMismatchFiles += mismatchDir.nbFiles;
+                totalMismatchSize += mismatchDir.totalSize;
             }
-            System.out.println("Count(mismatch): " + mismatchDirectories.size());
+            System.out.printf("total_mismatch_directories: %d%n", mismatchDirectories.size());
+            System.out.printf("total_mismatch_files: %d%n", totalMismatchFiles);
+            System.out.printf("total_mismatch_size: %d bytes (%s)%n", totalMismatchSize,
+                    FileSizeUtils.toHumanReadable(totalMismatchSize));
             System.out.println();
         }
 
@@ -324,6 +351,10 @@ public class InstrumentUploadMissingFind implements MFCommand {
             this.totalSize = totalSize;
         }
 
+        public String totalSizeHR() {
+            return FileSizeUtils.toHumanReadable(this.totalSize);
+        }
+
         @Override
         public int hashCode() {
             return this.path.hashCode();