Enable files/files

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

Author: koppor

src/main/java/org/jabref/model/util/FileHelper.java

@@ -151,8 +151,12 @@ public static boolean isCharLegal(char c) {
     }
 
     /**
-     * Converts a relative filename to an absolute one, if necessary. Returns
-     * an empty optional if the file does not exist.
+     * Converts a relative filename to an absolute one, if necessary.
+     *
+     * @param fileName the filename (e.g., a .pdf file), may contain path separators
+     * @param directory the directory which should be search starting point
+     *
+     * @returns an empty optional if the file does not exist, otherwise, the absolute path
      */
     public static Optional<Path> find(String fileName, Path directory) {
         Objects.requireNonNull(fileName);
@@ -166,11 +170,15 @@ public static Optional<Path> find(String fileName, Path directory) {
         if (fileName.isEmpty()) {
             return Optional.of(directory);
         }
+
+        Path resolvedFile = directory.resolve(fileName);
+        if (Files.exists(resolvedFile)) {
+            return Optional.of(resolvedFile);
+        }
+
         // get the furthest path element from root and check if our filename starts with the same name
         // workaround for old JabRef behavior
         String furthestDirFromRoot = directory.getFileName().toString();
-        Path resolvedFile = directory.resolve(fileName);
-
         if (fileName.startsWith(furthestDirFromRoot)) {
             resolvedFile = directory.resolveSibling(fileName);
         }

src/test/java/org/jabref/model/util/FileHelperTest.java

@@ -58,10 +58,11 @@ public void testFindsFileStartingWithTheSameDirectory(@TempDir Path temp) throws
 
     @Test
     public void testDoesNotFindsFileStartingWithTheSameDirectoryHasASubdirectory(@TempDir Path temp) throws Exception {
-        Path firstFilePath = temp.resolve("files");
-        Path secondFilesPath = firstFilePath.resolve("files");
+        Path firstFilesPath = temp.resolve("files");
+        Path secondFilesPath = firstFilesPath.resolve("files");
         Files.createDirectories(secondFilesPath);
-        Path firstFile = Files.createFile(secondFilesPath.resolve("test.pdf"));
-        assertEquals(Optional.empty(), FileHelper.find("files/test.pdf", temp.resolve("files")));
+        Path testFile = secondFilesPath.resolve("test.pdf");
+        Files.createFile(testFile);
+        assertEquals(Optional.of(testFile.toAbsolutePath()), FileHelper.find("files/test.pdf", firstFilesPath));
     }
 }