Configure backup path in prefs

src/main/java/org/jabref/gui/JabRefFrame.java

@@ -490,7 +490,7 @@ public boolean quit() {
                 context.clearDBMSSynchronizer();
             }
             AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context);
+            BackupManager.shutdown(context, prefs);
             context.getDatabasePath().map(Path::toAbsolutePath).map(Path::toString).ifPresent(filenames::add);
         }
 
@@ -1312,7 +1312,7 @@ private void closeTab(LibraryTab libraryTab) {
             removeTab(libraryTab);
         }
         AutosaveManager.shutdown(context);
-        BackupManager.shutdown(context);
+        BackupManager.shutdown(context, prefs);
     }
 
     private void removeTab(LibraryTab libraryTab) {

src/main/java/org/jabref/gui/LibraryTab.java

@@ -705,7 +705,7 @@ private void saveDividerLocation(Number position) {
     public void cleanUp() {
         changeMonitor.ifPresent(DatabaseChangeMonitor::unregister);
         AutosaveManager.shutdown(bibDatabaseContext);
-        BackupManager.shutdown(bibDatabaseContext);
+        BackupManager.shutdown(bibDatabaseContext, preferencesService);
     }
 
     /**

src/main/java/org/jabref/gui/backup/BackupResolverDialog.java

@@ -32,7 +32,7 @@ public BackupResolverDialog(Path originalPath) {
         getDialogPane().setMinHeight(180);
         getDialogPane().getButtonTypes().setAll(RESTORE_FROM_BACKUP, REVIEW_BACKUP, IGNORE_BACKUP);
 
-        Optional<Path> backupPathOpt = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP);
+        Optional<Path> backupPathOpt = BackupFileUtil.yyyyyyyyyy(originalPath, BackupFileType.BACKUP);
         String backupFilename = backupPathOpt.map(Path::getFileName).map(Path::toString).orElse(Localization.lang("File not found"));
         String content = new StringBuilder()
                 .append(Localization.lang("A backup file for '%0' was found at [%1]",

src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java

@@ -54,7 +54,7 @@ public void execute() {
         checkOverwriteKeysChosen();
 
         if (!this.isCanceled) {
-            BackgroundTask backgroundTask = this.generateKeysInBackground();
+            BackgroundTask<Void> backgroundTask = this.generateKeysInBackground();
             backgroundTask.showToUser(true);
             backgroundTask.titleProperty().set(Localization.lang("Autogenerate citation keys"));
             backgroundTask.messageProperty().set(Localization.lang("%0/%1 entries", 0, entries.size()));
@@ -93,8 +93,8 @@ private void checkOverwriteKeysChosen() {
         }
     }
 
-    private BackgroundTask generateKeysInBackground() {
-        return new BackgroundTask<Void>() {
+    private BackgroundTask<Void> generateKeysInBackground() {
+        return new BackgroundTask<>() {
             private NamedCompound compound;
 
             @Override

src/main/java/org/jabref/gui/dialogs/BackupUIManager.java

@@ -41,7 +41,7 @@ public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialo
         var actionOpt = showBackupResolverDialog(dialogService, originalPath);
         return actionOpt.flatMap(action -> {
             if (action == BackupResolverDialog.RESTORE_FROM_BACKUP) {
-                BackupManager.restoreBackup(originalPath);
+                BackupManager.restoreBackup(originalPath, preferencesService.getFilePreferences().getBackupDirectory());
                 return Optional.empty();
             } else if (action == BackupResolverDialog.REVIEW_BACKUP) {
                 return showReviewBackupDialog(dialogService, originalPath, preferencesService);
@@ -63,7 +63,7 @@ private static Optional<ParserResult> showReviewBackupDialog(DialogService dialo
             // This will be modified by using the `DatabaseChangesResolverDialog`.
             BibDatabaseContext originalDatabase = originalParserResult.getDatabaseContext();
 
-            Path backupPath = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP).orElseThrow();
+            Path backupPath = BackupFileUtil.yyyyyyyyyy(originalPath, BackupFileType.BACKUP).orElseThrow();
             BibDatabaseContext backupDatabase = OpenDatabase.loadDatabase(backupPath, importFormatPreferences, new DummyFileUpdateMonitor()).getDatabaseContext();
 
             DatabaseChangeResolverFactory changeResolverFactory = new DatabaseChangeResolverFactory(dialogService, originalDatabase, preferencesService.getBibEntryPreferences());

src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java

@@ -116,7 +116,7 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
             final Path oldFile = databasePath.get();
             context.setDatabasePath(oldFile);
             AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context);
+            BackupManager.shutdown(context, this.preferences);
         }
 
         // Set new location

src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java

@@ -192,9 +192,10 @@ private ParserResult loadDatabase(Path file) throws Exception {
         dialogService.notify(Localization.lang("Opening") + ": '" + file + "'");
 
         preferencesService.getFilePreferences().setWorkingDirectory(fileToLoad.getParent());
+        Path backupDir = preferencesService.getFilePreferences().getBackupDirectory();
 
         ParserResult parserResult = null;
-        if (BackupManager.backupFileDiffers(fileToLoad)) {
+        if (BackupManager.backupFileDiffers(fileToLoad, backupDir)) {
             // In case the backup differs, ask the user what to do.
             // In case the user opted for restoring a backup, the content of the backup is contained in parserResult.
             parserResult = BackupUIManager.showRestoreBackupDialog(dialogService, fileToLoad, preferencesService).orElse(null);

src/main/java/org/jabref/gui/preferences/file/FileTab.fxml

@@ -6,8 +6,12 @@
 <?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.GridPane?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.file.FileTab">
@@ -42,4 +46,19 @@
     </HBox>
 
     <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <CheckBox fx:id="createBackup" text="%Create backup"></CheckBox>
+        <TextField fx:id="backupDirectory" HBox.hgrow="ALWAYS"/>
+        <Button fx:id="browseDirectory" onAction="#backupFileDirBrowse"
+                styleClass="icon-button,narrow"
+                prefHeight="20.0" prefWidth="20.0" GridPane.columnIndex="2">
+            <graphic>
+                <JabRefIconView glyph="OPEN"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Browse"/>
+            </tooltip>
+        </Button>
+    </HBox>
+
 </fx:root>

src/main/java/org/jabref/gui/preferences/file/FileTab.java

@@ -6,7 +6,7 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
 
-import org.jabref.gui.Globals;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -16,6 +16,7 @@
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class FileTab extends AbstractPreferenceTabView<FileTabViewModel> implements PreferencesTab {
 
@@ -25,18 +26,22 @@ public class FileTab extends AbstractPreferenceTabView<FileTabViewModel> impleme
     @FXML private RadioButton resolveStrings;
     @FXML private TextField resolveStringsForFields;
     @FXML private CheckBox alwaysReformatBib;
+    @FXML private CheckBox createBackup;
+    @FXML private TextField backupDirectory;
 
     @FXML private CheckBox autosaveLocalLibraries;
     @FXML private Button autosaveLocalLibrariesHelp;
 
+    @Inject private DialogService dialogService;
+
     public FileTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
     }
 
     public void initialize() {
-        this.viewModel = new FileTabViewModel(preferencesService.getImportExportPreferences());
+        this.viewModel = new FileTabViewModel(preferencesService.getImportExportPreferences(), preferencesService.getFilePreferences(), dialogService);
 
         openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
         noWrapFiles.textProperty().bindBidirectional(viewModel.noWrapFilesProperty());
@@ -49,12 +54,16 @@ public void initialize() {
         alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
         autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
 
-        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+        ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService), autosaveLocalLibrariesHelp);
     }
 
     @Override
     public String getTabName() {
         return Localization.lang("File");
     }
+
+    public void backupFileDirBrowse() {
+        viewModel.backupFileDirBrowse();
+    }
 }

src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java

@@ -1,11 +1,16 @@
 package org.jabref.gui.preferences.file;
 
+import java.nio.file.Path;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.gui.util.DirectoryDialogConfiguration;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.ImportExportPreferences;
 
 public class FileTabViewModel implements PreferenceTabViewModel {
@@ -18,10 +23,17 @@ public class FileTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
     private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
 
+    private final BooleanProperty createBackupProperty = new SimpleBooleanProperty();
+    private final StringProperty backupDirectoryProperty = new SimpleStringProperty("");
+
     private final ImportExportPreferences importExportPreferences;
+    private final FilePreferences filePreferences;
+    private final DialogService dialogService;
 
-    FileTabViewModel(ImportExportPreferences importExportPreferences) {
+    FileTabViewModel(ImportExportPreferences importExportPreferences, FilePreferences filePreferences, DialogService dialogService) {
         this.importExportPreferences = importExportPreferences;
+        this.filePreferences = filePreferences;
+        this.dialogService = dialogService;
     }
 
     @Override
@@ -34,6 +46,9 @@ public void setValues() {
         resolveStringsForFieldsProperty.setValue(importExportPreferences.getResolvableFields());
         alwaysReformatBibProperty.setValue(importExportPreferences.shouldAlwaysReformatOnSave());
         autosaveLocalLibraries.setValue(importExportPreferences.shouldAutoSave());
+
+        createBackupProperty.setValue(filePreferences.shouldCreateBackup());
+        backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
     }
 
     @Override
@@ -44,6 +59,9 @@ public void storeSettings() {
         importExportPreferences.setResolvableFields(resolveStringsForFieldsProperty.getValue().trim());
         importExportPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
         importExportPreferences.setAutoSave(autosaveLocalLibraries.getValue());
+
+        filePreferences.createBackupProperty().setValue(createBackupProperty.getValue());
+        filePreferences.backupDirectoryProperty().setValue(Path.of(backupDirectoryProperty.getValue()));
     }
 
     // General
@@ -78,4 +96,20 @@ public BooleanProperty alwaysReformatBibProperty() {
     public BooleanProperty autosaveLocalLibrariesProperty() {
         return autosaveLocalLibraries;
     }
+
+    public BooleanProperty createBackupProperty() {
+        return this.createBackupProperty;
+    }
+
+    public StringProperty backupDirectoryProperty() {
+        return this.backupDirectoryProperty;
+    }
+
+    public void backupFileDirBrowse() {
+        DirectoryDialogConfiguration dirDialogConfiguration =
+            new DirectoryDialogConfiguration.Builder().withInitialDirectory(Path.of(backupDirectoryProperty().getValue())).build();
+    dialogService.showDirectorySelectionDialog(dirDialogConfiguration)
+                 .ifPresent(dir -> backupDirectoryProperty.setValue(dir.toString()));
+
+    }
 }