machineconfig 1.9__py3-none-any.whl → 1.92__py3-none-any.whl

machineconfig/scripts/python/cloud_repo_sync.py

@@ -1,14 +1,15 @@
 
 """utils"""
 
-
-from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, write_shell_script, get_shell_file_executing_python_script
-from crocodile.file_management import P, Read, install_n_import
+import git
+from crocodile.file_management import P, Read
 from crocodile.core import randstr
 from crocodile.meta import Terminal
+
+from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, write_shell_script, get_shell_file_executing_python_script, get_shell_script, choose_one_option
 import argparse
 import platform
-from typing import Optional
+from typing import Optional, Literal
 # import sys
 # import subprocess
 
@@ -22,13 +23,14 @@ def get_wt_cmd(wd1: P, wd2: P) -> str:
 
 
 def get_zellij_cmd(wd1: P, wd2: P) -> str:
-    lines = [f""" zellij action new-tab --name gitdiff""",
-             f"""zellij action new-pane --direction down --name local --cwd ./data """,
-             f"""zellij action write-chars "cd '{wd1}'; git status" """,
-             f"""zellij action move-focus up; zellij action close-pane """,
-             f"""zellij action new-pane --direction down --name remote --cwd code """,
-             f"""zellij action write-chars "cd '{wd2}' """,
-             f"""git status" """
+    _ = wd1, wd2
+    lines = [""" zellij action new-tab --name gitdiff""",
+             """zellij action new-pane --direction down --name local --cwd ./data """,
+             """zellij action write-chars "cd '{wd1}'; git status" """,
+             """zellij action move-focus up; zellij action close-pane """,
+             """zellij action new-pane --direction down --name remote --cwd code """,
+             """zellij action write-chars "cd '{wd2}' """,
+             """git status" """
     ]
     return "; ".join(lines)
 
@@ -43,20 +45,23 @@ def args_parser():
 
     parser.add_argument("--cloud", "-c", help="rclone cloud profile name.", default=None)
     parser.add_argument("--message", "-m", help="Commit Message", default=f"new message {randstr()}")
-    parser.add_argument("--skip_confirmation", "-s", help="Skip confirmation.", action="store_true", default=False)
+    # parser.add_argument("--skip_confirmation", "-s", help="Skip confirmation.", action="store_true", default=False)
     # parser.add_argument("--key", "-k", help="Key for encryption", default=None)
     parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
-    parser.add_argument("--no_push", "-u", help="push to reomte.", action="store_true")  # default is False
+    # parser.add_argument("--no_push", "-u", help="push to reomte.", action="store_true")  # default is False
+    parser.add_argument("--action", "-a", help="Action to take if merge fails.", choices=["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"], default="ask")
     args = parser.parse_args()
 
     # if args.share:
     #     from machineconfig.scripts.cloud.dotfiles import put
     #     put()
     #     return None
-    main(cloud=args.cloud, path=args.path, message=args.message, skip_confirmation=args.skip_confirmation, pwd=args.pwd, push=not args.no_push)
+    main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
 
 
-def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optional[str] = None, skip_confirmation: bool = False, pwd: Optional[str] = None, push: bool = True):
+def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optional[str] = None,
+         action: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = "ask",
+         pwd: Optional[str] = None):
     if cloud is None:
         try:
             cloud_resolved = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
@@ -67,7 +72,7 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
     else: cloud_resolved = cloud
     # repo_root = P(args.repo).expanduser().absolute()
     repo_local_root = P.cwd() if path is None else P(path).expanduser().absolute()
