Skip to content

Fixed wrong paths in results.zip with multiple root directories. #1645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Fixed wrong paths in results.zip with multiple root directories. #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca9c1bf
Fixed wrong paths in results.zip with multiple root directories.
TwoOfTwelve Feb 25, 2024
6373131
reenable e2e test
Kr0nox Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/java/de/jplag/reporting/FilePathUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ private FilePathUtil() {
* @param submissionToIdFunction Function to map names to ids
* @return Relative path
*/
public static String getRelativeSubmissionPath(File file, Submission submission, Function<Submission, String> submissionToIdFunction) {
public static Path getRelativeSubmissionPath(File file, Submission submission, Function<Submission, String> submissionToIdFunction) {
if (file.toPath().equals(submission.getRoot().toPath())) {
return Path.of(submissionToIdFunction.apply(submission), submissionToIdFunction.apply(submission)).toString();
return Path.of(submissionToIdFunction.apply(submission), submissionToIdFunction.apply(submission));
}
return Path.of(submissionToIdFunction.apply(submission), submission.getRoot().toPath().relativize(file.toPath()).toString()).toString();
return Path.of(submissionToIdFunction.apply(submission), submission.getRoot().toPath().relativize(file.toPath()).toString());
}

/**
Expand Down
5 changes: 3 additions & 2 deletions core/src/main/java/de/jplag/reporting/jsonfactory/ComparisonReportWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ private Match convertMatchToReportMatch(JPlagComparison comparison, de.jplag.Mat
Token startOfSecond = tokensSecond.stream().min(lineComparator).orElseThrow();
Token endOfSecond = tokensSecond.stream().max(lineComparator).orElseThrow();

return new Match(FilePathUtil.getRelativeSubmissionPath(startOfFirst.getFile(), comparison.firstSubmission(), submissionToIdFunction),
FilePathUtil.getRelativeSubmissionPath(startOfSecond.getFile(), comparison.secondSubmission(), submissionToIdFunction),
return new Match(
FilePathUtil.getRelativeSubmissionPath(startOfFirst.getFile(), comparison.firstSubmission(), submissionToIdFunction).toString(),
FilePathUtil.getRelativeSubmissionPath(startOfSecond.getFile(), comparison.secondSubmission(), submissionToIdFunction).toString(),
startOfFirst.getLine(), endOfFirst.getLine(), startOfSecond.getLine(), endOfSecond.getLine(), match.length());
}

Expand Down
11 changes: 3 additions & 8 deletions core/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,9 @@ private void copySubmissionFilesToReport(JPlagResult result) {
Set<Submission> submissions = getSubmissions(comparisons);
Language language = result.getOptions().language();
for (Submission submission : submissions) {
Path submissionRootPath = SUBMISSIONS_ROOT_PATH
.resolve(FilePathUtil.forceRelativePath(Path.of(submissionToIdFunction.apply(submission))));
for (File file : submission.getFiles()) {
Path relativeFilePath = Path.of(submission.getRoot().getAbsolutePath()).relativize(Path.of(file.getAbsolutePath()));
if (relativeFilePath.getNameCount() == 0 || relativeFilePath.equals(Path.of(""))) {
relativeFilePath = Path.of(file.getName());
}
Path zipPath = submissionRootPath.resolve(relativeFilePath);
Path filePath = FilePathUtil.getRelativeSubmissionPath(file, submission, submissionToIdFunction);
Path zipPath = SUBMISSIONS_ROOT_PATH.resolve(filePath);

File fileToCopy = getFileToCopy(language, file);
this.resultWriter.addFileContentEntry(zipPath, fileToCopy);
Expand Down Expand Up @@ -177,7 +172,7 @@ private void writeSubmissionIndexFile(JPlagResult result) {
List<Map<String, Map<String, SubmissionFile>>> submissionTokenCountList = submissions.stream().parallel().map(submission -> {
Map<String, SubmissionFile> tokenCounts = new HashMap<>();
for (Map.Entry<File, Integer> entry : submission.getTokenCountPerFile().entrySet()) {
String key = FilePathUtil.getRelativeSubmissionPath(entry.getKey(), submission, submissionToIdFunction);
String key = FilePathUtil.getRelativeSubmissionPath(entry.getKey(), submission, submissionToIdFunction).toString();
tokenCounts.put(key, new SubmissionFile(entry.getValue()));
}
return Map.of(submissionNameToIdMap.get(submission.getName()), tokenCounts);
Expand Down
5 changes: 2 additions & 3 deletions report-viewer/tests/e2e/OpenComparisonTest.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ const testSets: DataSet[] = [
firstSubmissionName: '0',
secondSubmissionName: '1'
},
// Disabled due to https://github.com/jplag/JPlag/issues/1610
/*{
{
datasetName: 'fileMultiRoot-report.zip',
firstSubmissionName: 'f0\\\\|/0.java',
secondSubmissionName: 'f1\\\\|/1.java'
Expand All @@ -34,7 +33,7 @@ const testSets: DataSet[] = [
datasetName: 'mixedBaseFolder-report.zip',
firstSubmissionName: 'f0\\\\|/0.java',
secondSubmissionName: 'f1\\\\|/1'
},*/
},
{
datasetName: 'folderMultiRoot-report.zip',
firstSubmissionName: 'f0\\\\|/0',
Expand Down