NXDRIVE-2289: [Direct Transfer] Remember the last selected local folder

When clicking on add files or add folders, Drive will now save
the last place accessed to open again there.

Also changelog has been updated.

Author: Romain Grasland

docs/changes/4.4.5.md

@@ -43,6 +43,7 @@ Release date: `2020-xx-xx`
 - [NXDRIVE-2267](https://jira.nuxeo.com/browse/NXDRIVE-2267): Do not open the file selection box on click in the systray
 - [NXDRIVE-2268](https://jira.nuxeo.com/browse/NXDRIVE-2268): Best efforts to center a window on the screen
 - [NXDRIVE-2276](https://jira.nuxeo.com/browse/NXDRIVE-2276): Introduce the notion of sessions
+- [NXDRIVE-2289](https://jira.nuxeo.com/browse/NXDRIVE-2289): Remember the last selected local folder
 - [NXDRIVE-2300](https://jira.nuxeo.com/browse/NXDRIVE-2300): Update the sync counter in real-time
 - [NXDRIVE-2304](https://jira.nuxeo.com/browse/NXDRIVE-2304): Do not allow to upload in documents with the `HiddenInCreation` facet
 
@@ -120,6 +121,8 @@ Release date: `2020-xx-xx`
 - Added `Engine.have_folder_upload`
 - Added `Engine.directTransferSessionFinished`
 - Added `Engine.handle_session_status()`
+- Added `last_selected_file_path` keyword argument to `Engine.direct_transfer_async()`
+- Added `last_selected_file_path` keyword argument to `Engine.direct_transfer()`
 - Removed `Engine.remove_staled_transfers()`
 - Removed `Engine.directTranferStatus`
 - Added `limit` keyword argument to `EngineDAO.get_dt_uploads_raw()`
@@ -139,6 +142,7 @@ Release date: `2020-xx-xx`
 - Added `recursive` keyword argument to `EngineDAO.remove_state()`
 - Removed `EngineDAO.update_pair_state()`
 - Added `EngineDAO.update_remote_parent_path_dt()`
+- Added `FoldersDialog.last_local_selected_location`
 - Added `Tracker.send_hello()`
 - Added `anon` keyword argument to `Tracker.send_event()`
 - Removed `Translator.format_date()`

nxdrive/engine/engine.py

@@ -403,26 +403,38 @@ def delete_doc(self, path: Path, mode: DelAction = None) -> None:
                     f"{doc_pair.remote_parent_path}/{doc_pair.remote_ref}"
                 )
 
-    def _save_remote_parent_infos(
-        self, remote_path: str, remote_ref: str, duplicate_behavior: str
+    def _save_last_dt_session_infos(
+        self,
+        remote_path: str,
+        remote_ref: str,
+        duplicate_behavior: str,
+        last_local_selected_location: Optional[Path],
     ) -> None:
-        """Store remote infos into the database for later runs."""
+        """Store last dt session infos into the database for later runs."""
         self.dao.update_config("dt_last_remote_location", remote_path)
         self.dao.update_config("dt_last_remote_location_ref", remote_ref)
         self.dao.update_config("dt_last_duplicates_behavior", duplicate_behavior)
+        if last_local_selected_location:
+            self.dao.update_config(
+                "dt_last_local_selected_location", last_local_selected_location
+            )
 
     def _direct_transfer(
         self,
         local_paths: Dict[Path, int],
         remote_parent_path: str,
         remote_parent_ref: str,
-        duplicate_behavior: str,
+        duplicate_behavior: str = "create",
+        last_local_selected_location: Optional[Path] = None,
     ) -> None:
         """Plan the Direct Transfer."""
 
-        # Save the remote location for next times
-        self._save_remote_parent_infos(
-            remote_parent_path, remote_parent_ref, duplicate_behavior
+        # Save last dt session infos for next times
+        self._save_last_dt_session_infos(
+            remote_parent_path,
+            remote_parent_ref,
+            duplicate_behavior,
+            last_local_selected_location,
         )
 
         all_paths = local_paths.keys()
@@ -474,13 +486,15 @@ def direct_transfer(
         remote_parent_path: str,
         remote_parent_ref: str,
         duplicate_behavior: str = "create",
+        last_local_selected_location: Optional[Path] = None,
     ) -> None:
         """Plan the Direct Transfer."""
         self._direct_transfer(
             local_paths,
             remote_parent_path,
             remote_parent_ref,
             duplicate_behavior=duplicate_behavior,
+            last_local_selected_location=last_local_selected_location,
         )
 
     def direct_transfer_async(
@@ -489,6 +503,7 @@ def direct_transfer_async(
         remote_parent_path: str,
         remote_parent_ref: str,
         duplicate_behavior: str = "create",
+        last_local_selected_location: Optional[Path] = None,
     ) -> None:
         """Plan the Direct Transfer. Async to not freeze the GUI."""
         from .workers import Runner
@@ -499,6 +514,7 @@ def direct_transfer_async(
             remote_parent_path,
             remote_parent_ref,
             duplicate_behavior=duplicate_behavior,
+            last_local_selected_location=last_local_selected_location,
         )
         self._threadpool.start(runner)
 

nxdrive/gui/folders_dialog.py

@@ -220,6 +220,9 @@ def __init__(
         self.remote_folder_ref = self.engine.dao.get_config(
             "dt_last_remote_location_ref", ""
         )
+        self.last_local_selected_location = self.engine.dao.get_config(
+            "dt_last_local_selected_location", None
+        )
         self.duplicates_behavior = self.engine.dao.get_config(
             "dt_last_duplicates_behavior", "create"
         )
@@ -334,6 +337,7 @@ def accept(self) -> None:
             self.remote_folder.text(),
             self.remote_folder_ref,
             duplicate_behavior=self.cb.currentData(),
+            last_local_selected_location=self.last_local_selected_location,
         )
 
     def button_ok_state(self) -> None:
@@ -390,6 +394,8 @@ def _process_additionnal_local_paths(self, paths: List[str]) -> None:
                     log.warning(f"Error calling stat() on {path!r}", exc_info=True)
                     continue
 
+            self.last_local_selected_location = path.parent
+
             # If .path is None, then pick the first local path to display something useful
             if not self.path:
                 self.path = path
@@ -402,10 +408,18 @@ def _process_additionnal_local_paths(self, paths: List[str]) -> None:
 
     def _select_more_files(self) -> None:
         """Choose additional local files to upload."""
-        paths, _ = QFileDialog.getOpenFileNames(self, Translator.get("ADD_FILES"))
+        paths, _ = QFileDialog.getOpenFileNames(
+            self,
+            Translator.get("ADD_FILES"),
+            str(self.last_local_selected_location),
+        )
         self._process_additionnal_local_paths(paths)
 
     def _select_more_folder(self) -> None:
         """Choose an additional local folder to upload."""
-        path = QFileDialog.getExistingDirectory(self, Translator.get("ADD_FOLDER"))
+        path = QFileDialog.getExistingDirectory(
+            self,
+            Translator.get("ADD_FOLDER"),
+            str(self.last_local_selected_location),
+        )
         self._process_additionnal_local_paths([path])

tests/old_functional/test_direct_transfer.py

@@ -3,8 +3,10 @@
 """
 import logging
 import re
+from pathlib import Path
 from shutil import copyfile
 from time import sleep
+from typing import Optional
 from unittest.mock import patch
 from uuid import uuid4
 
@@ -91,12 +93,17 @@ def sync_and_check(
         else:
             assert not self.has_blob()
 
-    def direct_transfer(self, duplicate_behavior: str = "create") -> None:
+    def direct_transfer(
+        self,
+        duplicate_behavior: str = "create",
+        last_local_selected_location: Optional[Path] = None,
+    ) -> None:
         self.engine_1.direct_transfer(
             {self.file: self.file_size},
             self.ws.path,
             self.ws.uid,
             duplicate_behavior=duplicate_behavior,
+            last_local_selected_location=last_local_selected_location,
         )
 
     def test_upload(self):
@@ -149,11 +156,15 @@ def callback(*_):
 
         with patch.object(engine.remote, "upload_callback", new=callback):
             with ensure_no_exception():
-                self.direct_transfer()
+                self.direct_transfer(last_local_selected_location=self.file.parent)
                 self.wait_sync()
 
             assert dao.get_dt_uploads_with_status(TransferStatus.PAUSED)
 
+            last_location = dao.get_config("dt_last_local_selected_location", None)
+            assert last_location
+            assert Path(last_location) == self.file.parent
+
             # Cancel the upload
             upload = list(dao.get_dt_uploads())[0]
             engine.cancel_upload(upload.uid)