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

machineconfig/scripts/python/cloud_repo_sync.py

@@ -1,8 +1,11 @@
 
 """utils"""
 
-import crocodile.toolbox as tb
+
 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
+from crocodile.core import randstr
+from crocodile.meta import Terminal
 import argparse
 import platform
 from typing import Optional
@@ -10,10 +13,24 @@ from typing import Optional
 # import subprocess
 
 
-def get_wt_cmd(wd1: tb.P, wd2: tb.P) -> str: return f"""wt --window 0 new-tab --profile pwsh --title "gitdiff" --tabColor `#3b04d1 --startingDirectory {wd1} `  --colorScheme "Solarized Dark" `; split-pane --horizontal --profile pwsh --startingDirectory {wd2} --size 0.5 --colorScheme "Tango Dark" -- pwsh -Interactive"""
+def get_wt_cmd(wd1: P, wd2: P) -> str:
+    lines = [
+        f"""wt --window 0 new-tab --profile pwsh --title "gitdiff" --tabColor `#3b04d1 --startingDirectory {wd1} ` --colorScheme "Solarized Dark" """,
+        f"""split-pane --horizontal --profile pwsh --startingDirectory {wd2} --size 0.5 --colorScheme "Tango Dark" -- pwsh -Interactive """
+    ]
+    return " `; ".join(lines)
 
 
-def get_zellij_cmd(wd1: tb.P, wd2: tb.P) -> str: return f""" 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" """
+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" """
+    ]
+    return "; ".join(lines)
 
 
 def args_parser():
@@ -25,7 +42,7 @@ def args_parser():
     # parser.add_argument("--share", help="Repository path, defaults to cwd.", action="store_true", default=False)
 
     parser.add_argument("--cloud", "-c", help="rclone cloud profile name.", default=None)
-    parser.add_argument("--message", "-m", help="Commit Message", default=f"new message {tb.randstr()}")
+    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("--key", "-k", help="Key for encryption", default=None)
     parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
@@ -41,89 +58,98 @@ def args_parser():
 
 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):
     if cloud is None:
-        try: cloud_resolved = tb.Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+        try:
+            cloud_resolved = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+            print(f"⚠️ Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH} ⚠️")
         except FileNotFoundError:
             print(f"No cloud profile found @ {DEFAULTS_PATH}, please set one up or provide one via the --cloud flag.")
             return ""
     else: cloud_resolved = cloud
-    # repo_root = tb.P(args.repo).expanduser().absolute()
-    repo_root = tb.P.cwd() if path is None else tb.P(path).expanduser().absolute()
-    repo_obj = tb.install_n_import("git", "gitpython").Repo(repo_root, search_parent_directories=True)
-    repo_root = tb.P(repo_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
+    # 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_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_sync_root = CONFIG_PATH.joinpath("remote", repo_root.rel2home())  # .delete(sure=True)
+    repo_remote_root = CONFIG_PATH.joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
     try:
         print("\n", "=============================== Downloading Remote Repo ====================================")
-        remote_path = repo_root.get_remote_path(rel2home=True, os_specific=False, root="myhome") + ".zip.enc"
-        repo_sync_root.from_cloud(remotepath=remote_path, cloud=cloud_resolved, unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=pwd)
+        remote_path = repo_local_root.get_remote_path(rel2home=True, os_specific=False, root="myhome") + ".zip.enc"
+        repo_remote_root.from_cloud(remotepath=remote_path, cloud=cloud_resolved, unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=pwd)
     except AssertionError:
         print("Remote does not exist, creating it and exiting ... ")
-        repo_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)
         return ""
