Make path relative after BibTeX-from-PDF import (#11576)

* Refine JavaDoc for PdfMergeMetadataImporter

* Cosmetic improvement

* Add some comment

* Fix casing of "PDF"

* Reorder PDF strrings

* Add translation possibility for description of PdfMergeMetadataImporter

* Remove line break (as preparation for Localization.lang)

* Add missing doc and more consistency with "meta data" and "BibTeX"

* Have relative paths when creating BibTeX from a PDF

* Remove SilverPlatterImporter

* Sort alphabetically

* Localize getDescription() and remove meaningless test methods

* Fix typos

* Add test

* fix test

* fix

---------

Co-authored-by: Siedlerchr <[email protected]>

CHANGELOG.md

@@ -37,14 +37,15 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 - We fixed an issue where the "Check for updates" preference was not saved. [#11485](https://github.com/JabRef/jabref/pull/11485)
 - We fixed an issue where an exception was thrown after changing "show preview as a tab" in the preferences. [#11515](https://github.com/JabRef/jabref/pull/11515)
+- We fixed an issue where JabRef put file paths as absolute path when an entry was created using drag and drop of a PDF file. [#11173](https://github.com/JabRef/jabref/issues/11173)
 - We fixed an issue that online and offline mode for new library creation were handled incorrectly. [#11565](https://github.com/JabRef/jabref/pull/11565)
 - We fixed an issue with colors in the search bar when dark theme is enabled. [#11569](https://github.com/JabRef/jabref/issues/11569)
 - We fixed an issue where a new unsaved library was not marked with an asterisk. [#11519](https://github.com/JabRef/jabref/pull/11519)
 - We fixed an issue where JabRef starts without window decorations. [#11440](https://github.com/JabRef/jabref/pull/11440)
 
 ### Removed
 
-
+- We removed support for importing using the SilverPlatterImporter (`Record INSPEC`). [#11576](https://github.com/JabRef/jabref/pull/11576)
 
 
 

src/main/java/org/jabref/gui/externalfiles/ImportHandler.java

@@ -53,6 +53,7 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.model.util.OptionalUtil;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
@@ -99,7 +100,7 @@ public ExternalFilesEntryLinker getLinker() {
         return linker;
     }
 
-    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(final List<Path> files) {
+    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(final List<Path> files, final BibDatabaseContext bibDatabaseContext, final FilePreferences filePreferences) {
         return new BackgroundTask<>() {
             private int counter;
             private final List<ImportFilesResultItemViewModel> results = new ArrayList<>();
@@ -130,11 +131,11 @@ protected List<ImportFilesResultItemViewModel> call() {
                             }
 
                             if (!pdfEntriesInFile.isEmpty()) {
-                                entriesToAdd.addAll(pdfEntriesInFile);
+                                entriesToAdd.addAll(FileUtil.relativize(pdfEntriesInFile, bibDatabaseContext, filePreferences));
                                 addResultToList(file, true, Localization.lang("File was successfully imported as a new entry"));
                             } else {
                                 entriesToAdd.add(createEmptyEntryWithLink(file));
-                                addResultToList(file, false, Localization.lang("No metadata was found. An empty entry was created with file link"));
+                                addResultToList(file, false, Localization.lang("No BibTeX was found. An empty entry was created with file link."));
                             }
                         } else if (FileUtil.isBibFile(file)) {
                             var bibtexParserResult = contentImporter.importFromBibFile(file, fileUpdateMonitor);
@@ -146,7 +147,7 @@ protected List<ImportFilesResultItemViewModel> call() {
                             addResultToList(file, true, Localization.lang("Bib entry was successfully imported"));
                         } else {
                             entriesToAdd.add(createEmptyEntryWithLink(file));
-                            addResultToList(file, false, Localization.lang("No BibTeX data was found. An empty entry was created with file link"));
+                            addResultToList(file, false, Localization.lang("No BibTeX data was found. An empty entry was created with file link."));
                         }
                     } catch (IOException ex) {
                         LOGGER.error("Error importing", ex);

src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java

@@ -151,7 +151,7 @@ public void startImport() {
         }
         resultList.clear();
 
-        importFilesBackgroundTask = importHandler.importFilesInBackground(fileList)
+        importFilesBackgroundTask = importHandler.importFilesInBackground(fileList, bibDatabase, preferences.getFilePreferences())
                                                  .onRunning(() -> {
                                                      progressValueProperty.bind(importFilesBackgroundTask.workDonePercentageProperty());
                                                      progressTextProperty.bind(importFilesBackgroundTask.messageProperty());

src/main/java/org/jabref/gui/maintable/MainTable.java

@@ -56,6 +56,7 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
@@ -84,6 +85,7 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private final BibEntryTypesManager entryTypesManager;
     private final TaskExecutor taskExecutor;
     private final UndoManager undoManager;
+    private final FilePreferences filePreferences;
     private long lastKeyPressTime;
     private String columnSearchTerm;
 
@@ -110,6 +112,8 @@ public MainTable(MainTableDataModel model,
         this.entryTypesManager = entryTypesManager;
         this.taskExecutor = taskExecutor;
         this.undoManager = libraryTab.getUndoManager();
+        this.filePreferences = preferencesService.getFilePreferences();
+
         MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
 
         importHandler = new ImportHandler(
@@ -492,8 +496,7 @@ private void handleOnDragDropped(TableRow<BibEntryTableViewModel> row, BibEntryT
             // Center -> link files to entry
             // Depending on the pressed modifier, move/copy/link files to drop target
             switch (ControlHelper.getDroppingMouseLocation(row, event)) {
-                case TOP, BOTTOM ->
-                        importHandler.importFilesInBackground(files).executeWith(taskExecutor);
+                case TOP, BOTTOM -> importHandler.importFilesInBackground(files, database, filePreferences).executeWith(taskExecutor);
                 case CENTER -> {
                     BibEntry entry = target.getEntry();
                     switch (event.getTransferMode()) {
@@ -524,9 +527,8 @@ private void handleOnDragDroppedTableView(DragEvent event) {
         boolean success = false;
 
         if (event.getDragboard().hasFiles()) {
-            List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
-            importHandler.importFilesInBackground(files).executeWith(taskExecutor);
-
+            List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).toList();
+            importHandler.importFilesInBackground(files, this.database, filePreferences).executeWith(taskExecutor);
             success = true;
         }
 

src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java

@@ -40,8 +40,8 @@
  */
 public class FetchAndMergeEntry {
 
-    // A list of all field which are supported
     public static List<Field> SUPPORTED_FIELDS = Arrays.asList(StandardField.DOI, StandardField.EPRINT, StandardField.ISBN);
+
     private static final Logger LOGGER = LoggerFactory.getLogger(FetchAndMergeEntry.class);
     private final DialogService dialogService;
     private final UndoManager undoManager;

src/main/java/org/jabref/logic/importer/ImportFormatReader.java

@@ -32,7 +32,6 @@
 import org.jabref.logic.importer.fileformat.PdfXmpImporter;
 import org.jabref.logic.importer.fileformat.RepecNepImporter;
 import org.jabref.logic.importer.fileformat.RisImporter;
-import org.jabref.logic.importer.fileformat.SilverPlatterImporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
@@ -55,7 +54,8 @@ public class ImportFormatReader {
 
     public ImportFormatReader(ImporterPreferences importerPreferences,
                               ImportFormatPreferences importFormatPreferences,
-                              CitationKeyPatternPreferences citationKeyPatternPreferences, FileUpdateMonitor fileUpdateMonitor) {
+                              CitationKeyPatternPreferences citationKeyPatternPreferences,
+                              FileUpdateMonitor fileUpdateMonitor) {
         this.importerPreferences = importerPreferences;
         this.importFormatPreferences = importFormatPreferences;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -84,7 +84,6 @@ public void reset() {
         formats.add(new PdfXmpImporter(importFormatPreferences.xmpPreferences()));
         formats.add(new RepecNepImporter(importFormatPreferences));
         formats.add(new RisImporter());
-        formats.add(new SilverPlatterImporter());
         formats.add(new CffImporter(citationKeyPatternPreferences));
         formats.add(new BiblioscapeImporter());
         formats.add(new BibtexImporter(importFormatPreferences, fileUpdateMonitor));

src/main/java/org/jabref/logic/importer/WebFetchers.java

@@ -160,9 +160,6 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
         return set;
     }
 
-    /**
-     * @return sorted set containing entry based fetchers
-     */
     public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPreferences importerPreferences,
                                                                      ImportFormatPreferences importFormatPreferences,
                                                                      FilePreferences filePreferences,
@@ -178,9 +175,13 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPrefere
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
         set.add(new ZbMATH(importFormatPreferences));
-        set.add(new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(importFormatPreferences, filePreferences, databaseContext));
         set.add(new SemanticScholar(importerPreferences));
         set.add(new ResearchGate(importFormatPreferences));
+
+        // Uses the PDFs - and then uses the parsed DOI. Makes it 10% a web fetcher.
+        // We list it here, because otherwise, it would be much more effort (other UI button, ...)
+        set.add(new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(importFormatPreferences, filePreferences, databaseContext));
+
         return set;
     }
 

src/main/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporter.java

@@ -96,7 +96,7 @@ public String getName() {
 
     @Override
     public String getDescription() {
-        return "Reads the references from the 'References' section of a PDF file.";
+        return Localization.lang("Reads the references from the 'References' section of a PDF file.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java

@@ -11,6 +11,7 @@
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -38,8 +39,7 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return "Imports a Biblioscape Tag File.\n" +
-                "Several Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\".";
+        return Localization.lang("Imports a Biblioscape Tag File.\nSeveral Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\".");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java

@@ -17,6 +17,7 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseModeDetection;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -139,7 +140,7 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return "This importer enables `--importToOpen someEntry.bib`";
+        return Localization.lang("This importer enables \"--importToOpen someEntry.bib\"");
     }
 
     /**

src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java

@@ -12,6 +12,7 @@
 import org.jabref.logic.exporter.CffExporter;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
@@ -57,7 +58,7 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return "Importer for the CFF format, which is intended to make software and datasets citable.";
+        return Localization.lang("Importer for the CFF format, which is intended to make software and datasets citable.");
     }
 
     // POJO classes for yaml data

src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java

@@ -37,6 +37,7 @@
 import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems;
 import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems.KnowledgeItem;
 import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.Persons.Person;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
@@ -108,7 +109,7 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return "Importer for the Citavi XML format.";
+        return Localization.lang("Importer for the Citavi XML format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java

@@ -9,6 +9,7 @@
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -43,7 +44,7 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return "Importer for COPAC format.";
+        return Localization.lang("Importer for COPAC format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java

@@ -11,6 +11,7 @@
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
@@ -52,7 +53,7 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return "Importer for the Refer/Endnote format. Modified to use article number for pages if pages are missing.";
+        return Localization.lang("Importer for the Refer/Endnote format. Modified to use article number for pages if pages are missing.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java

@@ -23,6 +23,7 @@
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.KeywordList;
@@ -121,7 +122,7 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return "Importer for the EndNote XML format.";
+        return Localization.lang("Importer for the EndNote XML format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java

@@ -10,6 +10,7 @@
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
@@ -38,7 +39,7 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return "INSPEC format importer.";
+        return Localization.lang("Importer for the INSPEC format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java

@@ -15,6 +15,7 @@
 import org.jabref.logic.formatter.casechanger.TitleCaseFormatter;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Month;
@@ -72,7 +73,7 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return "Importer for the ISI Web of Science, INSPEC and Medline format.";
+        return Localization.lang("Importer for the ISI Web of Science, INSPEC and Medline format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java

@@ -29,6 +29,7 @@
 import org.jabref.logic.importer.fileformat.medline.OtherId;
 import org.jabref.logic.importer.fileformat.medline.PersonalNameSubject;
 import org.jabref.logic.importer.util.MathMLParser;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Date;
@@ -85,7 +86,7 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return "Importer for the Medline format.";
+        return Localization.lang("Importer for the Medline format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java

@@ -12,6 +12,7 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
@@ -51,7 +52,7 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return "Importer for the MedlinePlain format.";
+        return Localization.lang("Importer for the MedlinePlain format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java

@@ -30,6 +30,7 @@
 import org.jabref.logic.importer.fileformat.mods.Identifier;
 import org.jabref.logic.importer.fileformat.mods.Name;
 import org.jabref.logic.importer.fileformat.mods.RecordInfo;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Date;
@@ -624,7 +625,7 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return "Importer for the MODS format";
+        return Localization.lang("Importer for the MODS format.");
     }
 
     @Override

src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java

@@ -66,7 +66,7 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return "Takes valid JSON documents from the Mr. DLib API and parses them into a BibEntry";
+        return "Takes valid JSON documents from the Mr. DLib API and parses them into a BibEntry.";
     }
 
     /**