Make attached files relative to the file directory

CHANGELOG.md

@@ -24,6 +24,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
+- Files without a defined external file type are now directly opened with the default aplication of the operating system
 
 
 
@@ -57,7 +58,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the "Convert to BibTeX-Cleanup" moved the content of the `file` field to the `pdf` field [#4120](https://github.com/JabRef/jabref/issues/4120)
 - We fixed an issue where the preview pane in entry preview in preferences wasn't showing the citation style selected [#3849](https://github.com/JabRef/jabref/issues/3849)
 - We fixed an issue where the default entry preview style still contained the field `review`. The field `review` in the style is now replaced with comment to be consistent with the entry editor [#4098](https://github.com/JabRef/jabref/issues/4098)
-
+- We fixed an issue where filles added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201)
 
 
 

src/main/java/org/jabref/gui/desktop/JabRefDesktop.java

@@ -129,20 +129,15 @@ public static boolean openExternalFileAnyFormat(final BibDatabaseContext databas
         }
 
         Optional<Path> file = FileHelper.expandFilename(databaseContext, link, Globals.prefs.getFileDirectoryPreferences());
-        if (file.isPresent() && Files.exists(file.get()) && (type.isPresent())) {
+        if (file.isPresent() && Files.exists(file.get())) {
             // Open the file:
             String filePath = file.get().toString();
             openExternalFilePlatformIndependent(type, filePath);
             return true;
         } else {
             // No file matched the name, try to open it directly using the given app
-            if (type.isPresent()) {
-                openExternalFilePlatformIndependent(type, link);
-                return true;
-            }
-
-            // Run out of ideas what to do...
-            return false;
+            openExternalFilePlatformIndependent(type, link);
+            return true;
         }
     }
 
@@ -160,6 +155,8 @@ private static void openExternalFilePlatformIndependent(Optional<ExternalFileTyp
             } else {
                 NATIVE_DESKTOP.openFileWithApplication(filePath, application);
             }
+        } else {
+            NATIVE_DESKTOP.openFile(filePath, null);
         }
     }
 

src/main/java/org/jabref/gui/filelist/AttachFileAction.java

@@ -1,5 +1,6 @@
 package org.jabref.gui.filelist;
 
+import java.nio.file.Path;
 import java.util.Optional;
 
 import org.jabref.Globals;
@@ -9,6 +10,7 @@
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -32,11 +34,14 @@ public void execute() {
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                .build();
+                                                                                               .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                               .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
-            LinkedFile newLinkedFile = new LinkedFile("", newFile.toString(), "");
+
+            Path relativePath = FileUtil.shortenFileName(newFile, panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+            LinkedFile newLinkedFile = new LinkedFile("", relativePath.toString(), "");
+
 
             LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(newLinkedFile);
 

src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java

@@ -119,7 +119,7 @@ public ObjectProperty<ExternalFileType> selectedExternalFileTypeProperty() {
     }
 
     public LinkedFile getNewLinkedFile() {
-        return new LinkedFile(description.getValue(), link.getValue(), selectedExternalFileType.getValue().toString());
+        return new LinkedFile(description.getValue(), link.getValue(), selectedExternalFileType.getValue() == null ? null : selectedExternalFileType.getValue().toString());
 
     }