-    repo_sync_obj = tb.install_n_import("git", "gitpython").Repo(repo_sync_root)
-    if repo_sync_obj.is_dirty():
-        print("=" * 50, '\n', f"WRANING: the remote `{repo_sync_root}` is dirty, please commit or stash changes before proceeding.", '\n', "=" * 50)
+    repo_remote_obj = install_n_import("git", "gitpython").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)
 
     script = f"""
 echo ""
 echo "=============================== Committing Local Changes ==================================="
-cd {repo_root}
+cd {repo_local_root}
 git status
 git add .
 git commit -am "{message}"
 echo ""
 echo ""
 echo "=============================== Pulling Latest From Remote ================================"
-cd {repo_root}
+cd {repo_local_root}
 echo '-> Trying to removing originEnc remote from local repo if it exists.'
 git remote remove originEnc
 echo '-> Adding originEnc remote to local repo'
-git remote add originEnc {repo_sync_root}
+git remote add originEnc {repo_remote_root}
 echo '-> Fetching originEnc remote.'
 git pull originEnc master
 
 """
     suffix = '.ps1' if platform.system() == 'Windows' else '.sh'
-    res = tb.Terminal().run(f". {tb.P.tmpfile(suffix=suffix).write_text(script)}", shell="powershell").capture().print()
+    res = Terminal().run(f". {P.tmpfile(suffix=suffix).write_text(script)}", 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_sync_root.delete(sure=True)
+        repo_remote_root.delete(sure=True)
         from git.remote import Remote
-        Remote.remove(repo_obj, "originEnc")
+        Remote.remove(repo_local_obj, "originEnc")
         if push:
-            repo_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_sync_root} ... ")
+        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_root}` to `{cloud_resolved}` by pushing local changes to remote and deleting local copy of remote? y/[n] ") or "n"
+            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"
 
         if resp.lower() == "y":
-            delete_remote_repo_copy_and_push_local(remote_repo=repo_sync_root.str, local_repo=repo_root.str, cloud=cloud_resolved)
+            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"""
 from machineconfig.scripts.python.cloud_repo_sync import delete_remote_repo_copy_and_push_local as func
-func(remote_repo=r'{repo_sync_root.str}', local_repo=r'{repo_root.str}', cloud=r'{cloud_resolved}')
+func(remote_repo=r'{repo_remote_root.str}', local_repo=r'{repo_local_root.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:
+          
+rm -rfd {repo_local_root}
+mv {repo_remote_root} {repo_local_root}
+
+""")
             if platform.system() == "Windows":
-                program = get_wt_cmd(wd1=repo_root, wd2=repo_sync_root)
+                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_root, wd2=repo_sync_root)
+                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.")
 
 
 def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cloud: str):
-    repo_sync_root = tb.P(remote_repo).expanduser().absolute()
-    repo_root_path = tb.P(local_repo).expanduser().absolute()
+    repo_sync_root = P(remote_repo).expanduser().absolute()
+    repo_root_path = P(local_repo).expanduser().absolute()
     repo_sync_root.delete(sure=True)
     from git.remote import Remote
     from git.repo import Repo

machineconfig/scripts/python/cloud_sync.py

@@ -5,14 +5,17 @@ TODO: use typer to make clis
 """
 
 from crocodile.file_management import P, Read, Struct
-from crocodile.core import install_n_import
+# from crocodile.core import install_n_import
 from machineconfig.utils.utils import PROGRAM_PATH, DEFAULTS_PATH
 from machineconfig.scripts.python.cloud_mount import get_mprocs_mount_txt
 import argparse
 import os
 from typing import Optional
 # from dataclasses import dataclass
+# install_n_import("pydantic")
 # from tap import Tap
+from pydantic.dataclasses import dataclass
+from pydantic import ConfigDict
 
 
 ES = "^"  # chosen carefully to not mean anything on any shell. `$` was a bad choice.
@@ -32,15 +35,8 @@ class ArgsDefaults:
     pwd = None
 
 
-install_n_import("pydantic")
-from pydantic.dataclasses import dataclass  # type: ignore # ruffle: ignore
-from pydantic import ConfigDict
-
-
 @dataclass(config=ConfigDict(extra="forbid", frozen=True))
 class Args():
-    # source: str
-    # target: str
     cloud: Optional[str] = None
 
     zip: bool = ArgsDefaults.zip_
@@ -81,12 +77,14 @@ def get_secure_share_cloud_config(interactive: bool = True) -> Args:
         cloud = default_cloud
     else:
         try:
-            default_cloud = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+            default_cloud__ = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
         except Exception:
-            default_cloud = 'No default cloud found.'
-        if default_cloud == 'No default cloud found.' or interactive:
-            cloud = input(f"Enter cloud name (default {default_cloud}): ") or default_cloud
-        else: cloud = default_cloud
+            default_cloud__ = 'No default cloud found.'
+        if default_cloud__ == 'No default cloud found.' or interactive:
+            # assert default_cloud is not None
+            cloud = input(f"Enter cloud name (default {default_cloud__}): ") or default_cloud__
+        else:
+            cloud = default_cloud__
 
     default_password_path = P.home().joinpath("dotfiles/creds/passwords/quick_password")
     if default_password_path.exists():
@@ -99,7 +97,7 @@ def get_secure_share_cloud_config(interactive: bool = True) -> Args:
     res = Args(cloud=cloud,
                pwd=pwd, encrypt=True,
                zip=True, overwrite=True, share=True,
-               rel2home=True, root="myhome", os_specific=False,)
+               rel2home=True, root="myshare", os_specific=False,)
     Struct(res.__dict__).print(as_config=True, title=f"⚠️ Using SecureShare cloud config")
     return res
 
@@ -215,7 +213,7 @@ def args_parser():
     parser.add_argument("--transfers", "-t", help="Number of threads in syncing.", default=10)  # default is False
     parser.add_argument("--root", "-R", help="Remote root.", default="myhome")  # default is False
 
-    # parser.add_argument("--key", "-k", help="Key for encryption", default=None)
+    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("--encrypt", "-e", help="Decrypt after receiving.", action="store_true")  # default is False
     parser.add_argument("--zip", "-z", help="unzip after receiving.", action="store_true")  # default is False

machineconfig/scripts/python/croshell.py

@@ -8,7 +8,7 @@ import argparse
 # import subprocess
 # import platform
 from crocodile.file_management import P, randstr
-from machineconfig.utils.ve import get_ipython_profile, get_ve_profile
+from machineconfig.utils.ve import get_ipython_profile, get_ve_profile, get_ve_name_and_ipython_profile
 from machineconfig.utils.utils import PROGRAM_PATH, display_options
 
 
@@ -34,8 +34,8 @@ def get_read_data_pycode(path: str):
 p = P(r\'{path}\').absolute()
 try:
     dat = p.readit()
-    if type(dat) == tb.Struct: dat.print(as_config=True, title=p.name)
-    else: print(f"Succcesfully read the file {{p.name}}")
+    if isinstance(dat, dict): Struct(dat).print(as_config=True, title=p.name)
+    else: print(f"Successfully read the file {{p.name}}")
 except Exception as e:
     print(e)
 
@@ -67,7 +67,7 @@ def build_parser():
     parser.add_argument("--fzf", "-F", help="search with fuzzy finder for python scripts and run them", action="store_true", default=False)
 
     # OPTIONAL KEYWORD
-    parser.add_argument("--venv", "-v", help="virtual enviroment to use, defaults to activated ve, if existed, else ve.", default=None)
+    parser.add_argument("--ve", "-v", help="virtual enviroment to use, defaults to activated ve, if existed, else ve.", default=None)
     parser.add_argument("--profile", "-P", help="ipython profile to use, defaults to default profile.", default=None)
     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="")
@@ -93,17 +93,23 @@ def build_parser():
         options = P.cwd().search("*.py", r=True).apply(str).list
         file = display_options(msg="Choose a python file to run", options=options, fzf=True, multi=False, )
         assert isinstance(file, str)
-        if profile is None: profile = profile = get_ipython_profile(P(file))
+        if profile is None:
+            profile = get_ipython_profile(P(file))
         program = P(file).read_text(encoding='utf-8')
 
     elif args.file != "":
         file = P(args.file.lstrip()).expanduser().absolute()
-        if profile is None: profile = profile = get_ipython_profile(P(file))
+        if profile is None:
+            profile = get_ipython_profile(P(file))
         program = get_read_pyfile_pycode(file, as_module=args.module, cmd=args.cmd)
 
     elif args.read != "":
         file = P(str(args.read).lstrip()).expanduser().absolute()
-        if profile is None: profile = profile = get_ipython_profile(P(file))
+        ve_name_from_file, ipy_profile_from_file = get_ve_name_and_ipython_profile(init_path=P(file))
+        # if profile is None:
+        #     profile = get_ipython_profile(P(file))
+        if profile is None: profile = ipy_profile_from_file
+        if args.ve is None: args.ve = ve_name_from_file
         program = get_read_data_pycode(str(file))
 
     else:  # just run croshell.py interactively
@@ -129,9 +135,11 @@ print_logo(logo="crocodile")
     total_program = preprogram + add_print_header_pycode(str(pyfile), title=title) + program
 
     pyfile.write_text(total_program, encoding='utf-8')
-    if profile is None: profile = "default"
+    if profile is None:
+        profile = get_ipython_profile(P.cwd())
+        # profile = "default"
 
-    ve = get_ve_profile(P(file)) if args.venv is None else str(args.ve)
+    ve = get_ve_profile(P(file)) if args.ve is None else str(args.ve)
 
     final_program = f"""
 # deactivate
@@ -140,7 +148,8 @@ print_logo(logo="crocodile")
     if interpreter == "ipython": final_program += f"{interactivity} --profile {profile} --no-banner"
     final_program += f" {str(pyfile)}"
     print(f"🔥 sourcing  ... {pyfile}")
-    PROGRAM_PATH.write_text(final_program)
+    # print(f"Running ... {final_program}")
+    PROGRAM_PATH.write_text(data=final_program)
 
     # if platform.system() == "Windows":
         # return subprocess.run([f"powershell", "-Command", res], shell=True, capture_output=False, text=True, check=True)

machineconfig/scripts/python/devops.py

@@ -1,11 +1,11 @@
 
+
+
 """devops
 """
-
-from platform import system
-# import subprocess
-# import crocodile.toolbox as tb
+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
 from typing import Optional
 
@@ -48,8 +48,24 @@ def main(which: Optional[str] = None):
         program = helper.main()
 
     elif choice_key == Options.ve.value:
-        from machineconfig.utils.ve import get_ve_install_script
-        program = get_ve_install_script()
+        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()}")
+
+        if not reply:
+            from machineconfig.utils.ve import get_ve_install_script
+            program = get_ve_install_script()
 
     elif choice_key == Options.cli_install.value:
         import machineconfig.scripts.python.devops_devapps_install as helper

machineconfig/scripts/python/devops_add_identity.py

@@ -2,20 +2,21 @@
 """ID
 """
 
-import crocodile.toolbox as tb
+
 # from platform import system
+from crocodile.file_management import P
 from machineconfig.utils.utils import display_options
 
 
 def main():
-    private_keys = tb.P.home().joinpath(".ssh").search("*.pub").apply(lambda x: x.with_name(x.stem)).filter(lambda x: x.exists())
+    private_keys = P.home().joinpath(".ssh").search("*.pub").apply(lambda x: x.with_name(x.stem)).filter(lambda x: x.exists())
     choice = display_options(msg="Path to private key to be used when ssh'ing: ", options=private_keys.apply(str).list + ["I have the path to the key file", "I want to paste the key itself"])
-    if choice == "I have the path to the key file": path_to_key = tb.P(input("Input path here: ")).expanduser().absolute()
-    elif choice == "I want to paste the key itself": path_to_key = tb.P.home().joinpath(f".ssh/{input('file name (default: my_pasted_key): ') or 'my_pasted_key'}").write_text(input("Paste the private key here: "))
-    elif isinstance(choice, str): path_to_key = tb.P(choice)
+    if choice == "I have the path to the key file": path_to_key = P(input("Input path here: ")).expanduser().absolute()
+    elif choice == "I want to paste the key itself": path_to_key = P.home().joinpath(f".ssh/{input('file name (default: my_pasted_key): ') or 'my_pasted_key'}").write_text(input("Paste the private key here: "))
+    elif isinstance(choice, str): path_to_key = P(choice)
     else: raise NotImplementedError(f"Choice {choice} not supported")
     txt = f"IdentityFile {path_to_key.collapseuser().as_posix()}"  # adds this id for all connections, no host specified.
-    config_path = tb.P.home().joinpath(".ssh/config")
+    config_path = P.home().joinpath(".ssh/config")
     if config_path.exists(): config_path.modify_text(txt_search=txt, txt_alt=txt, replace_line=True, notfound_append=True, prepend=True)  # note that Identity line must come on top of config file otherwise it won't work, hence `prepend=True`
     else: config_path.write_text(txt)
     program = f"echo 'Finished adding identity to ssh config file. {'*'*50} Consider reloading config file.'"

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -2,14 +2,15 @@
 """SSH
 """
 
-import crocodile.toolbox as tb
+
 from platform import system
 from machineconfig.utils.utils import LIBRARY_ROOT, display_options
+from crocodile.file_management import P
 
 
-def get_add_ssh_key_script(path_to_key: tb.P):
-    if system() == "Linux": authorized_keys = tb.P.home().joinpath(".ssh/authorized_keys")
-    elif system() == "Windows": authorized_keys = tb.P("C:/ProgramData/ssh/administrators_authorized_keys")
+def get_add_ssh_key_script(path_to_key: P):
+    if system() == "Linux": authorized_keys = P.home().joinpath(".ssh/authorized_keys")
+    elif system() == "Windows": authorized_keys = P("C:/ProgramData/ssh/administrators_authorized_keys")
     else: raise NotImplementedError
 
     if authorized_keys.exists():
@@ -35,7 +36,7 @@ def get_add_ssh_key_script(path_to_key: tb.P):
             program = f"cat {path_to_key} > ~/.ssh/authorized_keys"
         else:
             program = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
-            program = tb.P(program).expanduser().read_text().replace('$sshfile=""', f'$sshfile="{path_to_key}"')
+            program = P(program).expanduser().read_text().replace('$sshfile=""', f'$sshfile="{path_to_key}"')
 
     if system() == "Linux": program += f"""
 
@@ -50,17 +51,17 @@ sudo service ssh --full-restart
 
 
 def main():
-    pub_keys = tb.P.home().joinpath(".ssh").search("*.pub")
+    pub_keys = P.home().joinpath(".ssh").search("*.pub")
     all_keys_option = f"all pub keys available ({len(pub_keys)})"
     i_have_path_option = "I have the path to the key file"
     i_paste_option = "I want to paste the key itself"
     res = display_options("Which public key to add? ", options=pub_keys.apply(str).list + [all_keys_option, i_have_path_option, i_paste_option])
     assert isinstance(res, str), f"Got {res} of type {type(res)} instead of str."
     if res == all_keys_option: program = "\n\n\n".join(pub_keys.apply(get_add_ssh_key_script))
-    elif res == i_have_path_option: program = get_add_ssh_key_script(tb.P(input("Path: ")).expanduser().absolute())
-    elif res == i_paste_option: program = get_add_ssh_key_script(tb.P.home().joinpath(f".ssh/{input('file name (default: my_pasted_key.pub): ') or 'my_pasted_key.pub'}").write_text(input("Paste the pub key here: ")))
+    elif res == i_have_path_option: program = get_add_ssh_key_script(P(input("Path: ")).expanduser().absolute())
+    elif res == i_paste_option: program = get_add_ssh_key_script(P.home().joinpath(f".ssh/{input('file name (default: my_pasted_key.pub): ') or 'my_pasted_key.pub'}").write_text(input("Paste the pub key here: ")))
     else:
-        program = get_add_ssh_key_script(tb.P(res))
+        program = get_add_ssh_key_script(P(res))
         print(program)
     return program
 

machineconfig/scripts/python/devops_backup_retrieve.py

@@ -2,11 +2,11 @@
 """BR: Backup and Retrieve
 """
 
-from platform import system
 # import subprocess
-import crocodile.toolbox as tb
+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.scripts.python.cloud_sync import ES
+from platform import system
 from typing import Any, Literal, Optional
 
 
@@ -15,7 +15,7 @@ OPTIONS = Literal["BACKUP", "RETRIEVE"]
 
 def main(direction: OPTIONS, which: Optional[str] = None):
     try:
-        cloud: str = tb.Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+        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()
 
@@ -40,8 +40,8 @@ def main(direction: OPTIONS, which: Optional[str] = None):
         flags += 'r' if item['rel2home'] == 'True' else ''
         flags += 'o' if system().lower() in item_name else ''
         if flags: flags = "-" + flags
-        if direction == "BACKUP": program += f"""\ncloud_copy "{tb.P(item['path']).as_posix()}" $cloud {flags}\n"""
-        elif direction == "RETRIEVE": program += f"""\ncloud_copy $cloud "{tb.P(item['path']).as_posix()}" {flags}\n"""
+        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"""
     print_code(program, lexer="shell", desc=f"{direction} script")

machineconfig/scripts/python/devops_devapps_install.py

@@ -2,11 +2,12 @@
 """Devops Devapps Install
 """
 
-from platform import system
 # import subprocess
-import crocodile.toolbox as tb
+from tqdm import tqdm
+from crocodile.core import List as L
 from machineconfig.utils.utils import LIBRARY_ROOT, choose_multiple_options
-from machineconfig.utils.installer import get_cli_py_installers_v2, Installer, install_all_v2
+from machineconfig.utils.installer import get_installers, Installer, install_all
+from platform import system
 from typing import Any, Optional, Literal, TypeAlias
 
 
@@ -15,11 +16,10 @@ WHICH: TypeAlias = Literal["AllEssentials", "EssentialsAndOthers", "SystemInstal
 
 def main(which: Optional[str] = None):
     sys = system()
-    installers = get_cli_py_installers_v2(dev=False, system=sys)
+    installers = get_installers(dev=False, system=sys)  # + get_installers(dev=True, system=sys)
     default = "AllEssentials"
-    options = ["SystemInstallers", "OtherDevApps", "EssentialsAndOthers", "PrecheckedCloudInstaller"]
-    options = [default] + options
-    options = [x.get_description() for x in installers] + options
+    options = ["SystemInstallers", "OtherDevApps", "EssentialsAndOthers", "PrecheckedCloudInstaller", default]
+    options = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")] + options
 
     if which is not None:
         return get_program(program_name=which, options=options, installers=list(installers))
@@ -34,14 +34,17 @@ def main(which: Optional[str] = None):
 
 def get_program(program_name: str, options: list[str], installers: list[Installer]):
     if program_name == "AllEssentials" or program_name == "EssentialsAndOthers":
-        installers_ = get_cli_py_installers_v2(dev=False, system=system())
+        installers_ = get_installers(dev=False, system=system())
         if program_name == "EssentialsAndOthers":
-            installers_ += get_cli_py_installers_v2(dev=True, system=system())
-        install_all_v2(installers=tb.L(installers))
+            installers_ += get_installers(dev=True, system=system())
+        install_all(installers=L(installers))
         program = ""
     elif program_name == "SystemInstallers":
         if system() == "Windows": options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text())
-        elif system() == "Linux": options_system = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps.sh").read_text())
+        elif system() == "Linux":
+            options_system_1 = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps_dev.sh").read_text())
+            options_system_2 = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps.sh").read_text())
+            options_system = {**options_system_1, **options_system_2}
         else: raise NotImplementedError(f"System {system()} not supported")
         program_names = choose_multiple_options(msg="", options=sorted(list(options_system.keys())), header="CHOOSE DEV APP")
         program = ""
@@ -50,10 +53,13 @@ def get_program(program_name: str, options: list[str], installers: list[Installe
             if sub_program.startswith("#winget"): sub_program = sub_program[1:]
             program += "\n" + sub_program
     elif program_name == "OtherDevApps":
-        installers = get_cli_py_installers_v2(dev=True, system=system())
-        options__: list[str] = [x.get_description() for x in installers]
-        program_names = choose_multiple_options(msg="", options=sorted(options__), header="CHOOSE DEV APP")
+        installers = get_installers(dev=True, system=system())
+        options__: list[str] = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")]
+        program_names = choose_multiple_options(msg="", options=sorted(options__) + ["all"], header="CHOOSE DEV APP")
+        if "all" in program_names: program_names = options__
         program = ""
+        print(f"Installing:")
+        L(program_names).print()
         for name in program_names:
             try:
                 idx = options__.index(name)
@@ -61,9 +67,8 @@ def get_program(program_name: str, options: list[str], installers: list[Installe
                 print(f"{name=}")
                 print(f"{options__=}")
                 raise ve
+            print(f"Installing {name}")
             sub_program = installers[idx].install_robust(version=None)  # finish the task
-            # sub_program = "echo 'Finished Installation'"  # write an empty program
-            # program += "\n" + ""sub_program
     elif program_name == "PrecheckedCloudInstaller":
         from machineconfig.jobs.python.check_installations import PrecheckedCloudInstaller
         ci = PrecheckedCloudInstaller()
@@ -97,7 +102,7 @@ def parse_apps_installer_windows(txt: str) -> dict[str, Any]:
         if idx == 0: continue
         if idx == 1: chunks.append(item)
         else: chunks.append("winget install" + item)
-    # progs = tb.L(txt.splitlines()).filter(lambda x: x.startswith("winget ") or x.startswith("#winget"))
+    # progs = L(txt.splitlines()).filter(lambda x: x.startswith("winget ") or x.startswith("#winget"))
     res: dict[str, str] = {}
     for a_chunk in chunks:
         try:
@@ -110,8 +115,8 @@ def parse_apps_installer_windows(txt: str) -> dict[str, Any]:
         except IndexError as e:
             print(a_chunk)
             raise e
-    # tb.Struct(res).print(as_config=True)
-    # tb.L(chunks).print(sep="-----------------------------------------------------------------------\n\n")
+    # Struct(res).print(as_config=True)
+    # L(chunks).print(sep="-----------------------------------------------------------------------\n\n")
     # import time
     # time.sleep(10)
     return res

machineconfig/scripts/python/devops_update_repos.py

@@ -2,9 +2,10 @@
 """Update
 """
 
-from platform import system
-import crocodile.toolbox as tb
+from crocodile.file_management import P, Read
+from crocodile.core import install_n_import
 from machineconfig.utils.utils import DEFAULTS_PATH
+from platform import system
 
 
 sep = "\n"
@@ -14,7 +15,7 @@ def main(verbose: bool = True) -> str:
     _ = verbose
     repos: list[str] = ["~/code/crocodile", "~/code/machineconfig", ]
     try:
-        tmp = tb.Read.ini(DEFAULTS_PATH)['general']['repos'].split(",")
+        tmp = Read.ini(DEFAULTS_PATH)['general']['repos'].split(",")
         if tmp[-1] == "": tmp = tmp[:-1]
         repos += tmp
     except (FileNotFoundError, KeyError, IndexError):
@@ -30,7 +31,7 @@ to_email = myemail@email.com
     repos_objs = []
     for a_package_path in repos:
         try:
-            repo = tb.install_n_import("git", "gitpython").Repo(str(tb.P(a_package_path).expanduser()), search_parent_directories=True)
+            repo = install_n_import("git", "gitpython").Repo(str(P(a_package_path).expanduser()), search_parent_directories=True)
             repos_objs.append(repo)
         except Exception as ex:
             print(ex)