rename remote to central and change tooltip

Author: shrey

datashuttle/configs/canonical_configs.py

@@ -242,7 +242,7 @@ def get_tui_config_defaults() -> Dict:
             "bypass_validation": False,
             "overwrite_existing_files": "never",
             "dry_run": False,
-            "suggest_next_sub_ses_remote": False,
+            "suggest_next_sub_ses_central": False,
         }
     }
 

datashuttle/datashuttle_class.py

@@ -1550,7 +1550,7 @@ def _update_settings_with_new_canonical_keys(self, settings: Dict):
         for key in [
             "overwrite_existing_files",
             "dry_run",
-            "suggest_next_sub_ses_remote",
+            "suggest_next_sub_ses_central",
         ]:
             if key not in settings["tui"]:
                 settings["tui"][key] = canonical_tui_configs["tui"][key]

datashuttle/tui/css/tui_menu.tcss

@@ -445,7 +445,7 @@ ConfirmAndAwaitTransferPopup {
 
 /* Suggesting Screen --------------------------------------------------------------------- */
 
-SearchingRemoteForNextSubSesPopup {
+SearchingCentralForNextSubSesPopup {
     align: center middle;
 }
 

datashuttle/tui/screens/create_folder_settings.py

@@ -86,8 +86,8 @@ def compose(self) -> ComposeResult:
         """
 
         bypass_validation = self.interface.tui_settings["bypass_validation"]
-        suggest_next_sub_ses_remote = self.interface.tui_settings[
-            "suggest_next_sub_ses_remote"
+        suggest_next_sub_ses_central = self.interface.tui_settings[
+            "suggest_next_sub_ses_central"
         ]
 
         yield Container(
@@ -104,9 +104,9 @@ def compose(self) -> ComposeResult:
             ),
             Container(
                 Checkbox(
-                    "Search Remote For Suggestions",
-                    value=suggest_next_sub_ses_remote,
-                    id="suggest_next_sub_ses_remote",
+                    "Search Central For Suggestions",
+                    value=suggest_next_sub_ses_central,
+                    id="suggest_next_sub_ses_central",
                 ),
                 Checkbox(
                     "Bypass validation",
@@ -157,7 +157,7 @@ def on_mount(self) -> None:
             "#create_folders_settings_toplevel_select",
             "#create_folders_settings_bypass_validation_checkbox",
             "#template_settings_validation_on_checkbox",
-            "#suggest_next_sub_ses_remote",
+            "#suggest_next_sub_ses_central",
         ]:
             self.query_one(id).tooltip = get_tooltip(id)
 
@@ -248,9 +248,9 @@ def on_checkbox_changed(self, event: Checkbox.Changed) -> None:
             self.query_one("#template_inner_container").disabled = (
                 disable_container
             )
-        elif event.checkbox.id == "suggest_next_sub_ses_remote":
+        elif event.checkbox.id == "suggest_next_sub_ses_central":
             self.interface.save_tui_settings(
-                is_on, "suggest_next_sub_ses_remote"
+                is_on, "suggest_next_sub_ses_central"
             )
 
     def on_radio_set_changed(self, event: RadioSet.Changed) -> None:

datashuttle/tui/screens/modal_dialogs.py

@@ -10,7 +10,7 @@
     from textual.worker import Worker
 
     from datashuttle.tui.app import TuiApp
-    from datashuttle.utils.custom_types import InterfaceOutput
+    from datashuttle.utils.custom_types import InterfaceOutput, Prefix
 
 from pathlib import Path
 
@@ -137,11 +137,11 @@ async def handle_transfer_and_update_ui_when_complete(self) -> None:
             self.app.show_modal_error_dialog(output)
 
 
-class SearchingRemoteForNextSubSesPopup(ModalScreen):
+class SearchingCentralForNextSubSesPopup(ModalScreen):
 
     def __init__(self, sub_or_ses: Prefix) -> None:
         super().__init__()
-        self.message = f"Searching remote for next {sub_or_ses}"
+        self.message = f"Searching central for next {sub_or_ses}"
 
     def compose(self) -> ComposeResult:
         yield Container(

datashuttle/tui/tabs/create_folders.py

@@ -33,7 +33,7 @@
     DisplayedDatatypesScreen,
 )
 from datashuttle.tui.screens.modal_dialogs import (
-    SearchingRemoteForNextSubSesPopup,
+    SearchingCentralForNextSubSesPopup,
 )
 from datashuttle.tui.tooltips import get_tooltip
 from datashuttle.tui.utils.tui_decorators import require_double_click
@@ -51,8 +51,8 @@ def __init__(self, mainwindow: TuiApp, interface: Interface) -> None:
         )
         self.mainwindow = mainwindow
         self.interface = interface
-        self.searching_remote_popup: (
-            SearchingRemoteForNextSubSesPopup | None
+        self.searching_central_popup_widget: (
+            SearchingCentralForNextSubSesPopup | None
         ) = None
 
         self.prev_click_time = 0.0
@@ -166,7 +166,7 @@ def on_clickable_input_clicked(
             self.fill_input_with_template(prefix, input_id)
         else:
             include_central = self.interface.get_tui_settings()[
-                "suggest_next_sub_ses_remote"
+                "suggest_next_sub_ses_central"
             ]
 
             self.suggest_next_sub_ses_with_popup(
@@ -372,17 +372,19 @@ async def fill_suggestion_and_dismiss_popup(
             prefix, input_id, include_central
         )
         await worker.wait()
-        if self.searching_remote_popup:
-            self.searching_remote_popup.dismiss()
-            self.searching_remote_popup = None
+        if self.searching_central_popup_widget:
+            self.searching_central_popup_widget.dismiss()
+            self.searching_central_popup_widget = None
 
     def suggest_next_sub_ses_with_popup(
         self, prefix: Prefix, input_id: str, include_central: bool
     ):
         if include_central:
-            searching_remote_popup = SearchingRemoteForNextSubSesPopup(prefix)
-            self.searching_remote_popup = searching_remote_popup
-            self.mainwindow.push_screen(searching_remote_popup)
+            searching_central_popup = SearchingCentralForNextSubSesPopup(
+                prefix
+            )
+            self.searching_central_popup_widget = searching_central_popup
+            self.mainwindow.push_screen(searching_central_popup)
 
         asyncio.create_task(
             self.fill_suggestion_and_dismiss_popup(
@@ -450,10 +452,10 @@ def update_directorytree_root(self, new_root_path: Path) -> None:
     def dismiss_popup_and_show_modal_error_dialog_from_thread(
         self, message: str
     ) -> None:
-        if self.searching_remote_popup:
+        if self.searching_central_popup_widget:
             self.mainwindow.call_from_thread(
-                self.searching_remote_popup.dismiss
+                self.searching_central_popup_widget.dismiss
             )
-            self.searching_remote_popup = None
+            self.searching_central_popup_widget = None
 
         self.mainwindow.show_modal_error_dialog_from_main_thread(message)

datashuttle/tui/tooltips.py

@@ -127,10 +127,10 @@ def get_tooltip(id: str) -> str:
     elif id == "#create_folders_settings_toplevel_select":
         tooltip = "The top-level-folder to create folders in."
 
-    elif id == "#suggest_next_sub_ses_remote":
+    elif id == "#suggest_next_sub_ses_central":
         tooltip = (
-            "Search the remote project folder for folder suggestions. "
-            "Slow compared to a local search."
+            "Search the central project folder when suggesting the next subject or session."
+            "May be slower compared than searching local only."
         )
     # bypass validation checkbox
     elif id == "#create_folders_settings_bypass_validation_checkbox":