make Convert to CDF filenames more likely to be unique (#751)

Co-authored-by: Armin Samii <[email protected]>
BrightSpots · Sep 28, 2023 · 02a00cd · 02a00cd
1 parent 9c5e0af
commit 02a00cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/network/brightspots/rcv/ResultsWriter.java b/src/main/java/network/brightspots/rcv/ResultsWriter.java
@@ -553,17 +553,28 @@ String writeGenericCvrCsv(
       List<CastVoteRecord> castVoteRecords,
       Integer numRanks,
       String csvOutputFolder,
+      String inputFilepath,
       String contestId,
       String undeclaredWriteInLabel)
       throws IOException {
     String fileWritten;
+    // Get input filename with extension
+    String inputFileBaseName = new File(inputFilepath).getName();
+    // Remove the extension if it exists
+    int lastIndex = inputFileBaseName.lastIndexOf('.');
+    if (lastIndex != -1) {
+      inputFileBaseName = inputFileBaseName.substring(0, lastIndex);
+    }
+    // Put the input filename in the output filename in case contestId isn't unique --
+    // knowing that it's possible that if both the filename AND the contestId isn't unique,
+    // this will fail.
     Path outputPath =
             Paths.get(
                     getOutputFilePath(
                             csvOutputFolder,
                             "dominion_conversion_contest",
                             timestampString,
-                            sanitizeStringForOutput(contestId))
+                            inputFileBaseName + "-" + sanitizeStringForOutput(contestId))
                             + ".csv");
     try {
       Logger.info("Writing cast vote records in generic format to file: %s...", outputPath);

diff --git a/src/main/java/network/brightspots/rcv/TabulatorSession.java b/src/main/java/network/brightspots/rcv/TabulatorSession.java
@@ -308,6 +308,7 @@ private List<CastVoteRecord> parseCastVoteRecords(ContestConfig config) {
                   castVoteRecords,
                   reader.getMaxRankingsAllowed(source.getContestId()),
                   config.getOutputDirectory(),
+                  source.getFilePath(),
                   source.getContestId(),
                   source.getUndeclaredWriteInLabel());
         } catch (IOException exception) {