Refactoring more.

Author: JoeZiminski

datashuttle/datashuttle_class.py

@@ -940,10 +940,11 @@ def setup_aws_connection(self) -> None:
 
     def _try_set_rclone_password(self):
         """"""
+
         pass_type = {
             "Windows": "Windows credential manager",
             "Linux": "the `pass` program",
-            "Darwin": "macOS inbuild `security`."
+            "Darwin": "macOS inbuild `security`.",
         }
 
         input_ = utils.get_user_input(
@@ -957,14 +958,13 @@ def _try_set_rclone_password(self):
             try:
                 self.set_rclone_password()
             except Exception as e:
-
                 config_path = self.cfg.get_rclone_config_filepath()
 
                 utils.log_and_raise_error(
                     f"Password set up failed. The config at {config_path} contains the private ssh key without a password.\n"
                     f"Use set_rclone_password()` to attempt to set the password again (see full error message above). ",
                     RuntimeError,
-                    from_error=e
+                    from_error=e,
                 )
 
             utils.log_and_message("Password set successfully")
@@ -977,43 +977,26 @@ def set_rclone_password(self):
                 "First, use `remove_rclone_password` to remove it."
             )
 
-        connection_method = self.cfg["connection_method"]
-
-        rclone_config_path = self.cfg.get_rclone_config_filepath()
+        rclone_password.run_rclone_config_encrypt(self.cfg)
 
-        if not rclone_config_path.exists():
-            raise RuntimeError(
-                f"Rclone config file for: {connection_method} was not found. "
-                f"Make sure you set up the connection first with `setup_{connection_method}_connection()`"
-            )
-        rclone_password.run_rclone_config_encrypt(
-            self.cfg
-        )
-
-        self.cfg.rclone_has_password[connection_method] = True
+        self.cfg.rclone_has_password[self.cfg["connection_method"]] = True
 
         self.cfg.save_rclone_password_state()
 
     def remove_rclone_password(self):
         """"""
         if not self.cfg.connection_method_rclone_config_has_password():
             raise RuntimeError(
-                f"The config for the current connection method: {self.cfg['connection_method']} does not have a password. Cannot remove."
+                f"The config for the current connection method: {self.cfg['connection_method']} "
+                f"does not have a password. Cannot remove."
             )
-        config_filepath = rclone_password.get_password_filepath(self.cfg)
 
-        rclone_password.remove_rclone_password(
-            config_filepath, self.cfg.get_rclone_config_filepath()
-        )
+        rclone_password.remove_rclone_password(self.cfg)
 
         self.cfg.rclone_has_password[self.cfg["connection_method"]] = False
 
         self.cfg.save_rclone_password_state()
 
-        utils.log_and_message(
-            f"Password removed from rclone config file: {}"
-        )
-
     # -------------------------------------------------------------------------
     # Configs
     # -------------------------------------------------------------------------

datashuttle/utils/rclone_password.py

@@ -7,6 +7,7 @@
 from configs.config_class import Configs
 
 from datashuttle.configs import canonical_folders
+from datashuttle.utils import utils
 
 
 def get_password_filepath(
@@ -47,6 +48,7 @@ def save_credentials_password(cfg):
         )
 
         # run it
+        # TODO: HANDLE ERRORS
         subprocess.run([shell, "-NoProfile", "-Command", ps_cmd], check=True)
 
     elif platform.system() == "Linux":
@@ -58,6 +60,7 @@ def save_credentials_password(cfg):
             )
 
         try:
+            # TODO: HANDLE ERRORS
             result = subprocess.run(
                 ["pass", "ls"], capture_output=True, text=True, check=True
             )
@@ -66,6 +69,7 @@ def save_credentials_password(cfg):
                 raise Exception()  # re-raise unexpected errors
 
         breakpoint()
+        # TODO: HANDLE ERRORS
         subprocess.run(
             f"echo $(openssl rand -base64 40) | pass insert -m {cfg.get_rclone_config_name()}",
             shell=True,
@@ -74,6 +78,7 @@ def save_credentials_password(cfg):
 
     # TODO: HANDLE ERRORS
     else:
+        # TODO: HANDLE ERRORS
         subprocess.run(
             f"security add-generic-password -a datashuttle -s {cfg.get_rclone_config_name()} -w $(openssl rand -base64 40) -U",
             shell=True,
@@ -123,28 +128,48 @@ def set_credentials_as_password_command(cfg):
 
 def run_rclone_config_encrypt(cfg: Configs):
     """"""
+    rclone_config_path = cfg.get_rclone_config_filepath()
+
+    if not rclone_config_path.exists():
+        connection_method = cfg["connection_method"]
+
+        raise RuntimeError(
+            f"Rclone config file for: {connection_method} was not found. "
+            f"Make sure you set up the connection first with `setup_{connection_method}_connection()`"
+        )
+
+    save_credentials_password(cfg)
+
     set_credentials_as_password_command(cfg)
 
+    # TODO: HANDLE ERRORS
     subprocess.run(
-        f"rclone config encryption set --config {config_filepath.as_posix()}",
+        f"rclone config encryption set --config {rclone_config_path.as_posix()}",
         shell=True,
     )
 
     remove_credentials_as_password_command()
 
 
 # TODO: HANDLE ERRORS
-def remove_rclone_password(password_filepath: Path, config_filepath: Path):
+def remove_rclone_password(cfg):
     """"""
-    set_credentials_as_password_command(Path(password_filepath))
+    set_credentials_as_password_command(Path(cfg))
+
+    config_filepath = cfg.get_rclone_config_filepath()
+
+    # TODO: HANDLE ERRORS
     subprocess.run(
         rf"rclone config encryption remove --config {config_filepath.as_posix()}",
         shell=True,
     )
 
-    # TODO: HANDLE ERRORS
     remove_credentials_as_password_command()
 
+    utils.log_and_message(
+        f"Password removed from rclone config file: {config_filepath}"
+    )
+
 
 def remove_credentials_as_password_command():
     if "RCLONE_PASSWORD_COMMAND" in os.environ: