Consider directory pattern when checking if a file can be moved

src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java

@@ -60,7 +60,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileHelper;
-import org.jabref.model.util.OptionalUtil;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
@@ -332,9 +332,29 @@ public boolean isGeneratedNameSameAsOriginal() {
      * @return true if suggested filepath is same as existing filepath.
      */
     public boolean isGeneratedPathSameAsOriginal() {
-        Optional<Path> newDir = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences());
+        FilePreferences filePreferences = preferences.getFilePreferences();
+        Optional<Path> newDir = databaseContext.getFirstExistingFileDir(filePreferences);
+        if (newDir.isEmpty()) {
+            // could not find default path
+            return false;
+        }
+
+        // append File directory pattern if exits
+        String targetDirectoryName = "";
+        if (!filePreferences.getFileDirectoryPattern().isEmpty()) {
+            targetDirectoryName = FileUtil.createDirNameFromPattern(
+                    databaseContext.getDatabase(),
+                    entry,
+                    filePreferences.getFileDirectoryPattern());
+        }
+        Path targetDir = newDir.get().resolve(targetDirectoryName);
 
         Optional<Path> currentDir = linkedFile.findIn(databaseContext, preferences.getFilePreferences()).map(Path::getParent);
+        if (currentDir.isEmpty()) {
+            // Could not find file
+            return false;
+        }
+        Path oldDir = currentDir.get();
 
         BiPredicate<Path, Path> equality = (fileA, fileB) -> {
             try {
@@ -343,7 +363,7 @@ public boolean isGeneratedPathSameAsOriginal() {
                 return false;
             }
         };
-        return OptionalUtil.equals(newDir, currentDir, equality);
+        return FileHelper.equals(targetDir, oldDir, equality);
     }
 
     public void moveToDefaultDirectoryAndRename() {

src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java

@@ -294,12 +294,12 @@ public ContextAction(StandardActions command, LinkedFileViewModel linkedFile, Pr
 
             this.executable.bind(
                     switch (command) {
-                        case RENAME_FILE_TO_PATTERN, MOVE_FILE_TO_FOLDER_AND_RENAME -> Bindings.createBooleanBinding(
+                        case RENAME_FILE_TO_PATTERN -> Bindings.createBooleanBinding(
                                 () -> !linkedFile.getFile().isOnlineLink()
                                         && linkedFile.getFile().findIn(databaseContext, preferencesService.getFilePreferences()).isPresent()
                                         && !linkedFile.isGeneratedNameSameAsOriginal(),
                                 linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
-                        case MOVE_FILE_TO_FOLDER -> Bindings.createBooleanBinding(
+                        case MOVE_FILE_TO_FOLDER, MOVE_FILE_TO_FOLDER_AND_RENAME -> Bindings.createBooleanBinding(
                                 () -> !linkedFile.getFile().isOnlineLink()
                                         && linkedFile.getFile().findIn(databaseContext, preferencesService.getFilePreferences()).isPresent()
                                         && !linkedFile.isGeneratedPathSameAsOriginal(),

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

@@ -10,6 +10,7 @@
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.BiPredicate;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
@@ -25,6 +26,18 @@
 
 public class FileHelper {
 
+    /**
+     * Returns if the two paths are identical.
+     *
+     * @param left        one of the two paths for comparison
+     * @param right       the second path for comparison
+     * @param equality    a predicate of two paths arguments
+     * @return true if the two paths are identical
+     */
+    public static <T, U> boolean equals(Path left, Path right, BiPredicate<Path, Path> equality) {
+        return equality.test(left, right);
+    }
+
     /**
      * Returns the extension of a file or Optional.empty() if the file does not have one (no . in name).
      *

src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java

@@ -1,5 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
+import java.io.IOException;
 import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
@@ -22,6 +23,7 @@
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabaseContext;
@@ -255,6 +257,7 @@ void isNotSamePath() {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(Path.of("/home")));
 
         LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
@@ -266,12 +269,42 @@ void isSamePath() {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
 
         LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
         assertTrue(viewModel.isGeneratedPathSameAsOriginal());
     }
 
+    // Tests if isGeneratedPathSameAsOriginal takes into consideration File directory pattern
+    @Test
+    void isNotSamePathWithPattern() {
+        linkedFile = new LinkedFile("desc", tempFile, "pdf");
+        System.out.println(tempFile.getParent());
+        databaseContext = mock(BibDatabaseContext.class);
+        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
+        when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
+
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        assertFalse(viewModel.isGeneratedPathSameAsOriginal());
+    }
+
+    // Tests if isGeneratedPathSameAsOriginal takes into consideration File directory pattern
+    @Test
+    void isSamePathWithPattern() throws IOException {
+        linkedFile = new LinkedFile("desc", tempFile, "pdf");
+        databaseContext = mock(BibDatabaseContext.class);
+        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
+        when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
+
+        LinkedFileHandler fileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
+        fileHandler.moveToDefaultDirectory();
+
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        assertTrue(viewModel.isGeneratedPathSameAsOriginal());
+    }
 
     // Tests if added parameters to mimeType gets parsed to correct format.
     @Test

src/test/java/org/jabref/logic/util/io/FileUtilTest.java

@@ -8,6 +8,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -383,4 +384,28 @@ void testIsNotBibFile() throws IOException {
         Path bibFile = Files.createFile(rootDir.resolve("test.pdf"));
         assertFalse(FileUtil.isBibFile(bibFile));
     }
+
+    @Test
+    void testFilePathNotEqual() {
+        BiPredicate<Path, Path> equality = (fileA, fileB) -> {
+            try {
+                return Files.isSameFile(fileA, fileB);
+            } catch (IOException e) {
+                return false;
+            }
+        };
+        assertFalse(FileHelper.equals(existingTestFile, otherExistingTestFile, equality));
+    }
+
+    @Test
+    void testFilePathEqual() {
+        BiPredicate<Path, Path> equality = (fileA, fileB) -> {
+            try {
+                return Files.isSameFile(fileA, fileB);
+            } catch (IOException e) {
+                return false;
+            }
+        };
+        assertTrue(FileHelper.equals(existingTestFile, existingTestFile, equality));
+    }
 }