Select Library to import into

CHANGELOG.md

@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
+- We added a dropdown menu to let users change the library they want to import into during import.[#6177](https://github.com/JabRef/jabref/issues/6177)
 
 
 

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

@@ -349,7 +349,7 @@ public void updateTabTitle(boolean isChanged) {
             }
 
             // Unique path fragment
-            Optional<String> uniquePathPart = FileUtil.getUniquePathFragment(collectAllDatabasePaths(), databasePath);
+            Optional<String> uniquePathPart = FileUtil.getUniquePathDirectory(stateManager.collectAllDatabasePaths(), databasePath);
             uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
         } else {
             if (databaseLocation == DatabaseLocation.LOCAL) {
@@ -380,16 +380,6 @@ public void updateTabTitle(boolean isChanged) {
         }
     }
 
-    private List<String> collectAllDatabasePaths() {
-        List<String> list = new ArrayList<>();
-        stateManager.getOpenDatabases().stream()
-                    .map(BibDatabaseContext::getDatabasePath)
-                    .forEachOrdered(pathOptional -> pathOptional.ifPresentOrElse(
-                            path -> list.add(path.toAbsolutePath().toString()),
-                            () -> list.add("")));
-        return list;
-    }
-
     @Subscribe
     public void listen(BibDatabaseContextChangedEvent event) {
         this.changedProperty.setValue(true);

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

@@ -1,5 +1,6 @@
 package org.jabref.gui;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -201,4 +202,14 @@ public LastAutomaticFieldEditorEdit getLastAutomaticFieldEditorEdit() {
     public void setLastAutomaticFieldEditorEdit(LastAutomaticFieldEditorEdit automaticFieldEditorEdit) {
         lastAutomaticFieldEditorEditProperty().set(automaticFieldEditorEdit);
     }
+
+    public List<String> collectAllDatabasePaths() {
+        List<String> list = new ArrayList<>();
+        getOpenDatabases().stream()
+                          .map(BibDatabaseContext::getDatabasePath)
+                          .forEachOrdered(pathOptional -> pathOptional.ifPresentOrElse(
+                                  path -> list.add(path.toAbsolutePath().toString()),
+                                  () -> list.add("")));
+        return list;
+    }
 }

src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml

@@ -3,6 +3,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -11,16 +12,25 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.CheckListView?>
+<?import javafx.scene.control.ComboBox?>
 <DialogPane prefHeight="700.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
             xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.ImportEntriesDialog">
     <content>
         <VBox spacing="10.0">
             <Label text="%Select the entries to be imported:"/>
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
             <HBox spacing="4">
-                <Button onAction="#selectAllNewEntries" styleClass="text-button" text="%Select all new entries"/>
-                <Button onAction="#selectAllEntries" styleClass="text-button" text="%Select all entries"/>
-                <Button onAction="#unselectAll" styleClass="text-button" text="%Unselect all"/>
+                <VBox spacing="10">
+                    <HBox spacing="4">
+                        <Button onAction="#selectAllNewEntries"  text="%Select all new entries"/>
+                        <Button onAction="#selectAllEntries"  text="%Select all entries"/>
+                        <Button onAction="#unselectAll"  text="%Unselect all"/>
+                    </HBox>
+                    <HBox spacing="4" alignment="CENTER_LEFT">
+                        <Label text="%Library to import into"/>
+                        <ComboBox fx:id="libraryListView" layoutX="16.0" layoutY="52.0"/>
+                    </HBox>
+                </VBox>
                 <HBox HBox.hgrow="ALWAYS"/>
                 <GridPane hgap="4.0" vgap="4.0">
                     <columnConstraints>
@@ -30,6 +40,7 @@
                     <rowConstraints>
                         <RowConstraints minHeight="10.0"/>
                         <RowConstraints minHeight="10.0"/>
+                        <RowConstraints minHeight="10.0"/>
                     </rowConstraints>
                     <Label styleClass="info-section" text="%Total items found:"/>
                     <Label fx:id="totalItems" GridPane.columnIndex="1"/>

src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java

@@ -1,6 +1,7 @@
 package org.jabref.gui.importer;
 
 import java.util.EnumSet;
+import java.util.Optional;
 
 import javax.swing.undo.UndoManager;
 
@@ -12,6 +13,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.Tooltip;
@@ -21,7 +23,6 @@
 import javafx.scene.text.Text;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BackgroundTask;
@@ -32,6 +33,8 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.shared.DatabaseLocation;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -49,6 +52,7 @@
 public class ImportEntriesDialog extends BaseDialog<Boolean> {
 
     public CheckListView<BibEntry> entriesListView;
+    public ComboBox<BibDatabaseContext> libraryListView;
     public ButtonType importButton;
     public Label totalItems;
     public Label selectedItems;
@@ -102,6 +106,28 @@ private void initialize() {
         entriesListView.setPlaceholder(placeholder);
         entriesListView.setItems(viewModel.getEntries());
 
+        libraryListView.setEditable(false);
+        libraryListView.getItems().addAll(stateManager.getOpenDatabases());
+        new ViewModelListCellFactory<BibDatabaseContext>()
+                .withText(database -> {
+                    Optional<String> dbOpt = Optional.empty();
+                    if (database.getDatabasePath().isPresent()) {
+                        dbOpt = FileUtil.getUniquePathFragment(stateManager.collectAllDatabasePaths(), database.getDatabasePath().get());
+                    }
+                    if (database.getLocation() == DatabaseLocation.SHARED) {
+                        return database.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]";
+                    }
+
+                    if (dbOpt.isEmpty()) {
+                        return Localization.lang("untitled");
+                    }
+
+                    return dbOpt.get();
+                })
+                .install(libraryListView);
+        viewModel.selectedDbProperty().bind(libraryListView.getSelectionModel().selectedItemProperty());
+        stateManager.getActiveDatabase().ifPresent(database1 -> libraryListView.getSelectionModel().select(database1));
+
         PseudoClass entrySelected = PseudoClass.getPseudoClass("entry-selected");
         new ViewModelListCellFactory<BibEntry>()
                 .withGraphic(entry -> {
@@ -129,7 +155,7 @@ private void initialize() {
                             duplicateButton.setOnAction(event -> viewModel.resolveDuplicate(entry));
                             container.getChildren().add(1, duplicateButton);
                         }
-                    }).executeWith(Globals.TASK_EXECUTOR);
+                    }).executeWith(taskExecutor);
 
                     /*
                     inserted the if-statement here, since a Platform.runLater() call did not work.

src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java

@@ -5,6 +5,8 @@
 
 import javax.swing.undo.UndoManager;
 
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
@@ -13,7 +15,6 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.gui.externalfiles.ImportHandler;
@@ -49,6 +50,7 @@ public class ImportEntriesViewModel extends AbstractViewModel {
     private final ObservableList<BibEntry> entries;
     private final PreferencesService preferences;
     private final BibEntryTypesManager entryTypesManager;
+    private final ObjectProperty<BibDatabaseContext> selectedDb;
 
     /**
      * @param databaseContext the database to import into
@@ -74,6 +76,7 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
         this.entries = FXCollections.observableArrayList();
         this.message = new SimpleStringProperty();
         this.message.bind(task.messageProperty());
+        this.selectedDb = new SimpleObjectProperty<>();
 
         task.onSuccess(parserResult -> {
             // store the complete parser result (to import groups, ... later on)
@@ -97,14 +100,22 @@ public StringProperty messageProperty() {
         return message;
     }
 
+    public ObjectProperty<BibDatabaseContext> selectedDbProperty() {
+        return selectedDb;
+    }
+
+    public BibDatabaseContext getSelectedDb() {
+        return selectedDb.get();
+    }
+
     public ObservableList<BibEntry> getEntries() {
         return entries;
     }
 
     public boolean hasDuplicate(BibEntry entry) {
         return findInternalDuplicate(entry).isPresent() ||
                 new DuplicateCheck(entryTypesManager)
-                .containsDuplicate(databaseContext.getDatabase(), entry, databaseContext.getMode()).isPresent();
+                .containsDuplicate(selectedDb.getValue().getDatabase(), entry, selectedDb.getValue().getMode()).isPresent();
     }
 
     /**
@@ -164,12 +175,12 @@ public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownload
                 parserResult.getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
                 parserResult.getDatabase().getEntries());
 
-        JabRefGUI.getMainFrame().getCurrentLibraryTab().markBaseChanged();
+//        JabRefGUI.getMainFrame().getCurrentLibraryTab().markBaseChanged();
     }
 
     private void buildImportHandlerThenImportEntries(List<BibEntry> entriesToImport) {
         ImportHandler importHandler = new ImportHandler(
-                databaseContext,
+                selectedDb.getValue(),
                 preferences,
                 fileUpdateMonitor,
                 undoManager,

src/main/java/org/jabref/logic/util/io/FileUtil.java

@@ -119,17 +119,35 @@ public static Path addExtension(Path path, String extension) {
         return path.resolveSibling(path.getFileName() + extension);
     }
 
-    public static Optional<String> getUniquePathFragment(List<String> paths, Path databasePath) {
-        String fileName = databasePath.getFileName().toString();
+    /**
+     * Looks for the unique directory, if any, different to the provided paths
+     *
+     * @param paths List of paths as Strings
+     * @param comparePath The to be tested path
+     */
+    public static Optional<String> getUniquePathDirectory(List<String> paths, Path comparePath) {
+        String fileName = comparePath.getFileName().toString();
 
         List<String> uniquePathParts = uniquePathSubstrings(paths);
         return uniquePathParts.stream()
-                              .filter(part -> databasePath.toString().contains(part)
+                              .filter(part -> comparePath.toString().contains(part)
                                       && !part.equals(fileName) && part.contains(File.separator))
                               .findFirst()
                               .map(part -> part.substring(0, part.lastIndexOf(File.separator)));
     }
 
+    /**
+     * Looks for the shortest unique path of the in a list of paths
+     *
+     * @param paths List of paths as Strings
+     * @param comparePath The to be shortened path
+     */
+    public static Optional<String> getUniquePathFragment(List<String> paths, Path comparePath) {
+        return uniquePathSubstrings(paths).stream()
+                              .filter(part -> comparePath.toString().contains(part))
+                              .findFirst();
+    }
+
     /**
      * Creates the minimal unique path substring for each file among multiple file paths.
      *
@@ -148,7 +166,7 @@ public static List<String> uniquePathSubstrings(List<String> paths) {
 
         List<String> pathSubstrings = new ArrayList<>(Collections.nCopies(paths.size(), ""));
 
-        // compute shortest folder substrings
+        // compute the shortest folder substrings
         while (!stackList.stream().allMatch(Vector::isEmpty)) {
             for (int i = 0; i < stackList.size(); i++) {
                 String tempString = pathSubstrings.get(i);

src/main/resources/l10n/JabRef_en.properties

@@ -2519,3 +2519,5 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Do you want t
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=This could indicate that JabRef did not shut down cleanly last time the file was used.
 
 Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Use the field FJournal to store the full journal name for (un)abbreviations in the entry
+
+Library\ to\ import\ into=Library to import into