Przeglądaj źródła

Replace / in submission Names with _

Nesta Bentum 4 lat temu
rodzic
commit
a4182d5554

+ 4 - 0
jplag/src/main/java/de/jplag/Submission.java

@@ -146,6 +146,10 @@ public class Submission implements Comparable<Submission> {
         return divisor;
     }
 
+    public String getNameSanitized() {
+        return getName().replace(File.separator, "_");
+    }
+
     /**
      * @return Parse result of the submission.
      */

+ 3 - 3
jplag/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java

@@ -97,7 +97,7 @@ public class ReportObjectFactory {
         var submissionsPath = createDirectory(path, SUBMISSIONS_FOLDER);
         Language language = result.getOptions().getLanguage();
         for (var submission : submissions) {
-            File directory = createDirectory(submissionsPath.getPath(), submission.getName());
+            File directory = createDirectory(submissionsPath.getPath(), submission.getNameSanitized());
             for (var file : submission.getFiles()) {
                 var fileToCopy = language.useViewFiles() ? new File(file.getPath() + language.viewFileSuffix()) : file;
                 try {
@@ -140,8 +140,8 @@ public class ReportObjectFactory {
      */
     private static List<String> getComparisonNames(List<JPlagComparison> comparisons) {
         List<String> names = new ArrayList<>();
-        comparisons.forEach(
-                comparison -> names.add(String.join("-", comparison.getFirstSubmission().getName(), comparison.getSecondSubmission().getName())));
+        comparisons.forEach(comparison -> names
+                .add(String.join("-", comparison.getFirstSubmission().getNameSanitized(), comparison.getSecondSubmission().getNameSanitized())));
         return names;
     }
 

+ 1 - 1
jplag/src/main/java/de/jplag/reporting/reportobject/mapper/ClusteringResultMapper.java

@@ -20,7 +20,7 @@ public class ClusteringResultMapper {
     private Cluster convertCluster(de.jplag.clustering.Cluster<Submission> from) {
         var strength = from.getCommunityStrength();
         var avgSimilarity = from.getAverageSimilarity();
-        var member = from.getMembers().stream().map(Submission::getName).toList();
+        var member = from.getMembers().stream().map(Submission::getNameSanitized).toList();
         return new Cluster(avgSimilarity, strength, member);
     }
 }

+ 4 - 2
jplag/src/main/java/de/jplag/reporting/reportobject/mapper/ComparisonReportMapper.java

@@ -24,8 +24,10 @@ public class ComparisonReportMapper {
 
     private void writeComparisons(JPlagResult jPlagResult, String path, List<JPlagComparison> comparisons) {
         for (JPlagComparison comparison : comparisons) {
-            var comparisonReport = new ComparisonReport(comparison.getFirstSubmission().getName(), comparison.getSecondSubmission().getName(),
-                    comparison.similarity(), convertMatchesToReportMatches(jPlagResult, comparison));
+            String firstSubmissionId = comparison.getFirstSubmission().getNameSanitized();
+            String secondSubmissionId = comparison.getSecondSubmission().getNameSanitized();
+            var comparisonReport = new ComparisonReport(firstSubmissionId, secondSubmissionId, comparison.similarity(),
+                    convertMatchesToReportMatches(jPlagResult, comparison));
             String fileName = comparisonReport.firstSubmissionId().concat("-").concat(comparisonReport.secondSubmissionId()).concat(".json");
             FILE_WRITER.saveAsJSON(comparisonReport, path, fileName);
         }

+ 2 - 2
jplag/src/main/java/de/jplag/reporting/reportobject/mapper/MetricMapper.java

@@ -38,8 +38,8 @@ public class MetricMapper {
 
     private static List<TopComparison> getTopComparisons(List<JPlagComparison> comparisons, Function<JPlagComparison, Float> similarityExtractor) {
         return comparisons.stream().sorted(Comparator.comparing(similarityExtractor).reversed())
-                .map(comparison -> new TopComparison(comparison.getFirstSubmission().getName(), comparison.getSecondSubmission().getName(),
-                        similarityExtractor.apply(comparison)))
+                .map(comparison -> new TopComparison(comparison.getFirstSubmission().getNameSanitized(),
+                        comparison.getSecondSubmission().getNameSanitized(), similarityExtractor.apply(comparison)))
                 .toList();
     }