Merge pull request #79 from cm090/file-tool-sid

Update file tool output naming

Author: cm090

file-tool/src/main/java/rhit/FileToolCli.java

@@ -75,7 +75,7 @@ HashSet<String> copyFolders(File dir, File outputDir, PrintStream output,
 
     Map<String, Object> metadata = parseMetadata(dir);
     HashSet<String> failed = new HashSet<>();
-    AtomicInteger index = new AtomicInteger(1);
+    AtomicInteger index = new AtomicInteger(0);
     int size = metadata.size();
 
     getSubmissionsStreamByDate(metadata).forEach((entry) -> {
@@ -87,11 +87,8 @@ HashSet<String> copyFolders(File dir, File outputDir, PrintStream output,
       String name = getSubmissionName(userData, entry.getKey(), output);
       String sid = getStudentId(userData, output);
       String id = getSubmissionId(entry.getKey(), output);
-
-      String outputDirRelative = String.format("%d_of_%d", index.getAndIncrement(), size);
-      if (!isAnonymous) {
-        outputDirRelative += String.format("_%s_%s", sid, name).replaceAll("[^a-zA-Z0-9_\\-]", "_");
-      }
+      String outputDirRelative =
+          generateOutputDirName(index.incrementAndGet(), size, id, sid, name);
 
       if (!performCopy(dir, outputDirRelative, id, name, outputDir, copier, output, failed)) {
         return;
@@ -202,6 +199,16 @@ private String getSubmissionId(String id, PrintStream output) {
     }
   }
 
+  private String generateOutputDirName(int index, int size, String submissionId, String sid,
+      String name) {
+    StringBuilder outputDir = new StringBuilder();
+    outputDir.append(index).append("_of_").append(size).append('_').append(submissionId);
+    if (!isAnonymous) {
+      outputDir.append('_').append(sid).append('_').append(name);
+    }
+    return outputDir.toString().replaceAll("[^a-zA-Z0-9_\\-]", "_").replaceAll("_+", "_");
+  }
+
   private boolean performCopy(File dir, String outputDirRelative, String id, String name,
       File outputDir, OutputDirectoryHandler copier, PrintStream output, HashSet<String> failed) {
     Path inputDir = new File(dir, String.format(OUTPUT_DIR_FORMAT, id)).toPath();