-    repo_local_obj = install_n_import("git", "gitpython").Repo(repo_local_root, search_parent_directories=True)
+    repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
     repo_local_root = P(repo_local_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
     CONFIG_PATH.joinpath("remote").create()
     repo_remote_root = CONFIG_PATH.joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
@@ -79,7 +84,7 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
         print("Remote does not exist, creating it and exiting ... ")
         repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
         return ""
-    repo_remote_obj = install_n_import("git", "gitpython").Repo(repo_remote_root)
+    repo_remote_obj = git.Repo(repo_remote_root)
     if repo_remote_obj.is_dirty():
         print("=" * 50, '\n', f"WRANING: the remote `{repo_remote_root}` is dirty, please commit or stash changes before proceeding.", '\n', "=" * 50)
 
@@ -102,49 +107,79 @@ echo '-> Fetching originEnc remote.'
 git pull originEnc master
 
 """
-    suffix = '.ps1' if platform.system() == 'Windows' else '.sh'
-    res = Terminal().run(f". {P.tmpfile(suffix=suffix).write_text(script)}", shell="powershell").capture().print()
+
+    shell_path = get_shell_script(shell_script=script)
+    res = Terminal().run(f". {shell_path}", shell="powershell").capture().print()
 
     if res.is_successful(strict_err=True, strict_returcode=True):
         print("\n", "Pull succeeded, removing originEnc, the local copy of remote & pushing merged repo_root to remote ... ")
         repo_remote_root.delete(sure=True)
         from git.remote import Remote
         Remote.remove(repo_local_obj, "originEnc")
-        if push:
-            repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
+        repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
     else:
-        print(f"Failed to pull, keeping local copy of remote at {repo_remote_root} ... ")
-
-        if push:
-            if skip_confirmation: resp = "y"
-            else: resp = input(f"Would you like to proceed syncing `{repo_local_root}` to `{cloud_resolved}` by pushing local changes to remote and deleting local copy of remote? y/[n] ") or "n"
-        else: resp = "n"
+        print(f"Failed to merge with no errors, keeping local copy of remote at {repo_remote_root} ... ")
 
-        if resp.lower() == "y":
-            delete_remote_repo_copy_and_push_local(remote_repo=repo_remote_root.str, local_repo=repo_local_root.str, cloud=cloud_resolved)
-        else:
-            program = f"""
+        # ================================================================================
+        option1 = 'Delete remote copy and push local:'
+        program_1_py = f"""
 from machineconfig.scripts.python.cloud_repo_sync import delete_remote_repo_copy_and_push_local as func
-func(remote_repo=r'{repo_remote_root.str}', local_repo=r'{repo_local_root.str}', cloud=r'{cloud_resolved}')
+func(remote_repo=r'{repo_remote_root.to_str()}', local_repo=r'{repo_local_root.to_str()}', cloud=r'{cloud_resolved}')
 """
-            shell_file = get_shell_file_executing_python_script(python_script=program)
-            print(f"When ready, use this snippet: \n. {shell_file}")
-            print(f"""
-Or, if you want to delete local repo and replace with remote, run the following bash commands:
-          
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_name="ve")
+        # ================================================================================
+
+        option2 = 'Delete local repo and replace it with remote copy:'
+        program_2 = f"""
 rm -rfd {repo_local_root}
 mv {repo_remote_root} {repo_local_root}
+sudo chmod 600 $HOME/.ssh/*
+sudo chmod 700 $HOME/.ssh
+"""
+
+        shell_file_2 = get_shell_script(shell_script=program_2)
 
-""")
-            if platform.system() == "Windows":
-                program = get_wt_cmd(wd1=repo_local_root, wd2=repo_remote_root)
-                write_shell_script(program=program, execute=True)
-                return None
-            elif platform.system() == "Linux":
-                program = get_zellij_cmd(wd1=repo_local_root, wd2=repo_remote_root)
-                write_shell_script(program=program, execute=True)
-                return None
-            else: raise NotImplementedError(f"Platform {platform.system()} not implemented.")
+        # ================================================================================
+        option3 = 'Inspect repos:'
+        program_3_py = f"""
+from machineconfig.scripts.python.cloud_repo_sync import inspect_repos as func
+func(repo_local_root=r'{repo_local_root.to_str()}', repo_remote_root=r'{repo_remote_root.to_str()}')
+"""
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_name="ve")
+        # ================================================================================
+
+        option4 = 'Remove problematic rclone file from repo and replace with remote:'
+        program_4 = f"""
+rm $HOME/dotfiles/creds/rclone/rclone.conf
+cp $HOME/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf $HOME/dotfiles/creds/rclone
+cd $HOME/dotfiles
+git commit -am "finished merging"
+. {shell_file_1}
+"""
+        shell_file_4 = get_shell_script(shell_script=program_4)
+        # ================================================================================
+
+        print(f"• {option1:75} 👉 {shell_file_1}")
+        print(f"• {option2:75} 👉 {shell_file_2}")
+        print(f"• {option3:75} 👉 {shell_file_3}")
+        print(f"• {option4:75} 👉 {shell_file_4}")
+
+        match action:
+            case "ask":
+                choice = choose_one_option(options=[option1, option2, option3, option4], fzf=False)
+                if choice == option1: PROGRAM_PATH.write_text(shell_file_1.read_text())
+                elif choice == option2: PROGRAM_PATH.write_text(program_2)
+                elif choice == option3: PROGRAM_PATH.write_text(shell_file_3.read_text())
+                elif choice == option4: PROGRAM_PATH.write_text(program_4)
+                else: raise NotImplementedError(f"Choice {choice} not implemented.")
+            case "pushLocalMerge":
+                PROGRAM_PATH.write_text(shell_file_1.read_text())
+            case "overwriteLocal":
+                PROGRAM_PATH.write_text(program_2)
+            case "InspectRepos":
+                PROGRAM_PATH.write_text(shell_file_3.read_text())
+            case "RemoveLocalRclone":
+                PROGRAM_PATH.write_text(program_4)
 
 
 def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cloud: str):
@@ -158,5 +193,17 @@ def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cl
     repo_root_path.to_cloud(cloud=cloud, zip=True, encrypt=True, rel2home=True, os_specific=False)
 
 
+def inspect_repos(repo_local_root: str, repo_remote_root: str):
+    if platform.system() == "Windows":
+        program = get_wt_cmd(wd1=P(repo_local_root), wd2=P(repo_local_root))
+        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
+        return None
+    elif platform.system() == "Linux":
+        program = get_zellij_cmd(wd1=P(repo_local_root), wd2=P(repo_remote_root))
+        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
+        return None
+    else: raise NotImplementedError(f"Platform {platform.system()} not implemented.")
+
+
 if __name__ == "__main__":
     args_parser()

machineconfig/scripts/python/cloud_sync.py

@@ -4,8 +4,8 @@ TODO: use tap typed-argument-parser to parse args
 TODO: use typer to make clis
 """
 
-from crocodile.file_management import P, Read, Struct
-# from crocodile.core import install_n_import
+from crocodile.file_management import P, Read
+from crocodile.core import Struct
 from machineconfig.utils.utils import PROGRAM_PATH, DEFAULTS_PATH
 from machineconfig.scripts.python.cloud_mount import get_mprocs_mount_txt
 import argparse
@@ -22,12 +22,12 @@ ES = "^"  # chosen carefully to not mean anything on any shell. `$` was a bad ch
 
 
 class ArgsDefaults:
-    # source: str = None
-    # target: str = None
-    encrypt: bool = False
-    zip_: bool = False
-    overwrite: bool = False
-    share: bool = False
+    # source: str=None
+    # target: str=None
+    encrypt: bool=False
+    zip_: bool=False
+    overwrite: bool=False
+    share: bool=False
     rel2home = False
     root = None
     os_specific = False
@@ -35,13 +35,13 @@ class ArgsDefaults:
     pwd = None
 
 
-@dataclass(config=ConfigDict(extra="forbid", frozen=True))
+@dataclass(config=ConfigDict(extra="forbid", frozen=False))
 class Args():
     cloud: Optional[str] = None
 
-    zip: bool = ArgsDefaults.zip_
-    overwrite: bool = ArgsDefaults.overwrite
-    share: bool = ArgsDefaults.share
+    zip: bool=ArgsDefaults.zip_
+    overwrite: bool=ArgsDefaults.overwrite
+    share: bool=ArgsDefaults.share
 
     root: Optional[str] = ArgsDefaults.root
     os_specific: bool = ArgsDefaults.os_specific
@@ -70,7 +70,7 @@ def absolute(path: str) -> P:
     return obj.absolute()
 
 
-def get_secure_share_cloud_config(interactive: bool = True) -> Args:
+def get_secure_share_cloud_config(interactive: bool=True) -> Args:
     if os.environ.get("CLOUD_CONFIG_NAME") is not None:
         default_cloud = os.environ.get("CLOUD_CONFIG_NAME")
         assert default_cloud is not None
@@ -98,7 +98,7 @@ def get_secure_share_cloud_config(interactive: bool = True) -> Args:
                pwd=pwd, encrypt=True,
                zip=True, overwrite=True, share=True,
                rel2home=True, root="myshare", os_specific=False,)
-    Struct(res.__dict__).print(as_config=True, title=f"⚠️ Using SecureShare cloud config")
+    Struct(res.__dict__).print(as_config=True, title="⚠️ Using SecureShare cloud config")
     return res
 
 
@@ -113,55 +113,71 @@ def find_cloud_config(path: P):
 
 
 def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str, str, str]:
+    config = args.config
+    if config == "ss":
+        maybe_config = get_secure_share_cloud_config()
+    elif config is not None:
+        maybe_config = Args.from_config(absolute(config))
+    else:
+        maybe_config = None
+
+    if maybe_config is not None:
+        if args.zip == ArgsDefaults.zip_: args.zip = maybe_config.zip
+        if args.encrypt == ArgsDefaults.encrypt: args.encrypt = maybe_config.encrypt
+        if args.share == ArgsDefaults.share: args.share = maybe_config.share
+        if args.root == ArgsDefaults.root: args.root = maybe_config.root
+        if args.rel2home == ArgsDefaults.rel2home: args.rel2home = maybe_config.rel2home
+        if args.pwd == ArgsDefaults.pwd: args.pwd = maybe_config.pwd
+        if args.os_specific == ArgsDefaults.os_specific: args.os_specific = maybe_config.os_specific
+
+    root = args.root
+    rel2home = args.rel2home
+    pwd = args.pwd
+    encrypt = args.encrypt
+    zip_arg = args.zip
+    share = args.share
+    os_specific = args.os_specific
+
     if source.startswith(":"):  # default cloud name is omitted cloud_name:  # or ES in source
         # At the moment, this cloud.json defaults overrides the args and is activated only when source or target are just ":"
         # consider activating it by a flag, and also not not overriding explicitly passed args options.
-        assert ES not in target, f"Not Implemented here yet."
+        assert ES not in target, "Not Implemented here yet."
         path = absolute(target)
-        if args.config is None:
-            maybe_config: Optional[Args] = find_cloud_config(path=path)
-        else:
-            if args.config == "ss": maybe_config = get_secure_share_cloud_config()
-            else: maybe_config = Args.from_config(absolute(args.config))
+        if maybe_config is None:  maybe_config: Optional[Args] = find_cloud_config(path=path)
 
         if maybe_config is None:
-            default_cloud: str = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+            default_cloud: str=Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
             print(f"⚠️ Using default cloud: {default_cloud}")
             source = default_cloud + ":" + source[1:]
         else:
             tmp = maybe_config
             source = f"{tmp.cloud}:" + source[1:]
-            args.root = tmp.root
-            args.rel2home = tmp.rel2home
-            args.pwd = tmp.pwd
-            args.encrypt = tmp.encrypt
-            args.zip = tmp.zip
-            args.share = tmp.share
-            # args.jh = 22
+            root = tmp.root
+            rel2home = tmp.rel2home
+            pwd = tmp.pwd
+            encrypt = tmp.encrypt
+            zip_arg = tmp.zip
+            share = tmp.share
 
     if target.startswith(":"):  # default cloud name is omitted cloud_name:  # or ES in target
-        assert ES not in source, f"Not Implemented here yet."
+        assert ES not in source, "Not Implemented here yet."
         path = absolute(source)
-        if args.config is None:
-            maybe_config = find_cloud_config(path)
-        else:
-            if args.config == "ss": maybe_config = get_secure_share_cloud_config()
-            else: maybe_config = Args.from_config(absolute(args.config))
+        if maybe_config is None: maybe_config = find_cloud_config(path)
 
-        if maybe_config is not None:
-            tmp = maybe_config
-            target = f"{tmp.cloud}:" + target[1:]
-            args.root = tmp.root
-            args.rel2home = tmp.rel2home
-            args.pwd = tmp.pwd
-            args.encrypt = tmp.encrypt
-            args.zip = tmp.zip
-            args.share = tmp.share
-
-        else:
+        if maybe_config is None:
             default_cloud = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
             print(f"⚠️ Using default cloud: {default_cloud}")
             target = default_cloud + ":" + target[1:]
+        else:
+            tmp = maybe_config
+            target = f"{tmp.cloud}:" + target[1:]
+            root = tmp.root
+            rel2home = tmp.rel2home
+            pwd = tmp.pwd
+            encrypt = tmp.encrypt
+            zip_arg = tmp.zip
+            share = tmp.share
+
 
     if ":" in source and (source[1] != ":" if len(source) > 1 else True):  # avoid the deceptive case of "C:/"
         source_parts: list[str] = source.split(":")
@@ -170,37 +186,38 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
         if len(source_parts) > 1 and source_parts[1] == ES:  # the source path is to be inferred from target.
             assert ES not in target, f"You can't use expand symbol `{ES}` in both source and target. Cyclical inference dependency arised."
             target_obj = absolute(target)
-            remote_path = target_obj.get_remote_path(os_specific=args.os_specific, root=args.root, rel2home=args.rel2home, strict=False)
+            remote_path = target_obj.get_remote_path(os_specific=os_specific, root=root, rel2home=rel2home, strict=False)
             source = f"{cloud}:{remote_path.as_posix()}"
-
         else:  # source path is mentioned, target? maybe.
             if target == ES:  # target path is to be inferred from source.
-                raise NotImplementedError(f"There is no .get_local_path method yet")
+                raise NotImplementedError("There is no .get_local_path method yet")
             else:
                 target_obj = absolute(target)
-        if args.zip and ".zip" not in source: source += ".zip"
-        if args.encrypt and ".enc" not in source: source += ".enc"
+        if zip_arg and ".zip" not in source:
+            source += ".zip"
+        if encrypt and ".enc" not in source:
+            source += ".enc"
 
     elif ":" in target and (target[1] != ":" if len(target) > 1 else True):  # avoid the case of "C:/"
         target_parts: list[str] = target.split(":")
         cloud = target.split(":")[0]
-
         if len(target_parts) > 1 and target_parts[1] == ES:  # the target path is to be inferred from source.
-            assert ES not in source, f"You can't use $ in both source and target. Cyclical inference dependency arised."
+            assert ES not in source, "You can't use $ in both source and target. Cyclical inference dependency arised."
             source_obj = absolute(source)
-            remote_path = source_obj.get_remote_path(os_specific=args.os_specific, root=args.root, rel2home=args.rel2home, strict=False)
+            remote_path = source_obj.get_remote_path(os_specific=os_specific, root=root, rel2home=rel2home, strict=False)
             target = f"{cloud}:{remote_path.as_posix()}"
         else:  # target path is mentioned, source? maybe.
             target = str(target)
             if source == ES:
-                raise NotImplementedError(f"There is no .get_local_path method yet")
+                raise NotImplementedError("There is no .get_local_path method yet")
             else:
                 source_obj = absolute(source)
-        if args.zip and ".zip" not in target: target += ".zip"
-        if args.encrypt and ".enc" not in target: target += ".enc"
+        if zip_arg and ".zip" not in target: target += ".zip"
+        if encrypt and ".enc" not in target: target += ".enc"
     else:
         raise ValueError("Either source or target must be a remote path (i.e. machine:path)")
     Struct({"cloud": cloud, "source": str(source), "target": str(target)}).print(as_config=True, title="CLI Resolution")
+    _ = pwd, encrypt, zip_arg, share
     return cloud, str(source), str(target)
 
 
@@ -224,11 +241,11 @@ def args_parser():
 
     args = parser.parse_args()
     args_dict = vars(args)
-    source: str = args_dict.pop("source")
-    target: str = args_dict.pop("target")
-    verbose: bool = args_dict.pop("verbose")
-    delete: bool = args_dict.pop("delete")
-    bisync: bool = args_dict.pop("bisync")
+    source: str=args_dict.pop("source")
+    target: str=args_dict.pop("target")
+    verbose: bool=args_dict.pop("verbose")
+    delete: bool=args_dict.pop("delete")
+    bisync: bool=args_dict.pop("bisync")
     transfers: int = args_dict.pop("transfers")
     args_obj = Args(**args_dict)
 

machineconfig/scripts/python/croshell.py

@@ -43,7 +43,7 @@ except Exception as e:
     return pycode
 
 
-def get_read_pyfile_pycode(path: P, as_module: bool, cmd: str = ""):
+def get_read_pyfile_pycode(path: P, as_module: bool, cmd: str=""):
     if as_module: pycode = fr"""
 import sys
 sys.path.append(r'{path.parent}')
@@ -72,8 +72,8 @@ def build_parser():
     parser.add_argument("--read", "-r", dest="read", help="read a binary file.", default="")
     parser.add_argument("--file", "-f", dest="file", help="python file path to interpret", default="")
     parser.add_argument("--cmd", "-c", dest="cmd", help="python command to interpret", default="")
-    parser.add_argument("--terminal", "-t", dest="terminal", help=f"specify which terminal to be used. Default console host.", default="")  # can choose `wt`
-    parser.add_argument("--shell", "-S", dest="shell", help=f"specify which shell to be used. Defaults to CMD.", default="")
+    parser.add_argument("--terminal", "-t", dest="terminal", help="specify which terminal to be used. Default console host.", default="")  # can choose `wt`
+    parser.add_argument("--shell", "-S", dest="shell", help="specify which shell to be used. Defaults to CMD.", default="")
 
     args = parser.parse_args()
     # print(f"Crocodile.run: args of the firing command = {args.__dict__}")
@@ -142,10 +142,10 @@ print_logo(logo="crocodile")
     ve = get_ve_profile(P(file)) if args.ve is None else str(args.ve)
 
     final_program = f"""
-# deactivate
-. activate_ve {ve}
+. $HOME/scripts/activate_ve '{ve}'
 {interpreter} """
-    if interpreter == "ipython": final_program += f"{interactivity} --profile {profile} --no-banner"
+    if interpreter == "ipython":
+        final_program += f"{interactivity} --profile {profile} --no-banner"
     final_program += f" {str(pyfile)}"
     print(f"🔥 sourcing  ... {pyfile}")
     # print(f"Running ... {final_program}")

machineconfig/scripts/python/devops.py

@@ -1,9 +1,8 @@
 
 
-
 """devops
 """
-from crocodile.file_management import P
+
 from machineconfig.utils.utils import display_options, PROGRAM_PATH, write_shell_script
 from platform import system
 from enum import Enum
@@ -49,19 +48,19 @@ def main(which: Optional[str] = None):
 
     elif choice_key == Options.ve.value:
         program = ""
-        reply: bool = False
-        if P.cwd().joinpath(".ve.ini").exists():
-            reply = input("Detected .ve.ini file. Do you want to use it to build ve? (y/[n]): ") == "y"
-            if reply:
-                from machineconfig.utils.ve import get_ve_install_script_from_specs
-                program_win = get_ve_install_script_from_specs(repo_root=P.cwd().str, system="Windows")
-                program_lin = get_ve_install_script_from_specs(repo_root=P.cwd().str, system="Linux")
-                install_reply = input("Proceed with installation? (y/[n]): ") == "y"
-                if not install_reply: program = ""
-                else:
-                    if system() == "Windows": program = program_win
-                    elif system() == "Linux": program = program_lin
-                    else: raise ValueError(f"Unknown system: {system()}")
+        reply: bool=False
+        # if P.cwd().joinpath(".ve.ini").exists():
+        #     reply = input("Detected .ve.ini file. Do you want to use it to build ve? (y/[n]): ") == "y"
+        #     if reply:
+        #         from machineconfig.utils.ve import get_ve_install_script_from_specs
+        #         program_win = get_ve_install_script_from_specs(repo_root=P.cwd().to_str(), system="Windows")
+        #         program_lin = get_ve_install_script_from_specs(repo_root=P.cwd().to_str(), system="Linux")
+        #         install_reply = input("Proceed with installation? (y/[n]): ") == "y"
+        #         if not install_reply: program = ""
+        #         else:
+        #             if system() == "Windows": program = program_win
+        #             elif system() == "Linux": program = program_lin
+        #             else: raise ValueError(f"Unknown system: {system()}")
 
         if not reply:
             from machineconfig.utils.ve import get_ve_install_script
@@ -92,18 +91,18 @@ def main(which: Optional[str] = None):
         program = helper.main()
 
     elif choice_key == Options.ssh_setup.value:
-        program_windows = f"""Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
-        program_linux = f"""curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
+        program_windows = """Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
+        program_linux = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
         program = program_linux if system() == "Linux" else program_windows
 
     elif choice_key == Options.ssh_setup_wsl.value:
-        program = f"""curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
+        program = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
 
     elif choice_key == Options.backup.value:
-        from machineconfig.scripts.python.devops_backup_retrieve import main as helper
+        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
         program = helper(direction="BACKUP")
     elif choice_key == Options.retreive.value:
-        from machineconfig.scripts.python.devops_backup_retrieve import main as helper
+        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
         program = helper(direction="RETRIEVE")
 
     elif choice_key == Options.scheduler.value:
@@ -111,8 +110,9 @@ def main(which: Optional[str] = None):
         program = helper()
 
     else: raise ValueError(f"Unimplemented choice: {choice_key}")
-    if program: write_shell_script(program, display=True, preserve_cwd=True, desc="Shell script prepared by Python.", execute=True if which is not None else False)
-    else: write_shell_script("echo 'Done.'", display=False, )  # Python did not return any script to run.
+    if program:
+        write_shell_script(program=program, display=True, preserve_cwd=True, desc="Shell script prepared by Python.", execute=True if which is not None else False)
+    else: write_shell_script(program="echo 'Done.'", display=False, desc="Shell script prepared by Python.", preserve_cwd=True, execute=False)  # Python did not return any script to run.
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -38,7 +38,7 @@ def get_add_ssh_key_script(path_to_key: P):
             program = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
             program = P(program).expanduser().read_text().replace('$sshfile=""', f'$sshfile="{path_to_key}"')
 
-    if system() == "Linux": program += f"""
+    if system() == "Linux": program += """
 
 sudo chmod 700 ~/.ssh
 sudo chmod 644 ~/.ssh/authorized_keys

machineconfig/scripts/python/devops_backup_retrieve.py

@@ -4,7 +4,7 @@
 
 # import subprocess
 from crocodile.file_management import Read, P
-from machineconfig.utils.utils import LIBRARY_ROOT, DEFAULTS_PATH, print_code, choose_cloud_interactively, display_options
+from machineconfig.utils.utils import LIBRARY_ROOT, DEFAULTS_PATH, print_code, choose_cloud_interactively, choose_multiple_options
 from machineconfig.scripts.python.cloud_sync import ES
 from platform import system
 from typing import Any, Literal, Optional
@@ -13,23 +13,25 @@ from typing import Any, Literal, Optional
 OPTIONS = Literal["BACKUP", "RETRIEVE"]
 
 
-def main(direction: OPTIONS, which: Optional[str] = None):
+def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None):
     try:
         cloud: str = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
         print(f"\n{'--' *  50}\n ⚠️ Using default cloud: `{cloud}` ⚠️\n{'--' *  50}\n")
     except (FileNotFoundError, KeyError, IndexError): cloud = choose_cloud_interactively()
 
-    bu_file: dict[str, Any] = LIBRARY_ROOT.joinpath("profile/backup.toml").readit()
+    bu_file: dict[str, Any] = Read.toml(LIBRARY_ROOT.joinpath("profile/backup.toml"))
     if system() == "Linux": bu_file = {key: val for key, val in bu_file.items() if "windows" not in key}
     elif system() == "Windows": bu_file = {key: val for key, val in bu_file.items() if "linux" not in key}
 
     if which is None:
-        choice_key = display_options(msg=f"WHICH FILE of the following do you want to {direction}?", options=['all'] + list(bu_file.keys()))
-        assert isinstance(choice_key, str)
-    else: choice_key = which
+        choices = choose_multiple_options(msg=f"WHICH FILE of the following do you want to {direction}?", options=['all'] + list(bu_file.keys()))
+    else:
+        choices = which.split(",") if isinstance(which, str) else which
 
-    if choice_key == "all": items = bu_file
-    else: items = {choice_key: bu_file[choice_key]}
+    if "all" in choices: items = bu_file
+    else:
+        # items = {choices: bu_file[choices]}
+        items = {key: val for key, val in bu_file.items() if key in choices}
 
     program = f"""$cloud = "{cloud}:{ES}" \n """ if system() == "Windows" else f"""cloud="{cloud}:{ES}" \n """
     for item_name, item in items.items():
@@ -42,11 +44,18 @@ def main(direction: OPTIONS, which: Optional[str] = None):
         if flags: flags = "-" + flags
         if direction == "BACKUP": program += f"""\ncloud_copy "{P(item['path']).as_posix()}" $cloud {flags}\n"""
         elif direction == "RETRIEVE": program += f"""\ncloud_copy $cloud "{P(item['path']).as_posix()}" {flags}\n"""
-        else: raise RuntimeError(f"Unknown direction: {direction}")
-        if item_name == "dotfiles" and system() == "Linux": program += f"""\nchmod 700 ~/.ssh/*\n"""
+        else:
+            raise RuntimeError(f"Unknown direction: {direction}")
+        if item_name == "dotfiles" and system() == "Linux": program += """\nchmod 700 ~/.ssh/*\n"""
     print_code(program, lexer="shell", desc=f"{direction} script")
     return program
 
 
+def main(direction: OPTIONS, which: Optional[str] = None):
+    code = main_backup_retrieve(direction=direction, which=which)
+    from machineconfig.utils.utils import write_shell_script
+    write_shell_script(program=code, desc="backup_retrieve.sh")
+
+
 if __name__ == "__main__":
     pass