Git Integration and UI Improvements

.gitmodules

@@ -13,3 +13,6 @@
   url = https://github.com/citation-style-language/locales.git
   ignore = all
   shallow = true
+[submodule "jabref"]
+   path = jabref
+   url = https://github.com/JabRef/jabref.git

CHANGELOG.md

@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- Enhanced backup and restore functionality. [#2961](https://github.com/JabRef/jabref/issues/2961)
 - We added a Markdown export layout. [#12220](https://github.com/JabRef/jabref/pull/12220)
 - We added a "view as BibTeX" option before importing an entry from the citation relation tab. [#11826](https://github.com/JabRef/jabref/issues/11826)
 - We added support finding LaTeX-encoded special characters based on plain Unicode and vice versa. [#11542](https://github.com/JabRef/jabref/pull/11542)

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

@@ -42,7 +42,7 @@
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.autosaveandbackup.AutosaveManager;
-import org.jabref.gui.autosaveandbackup.BackupManager;
+import org.jabref.gui.autosaveandbackup.BackupManagerGit;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
 import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.entryeditor.EntryEditor;
@@ -105,6 +105,7 @@
 import com.tobiasdiez.easybind.Subscription;
 import org.controlsfx.control.NotificationPane;
 import org.controlsfx.control.action.Action;
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -308,7 +309,7 @@ private void onDatabaseLoadingStarted() {
         getMainTable().placeholderProperty().setValue(loadingLayout);
     }
 
-    private void onDatabaseLoadingSucceed(ParserResult result) {
+    private void onDatabaseLoadingSucceed(ParserResult result) throws GitAPIException, IOException {
         OpenDatabaseAction.performPostOpenActions(result, dialogService, preferences);
         if (result.getChangedOnMigration()) {
             this.markBaseChanged();
@@ -343,7 +344,7 @@ private void onDatabaseLoadingFailed(Exception ex) {
         dialogService.showErrorDialogAndWait(title, content, ex);
     }
 
-    private void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {
+    private void setDatabaseContext(BibDatabaseContext bibDatabaseContext) throws GitAPIException, IOException {
         TabPane tabPane = this.getTabPane();
         if (tabPane == null) {
             LOGGER.debug("User interrupted loading. Not showing any library.");
@@ -367,13 +368,13 @@ private void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {
         installAutosaveManagerAndBackupManager();
     }
 
-    public void installAutosaveManagerAndBackupManager() {
+    public void installAutosaveManagerAndBackupManager() throws GitAPIException, IOException {
         if (isDatabaseReadyForAutoSave(bibDatabaseContext)) {
             AutosaveManager autosaveManager = AutosaveManager.start(bibDatabaseContext);
             autosaveManager.registerListener(new AutosaveUiManager(this, dialogService, preferences, entryTypesManager));
         }
         if (isDatabaseReadyForBackup(bibDatabaseContext) && preferences.getFilePreferences().shouldCreateBackup()) {
-            BackupManager.start(this, bibDatabaseContext, Injector.instantiateModelOrService(BibEntryTypesManager.class), preferences);
+            BackupManagerGit.start(this, bibDatabaseContext, entryTypesManager, preferences);
         }
     }
 
@@ -750,7 +751,7 @@ private boolean confirmClose() {
         }
 
         if (buttonType.equals(discardChanges)) {
-            BackupManager.discardBackup(bibDatabaseContext, preferences.getFilePreferences().getBackupDirectory());
+            LOGGER.debug("Discarding changes");
             return true;
         }
 
@@ -798,7 +799,7 @@ private void onClosed(Event event) {
             LOGGER.error("Problem when shutting down autosave manager", e);
         }
         try {
-            BackupManager.shutdown(bibDatabaseContext,
+            BackupManagerGit.shutdown(bibDatabaseContext,
                     preferences.getFilePreferences().getBackupDirectory(),
                     preferences.getFilePreferences().shouldCreateBackup());
         } catch (RuntimeException e) {
@@ -1078,7 +1079,13 @@ public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadi
 
         newTab.setDataLoadingTask(dataLoadingTask);
         dataLoadingTask.onRunning(newTab::onDatabaseLoadingStarted)
-                       .onSuccess(newTab::onDatabaseLoadingSucceed)
+                       .onSuccess(result -> {
+                           try {
+                               newTab.onDatabaseLoadingSucceed(result);
+                           } catch (Exception e) {
+                               LOGGER.error("An error occurred while loading the database", e);
+                           }
+                       })
                        .onFailure(newTab::onDatabaseLoadingFailed)
                        .executeWith(taskExecutor);