fix merge conflicts, slight refactor

Author: shrey

datashuttle/configs/canonical_configs.py

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

datashuttle/datashuttle_class.py

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

datashuttle/tui/app.py

@@ -103,6 +103,13 @@ def load_project_page(self, interface: Interface) -> None:
     def show_modal_error_dialog(self, message: str) -> None:
         self.push_screen(modal_dialogs.MessageBox(message, border_color="red"))
 
+    def show_modal_error_dialog_from_main_thread(self, message: str) -> None:
+        """
+        Used to call `show_modal_error_dialog from main thread when executing
+        in another thread. Throws error when called from main thread.
+        """
+        self.call_from_thread(self.show_modal_error_dialog, message)
+
     def handle_open_filesystem_browser(self, path_: Path) -> None:
         """
         Open the system file browser to the path with the `showinfm`

datashuttle/tui/interface.py

@@ -399,28 +399,28 @@ def get_textual_compatible_project_configs(self) -> Configs:
         return cfg_to_load
 
     def get_next_sub(
-        self, top_level_folder: TopLevelFolder
+        self, top_level_folder: TopLevelFolder, include_central: bool
     ) -> InterfaceOutput:
         try:
             next_sub = self.project.get_next_sub(
                 top_level_folder,
                 return_with_prefix=True,
-                include_central=False,
+                include_central=include_central,
             )
             return True, next_sub
         except BaseException as e:
             return False, str(e)
 
     def get_next_ses(
-        self, top_level_folder: TopLevelFolder, sub: str
+        self, top_level_folder: TopLevelFolder, sub: str, include_central: bool
     ) -> InterfaceOutput:
 
         try:
             next_ses = self.project.get_next_ses(
                 top_level_folder,
                 sub,
                 return_with_prefix=True,
-                include_central=False,
+                include_central=include_central,
             )
             return True, next_ses
         except BaseException as e:

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_local_only = self.interface.tui_settings[
-            "suggest_next_sub_ses_local_only"
+        suggest_next_sub_ses_remote = self.interface.tui_settings[
+            "suggest_next_sub_ses_remote"
         ]
 
         yield Container(
@@ -105,7 +105,7 @@ def compose(self) -> ComposeResult:
             Container(
                 Checkbox(
                     "Search Remote For Suggestions",
-                    value=not suggest_next_sub_ses_local_only,
+                    value=suggest_next_sub_ses_remote,
                     id="suggest_next_sub_ses_remote",
                 ),
                 Checkbox(
@@ -250,7 +250,7 @@ def on_checkbox_changed(self, event: Checkbox.Changed) -> None:
             )
         elif event.checkbox.id == "suggest_next_sub_ses_remote":
             self.interface.save_tui_settings(
-                not is_on, "suggest_next_sub_ses_local_only"
+                is_on, "suggest_next_sub_ses_remote"
             )
 
     def on_radio_set_changed(self, event: RadioSet.Changed) -> None:

datashuttle/tui/tabs/create_folders.py

@@ -157,10 +157,11 @@ def on_clickable_input_clicked(
 
         prefix: Prefix = "sub" if "subject" in input_id else "ses"
 
-        async def _on_clickable_input_clicked():
-            if event.ctrl:
-                self.fill_input_with_template(prefix, input_id)
-            else:
+        if event.ctrl:
+            self.fill_input_with_template(prefix, input_id)
+        else:
+
+            async def _on_clickable_input_clicked():
                 input_box = self.query_one(f"#{input_id}")
                 spinner = CustomSpinner(id="input_suggestion_spinner")
                 input_box.mount(spinner)
@@ -169,14 +170,14 @@ async def _on_clickable_input_clicked():
                     prefix,
                     input_id,
                     self.interface.get_tui_settings()[
-                        "suggest_next_sub_ses_local_only"
+                        "suggest_next_sub_ses_remote"
                     ],
                 )
                 await worker.wait()
                 spinner.remove()
                 input_box.disabled = False
 
-        asyncio.create_task(_on_clickable_input_clicked())
+            asyncio.create_task(_on_clickable_input_clicked())
 
     def on_custom_directory_tree_directory_tree_special_key_press(
         self, event: CustomDirectoryTree.DirectoryTreeSpecialKeyPress
@@ -293,7 +294,7 @@ def reload_directorytree(self) -> None:
     # ----------------------------------------------------------------------------------
     @work(exclusive=False, thread=True)
     def fill_input_with_next_sub_or_ses_template(
-        self, prefix: Prefix, input_id: str, local_only: bool
+        self, prefix: Prefix, input_id: str, include_central: bool
     ) -> Worker:
         """
         This fills a sub / ses Input with a suggested name based on the
@@ -316,17 +317,14 @@ def fill_input_with_next_sub_or_ses_template(
             "top_level_folder_select"
         ]["create_tab"]
 
-        def show_error_dialog(output: str) -> None:
-            self.mainwindow.call_from_thread(
-                self.mainwindow.show_modal_error_dialog, output
-            )
-
         if prefix == "sub":
             success, output = self.interface.get_next_sub(
-                top_level_folder, local_only=local_only
+                top_level_folder, include_central=include_central
             )
             if not success:
-                show_error_dialog(output)
+                self.mainwindow.show_modal_error_dialog_from_main_thread(
+                    output
+                )
                 return
             else:
                 next_val = output
@@ -336,14 +334,14 @@ def show_error_dialog(output: str) -> None:
             ).as_names_list()
 
             if len(sub_names) > 1:
-                show_error_dialog(
+                self.mainwindow.show_modal_error_dialog_from_main_thread(
                     "Can only suggest next session number when a "
                     "single subject is provided."
                 )
                 return
 
             if sub_names == [""]:
-                show_error_dialog(
+                self.mainwindow.show_modal_error_dialog_from_main_thread(
                     "Must input a subject number before suggesting "
                     "next session number."
                 )
@@ -353,10 +351,12 @@ def show_error_dialog(output: str) -> None:
                 sub = sub_names[0]
 
             success, output = self.interface.get_next_ses(
-                top_level_folder, sub, local_only=local_only
+                top_level_folder, sub, include_central=include_central
             )
             if not success:
-                show_error_dialog(output)
+                self.mainwindow.show_modal_error_dialog_from_main_thread(
+                    output
+                )
                 return
             else:
                 next_val = output