Skip to content

Fix porcelain for consistency check #13209

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
Siedlerchr merged 9 commits into from
Jun 1, 2025
Merged

Fix porcelain for consistency check #13209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f4dcf32
Add progess output for consisteny check
Siedlerchr May 28, 2025
06971f5
better handling of not present
Siedlerchr May 28, 2025
f5c624b
checkstyle
Siedlerchr May 28, 2025
e01a096
fix test
Siedlerchr May 28, 2025
0c6444f
fix newline
Siedlerchr May 28, 2025
bdf4e39
check for porcelain
Siedlerchr May 29, 2025
15e5357
Fix porcelain
Siedlerchr Jun 1, 2025
2d71e64
fix formatting
Siedlerchr Jun 1, 2025
f2a97f7
fix formatting
Siedlerchr Jun 1, 2025
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
4 changes: 3 additions & 1 deletion jabkit/src/main/java/org/jabref/cli/CheckConsistency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ public void run() {

BibliographyConsistencyCheck consistencyCheck = new BibliographyConsistencyCheck();
BibliographyConsistencyCheck.Result result = consistencyCheck.check(entries, (count, total) -> {
System.out.println(Localization.lang("Checking consistency for entry type %0 of %1", count + 1, total));
if (!sharedOptions.porcelain) {
System.out.println(Localization.lang("Checking consistency for entry type %0 of %1", count + 1, total));
}
});

Writer writer = new OutputStreamWriter(System.out);
Expand Down
3 changes: 2 additions & 1 deletion jabkit/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ void checkConsistency() throws URISyntaxException {
commandLine.execute(args.toArray(String[]::new));

String output = outContent.toString();
assertTrue(output.contains("Checking consistency for entry type 1 of 1\n"));
assertTrue(output.contains("Consistency check completed"));

System.setOut(System.out);
Expand All @@ -165,7 +166,7 @@ void checkConsistencyPorcelain() throws URISyntaxException {
commandLine.execute(args.toArray(String[]::new));

String output = outContent.toString();
assertEquals("Checking consistency for entry type 1 of 1\n", output);
assertEquals("", output);

System.setOut(System.out);
}
Expand Down
6 changes: 3 additions & 3 deletions jablib/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ private static void collectEntriesIntoMaps(List<BibEntry> entries, Map<EntryType
for (BibEntry entry : entries) {
EntryType entryType = entry.getType();

Set<Field> fieldsInAnyEntry = entryTypeToFieldsInAnyEntryMap.computeIfAbsent(entryType, k -> new HashSet<>());
Set<Field> fieldsInAnyEntry = entryTypeToFieldsInAnyEntryMap.computeIfAbsent(entryType, _ -> new HashSet<>());
fieldsInAnyEntry.addAll(entry.getFields());

Set<Field> fieldsInAllEntries = entryTypeToFieldsInAllEntriesMap.computeIfAbsent(entryType, k -> new HashSet<>(entry.getFields()));
Set<Field> fieldsInAllEntries = entryTypeToFieldsInAllEntriesMap.computeIfAbsent(entryType, _ -> new HashSet<>(entry.getFields()));
fieldsInAllEntries.retainAll(entry.getFields());

Set<BibEntry> entriesOfType = entryTypeToEntriesMap.computeIfAbsent(entryType, k -> new HashSet<>());
Set<BibEntry> entriesOfType = entryTypeToEntriesMap.computeIfAbsent(entryType, _ -> new HashSet<>());
entriesOfType.add(entry);
}
}
Expand Down