machineconfig 3.88__py3-none-any.whl → 3.89__py3-none-any.whl

machineconfig/jobs/python_generic_installers/config.json

@@ -456,7 +456,7 @@
     },
     {
       "appName": "starship",
-      "repoURL": "starship/starship",
+      "repoURL": "https://github.com/starship/starship",
       "doc": "⭐️ The minimal, blazing-fast, and infinitely customizable prompt for any shell!",
       "filenameTemplate": {
         "amd64": {

machineconfig/jobs/python_linux_installers/config.json

@@ -28,7 +28,7 @@
           "linux": "pistol-static-linux-x86_64"
         },
         "arm64": {
-          "linux": "pistol-static-linux-aarch64"
+          "linux": "pistol-static-linux-aarch64"please
         }
       },
       "stripVersion": true,

machineconfig/scripts/python/devops.py

@@ -28,7 +28,7 @@ def main(which: Optional[Options] = None):
     options = options_list
     if which is None:
         try:
-            choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False)
+            choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False, fzf=False)
         except KeyboardInterrupt:
             console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
             return

machineconfig/scripts/python/devops_devapps_install.py

@@ -53,8 +53,8 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
             print(a_message)
         return None
 
-    # interactive installation
-    installers = get_installers(system=system(), dev=False) + get_installers(system=system(), dev=True)
+    # interactive installation - get all installers including dev ones
+    installers = get_installers(system=system(), dev=True)
 
     # Check installed programs with progress indicator
     with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}")) as progress:
@@ -66,7 +66,7 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
 
     options += list(get_args(WHICH_CAT))
     # print("s"*1000)
-    program_names = choose_from_options(multi=True, msg="", options=options, header="🚀 CHOOSE DEV APP", default="AllEssentials")
+    program_names = choose_from_options(multi=True, msg="", options=options, header="🚀 CHOOSE DEV APP", default="AllEssentials", fzf=True)
 
     total_commands = ""
     installation_messages: list[str] = []
@@ -119,7 +119,7 @@ def get_programs_by_category(program_name: WHICH_CAT):
                 options_system = {**options_system_1, **options_system_2}
             else:
                 raise NotImplementedError(f"❌ System {system()} not supported")
-            program_names = choose_from_options(multi=True, msg="", options=sorted(list(options_system.keys())), header="🚀 CHOOSE DEV APP")
+            program_names = choose_from_options(multi=True, msg="", options=sorted(list(options_system.keys())), header="🚀 CHOOSE DEV APP", fzf=True)
             program = ""
             for name in program_names:
                 print(f"""

machineconfig/utils/options.py

@@ -51,13 +51,13 @@ def choose_from_options[T](msg: str, options: Iterable[T], multi: Literal[True],
 def choose_from_options[T](msg: str, options: Iterable[T], multi: bool, custom_input: bool = True, header: str = "", tail: str = "", prompt: str = "", default: Optional[T] = None, fzf: bool = False, ) -> Union[T, list[T]]:
     # TODO: replace with https://github.com/tmbo/questionary
     # # also see https://github.com/charmbracelet/gum
-    tool_name = "fzf"
     options_strings: list[str] = [str(x) for x in options]
     default_string = str(default) if default is not None else None
     console = Console()
-    if fzf and check_tool_exists(tool_name):
+    fzf_exists = check_tool_exists("fzf")
+    # print("\n" * 10, f"{fzf=}, {fzf_exists=}", "\n" * 10)
+    if fzf and fzf_exists:
         from pyfzf.pyfzf import FzfPrompt
-
         fzf_prompt = FzfPrompt()
         nl = "\n"
         choice_string_multi: list[str] = fzf_prompt.prompt(choices=options_strings, fzf_options=("--multi" if multi else "") + f' --prompt "{prompt.replace(nl, " ")}" ')  # --border-label={msg.replace(nl, ' ')}")
@@ -86,9 +86,9 @@ def choose_from_options[T](msg: str, options: Iterable[T], multi: bool, custom_i
 
         console.print(txt_panel)
         if default is not None:
-            choice_string = input(f"{prompt}\nEnter option number or hit enter for default choice: ")
+            choice_string = input(f"{prompt}\nEnter option number/name or hit enter for default choice: ")
         else:
-            choice_string = input(f"{prompt}\nEnter option number: ")
+            choice_string = input(f"{prompt}\nEnter option number/name: ")
 
         if choice_string == "":
             if default_string is None:
@@ -112,7 +112,7 @@ def choose_from_options[T](msg: str, options: Iterable[T], multi: bool, custom_i
                     # raise ValueError(f"Unknown choice. {choice_string}") from ie
                     console.print(Panel(f"❓ Unknown choice: '{choice_string}'", title="Error", expand=False))
                     return choose_from_options(msg=msg, options=options, header=header, tail=tail, prompt=prompt, default=default, fzf=fzf, multi=multi, custom_input=custom_input)
-            except TypeError as te:  # int(choice_string) failed due to # either the number is invalid, or the input is custom.
+            except (TypeError, ValueError) as te:  # int(choice_string) failed due to # either the number is invalid, or the input is custom.
                 if choice_string in options_strings:  # string input
                     choice_idx = options_strings.index(choice_one)  # type: ignore
                     choice_one = list(options)[choice_idx]

machineconfig/utils/path_extended.py

@@ -861,6 +861,7 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         transfers: int = 10,
         root: Optional[str] = "myhome",
     ) -> "PathExtended":
+        _ = transfers
         to_del = []
         localpath = self.expanduser().absolute() if not self.exists() else self
         if zip:
@@ -873,21 +874,17 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
             rp = localpath.get_remote_path(root=root, os_specific=os_specific, rel2home=rel2home, strict=strict)  # if rel2home else (P(root) / localpath if root is not None else localpath)
         else:
             rp = PathExtended(remotepath)
-        rclone_cmd = f"""rclone copyto '{localpath.as_posix()}' '{cloud}:{rp.as_posix()}' {"--progress" if verbose else ""} --transfers={transfers}"""
-        from machineconfig.utils.terminal import Terminal
 
-        if verbose:
-            print(f"{'⬆️' * 5} UPLOADING with `{rclone_cmd}`")
-        shell_to_use = "powershell" if sys.platform == "win32" else "bash"
-        res = Terminal(stdout=None if verbose else subprocess.PIPE).run(rclone_cmd, shell=shell_to_use).capture()
+        from rclone_python import rclone
+        rclone.copyto(in_path=localpath.as_posix(), out_path=f"{cloud}:{rp.as_posix()}", )
         _ = [item.delete(sure=True) for item in to_del]
-        assert res.is_successful(strict_err=False, strict_returcode=True), res.print(capture=False, desc="Cloud Storage Operation")
         if verbose:
             print(f"{'⬆️' * 5} UPLOAD COMPLETED.")
         if share:
             if verbose:
                 print("🔗 SHARING FILE")
             shell_to_use = "powershell" if sys.platform == "win32" else "bash"
+            from machineconfig.utils.terminal import Terminal
             res = Terminal().run(f"""rclone link '{cloud}:{rp.as_posix()}'""", shell=shell_to_use).capture()
             tmp = res.op2path(strict_err=False, strict_returncode=False)
             if tmp is None:
@@ -916,6 +913,7 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         overwrite: bool = True,
         merge: bool = False,
     ):
+        _ = verbose, transfers
         if remotepath is None:
             remotepath = self.get_remote_path(root=root, os_specific=os_specific, rel2home=rel2home, strict=strict)
             remotepath += ".zip" if unzip else ""
@@ -925,16 +923,11 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         localpath = self.expanduser().absolute()
         localpath += ".zip" if unzip else ""
         localpath += ".enc" if decrypt else ""
-        rclone_cmd = f"""rclone copyto '{cloud}:{remotepath.as_posix()}' '{localpath.as_posix()}' {"--progress" if verbose else ""} --transfers={transfers}"""
-        from machineconfig.utils.terminal import Terminal
-
-        if verbose:
-            print(f"{'⬇️' * 5} DOWNLOADING with `{rclone_cmd}`")
-        shell_to_use = "powershell" if sys.platform == "win32" else "bash"
-        res = Terminal(stdout=None if verbose else subprocess.PIPE).run(rclone_cmd, shell=shell_to_use)
-        success = res.is_successful(strict_err=False, strict_returcode=True)
-        if not success:
-            res.print(capture=False, desc="Cloud Storage Operation")
+        from rclone_python import rclone
+        try:
+            rclone.copyto(in_path=f"{cloud}:{remotepath.as_posix()}", out_path=localpath.as_posix(), )
+        except Exception as e:
+            print("to_cloud error", e)
             return None
         if decrypt:
             localpath = localpath.decrypt(key=key, pwd=pwd, inplace=True)
@@ -946,17 +939,23 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         tmp_path_obj = self.expanduser().absolute()
         tmp_path_obj.parent.mkdir(parents=True, exist_ok=True)
         tmp1, tmp2 = tmp_path_obj.as_posix(), self.get_remote_path(root=root, os_specific=os_specific).as_posix()
-        source, target = (tmp1, f"{cloud}:{tmp2 if rel2home else tmp1}") if sync_up else (f"{cloud}:{tmp2 if rel2home else tmp1}", tmp1)  # in bisync direction is irrelavent.
+        if sync_up:
+            source = tmp1
+            target = f"{cloud}:{tmp2 if rel2home else tmp1}"
+        else:
+            source = f"{cloud}:{tmp2 if rel2home else tmp1}"   # in bisync direction is irrelavent.
+            target = tmp1
+
         if not sync_down and not sync_up:
             _ = print(f"SYNCING 🔄️ {source} {'<>' * 7} {target}`") if verbose else None
             rclone_cmd = f"""rclone bisync '{source}' '{target}' --resync --remove-empty-dirs """
         else:
             print(f"SYNCING 🔄️ {source} {'>' * 15} {target}`")
             rclone_cmd = f"""rclone sync '{source}' '{target}' """
+
         rclone_cmd += f" --progress --transfers={transfers} --verbose"
         rclone_cmd += " --delete-during" if delete else ""
         from machineconfig.utils.terminal import Terminal
-
         if verbose:
             print(rclone_cmd)
         shell_to_use = "powershell" if sys.platform == "win32" else "bash"
@@ -965,4 +964,5 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         if not success:
             res.print(capture=False, desc="Cloud Storage Operation")
             return None
+
         return self

{machineconfig-3.88.dist-info → machineconfig-3.89.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.88
+Version: 3.89
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-3.88.dist-info → machineconfig-3.89.dist-info}/RECORD

@@ -83,13 +83,13 @@ machineconfig/jobs/python_custom_installers/scripts/linux/vscode.sh,sha256=8S0nZ
 machineconfig/jobs/python_custom_installers/scripts/linux/warp-cli.sh,sha256=PVNLeYWdh3XEFllCVZDYIHBI42btjGlH5jbyXjJGz-Y,3033
 machineconfig/jobs/python_custom_installers/scripts/linux/wezterm.sh,sha256=m697rRoIIVk-f8JdI1YQmphk-JWpMc5IYbD5YaQ3SeQ,1874
 machineconfig/jobs/python_generic_installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/jobs/python_generic_installers/config.json,sha256=FRzNOgyChrtH1YNcmBQi-SPPrsrvw39imUfPDtTYgCY,19930
+machineconfig/jobs/python_generic_installers/config.json,sha256=8oxCQANAy5lFVGUPNjavZT0ro8Su-dGj1fJael3Ohbc,19949
 machineconfig/jobs/python_generic_installers/config.json.bak,sha256=dkrLpAs-xJ1gvpFd42yuWGoRkkE1MG-8fAhrMNrxt34,20678
 machineconfig/jobs/python_generic_installers/dev/config.archive.json,sha256=1rZO1-5lxtbVGuXXoTTuvWjs54xlHHIAIIZYDAy8FSA,823
 machineconfig/jobs/python_generic_installers/dev/config.json,sha256=ItwFXaLlIGwBS2SfmYwsqYU86fAKQmCfLD7vaneZgPA,26928
 machineconfig/jobs/python_generic_installers/dev/config.json.bak,sha256=dKzCQNuQigcuTGw1uvhHkhG-kvp2UPHpv0X6XOTYtBE,29760
 machineconfig/jobs/python_linux_installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/jobs/python_linux_installers/config.json,sha256=ieu42FP2ZNT9uWDCG8wwbfXRdKqi_fF5SpHclP3eRCY,4652
+machineconfig/jobs/python_linux_installers/config.json,sha256=N0kk9WSUzIbKiLl5a4qRoR0LB4qGGjzLXIlWYMcm8mY,4658
 machineconfig/jobs/python_linux_installers/config.json.bak,sha256=rn2mss51IgiAKKmhPdQ0nmTC_aPFm-6rIfHdCBlEFBE,5324
 machineconfig/jobs/python_linux_installers/archive/config.json,sha256=bpfrVl1Zcmb6FwrIh413bV_o2_e4NVA8RESZil10wZk,370
 machineconfig/jobs/python_linux_installers/archive/config.json.bak,sha256=haf6H05bW2AC-CptfZBeNeMoQK60w8iWmCZ2aDiL4O0,302
@@ -165,11 +165,11 @@ machineconfig/scripts/python/cloud_mount.py,sha256=RFMzRUep2D5HtVXANIi-pab3EkI-W
 machineconfig/scripts/python/cloud_repo_sync.py,sha256=GBhdUu9BJwhLYmhxxtvqJGLy7xKdQcnH9kkL4jcbzEE,9502
 machineconfig/scripts/python/cloud_sync.py,sha256=RWGpAfJ9fnN18yNBSgN44dzA38Hmd4879JL5r2pcyrM,3514
 machineconfig/scripts/python/croshell.py,sha256=tYc8MUVcbvSH8JZxc273z9Kr8LitoKxI7ZdFN-_Ms-s,8945
-machineconfig/scripts/python/devops.py,sha256=ws9AzqD-poLndODMFTe5bii3JNsPMsi0BuJJ11ZbPSw,5658
+machineconfig/scripts/python/devops.py,sha256=GD1FLfp76E5bhcs9XhC3Fa6XfMOdfv_qu8kMBOjVtXE,5669
 machineconfig/scripts/python/devops_add_identity.py,sha256=JfN3ZrYMCgmt4ks_VCfnV9BIIHAsOYO3E0W0wZ15FR8,3791
 machineconfig/scripts/python/devops_add_ssh_key.py,sha256=KaoX83KltBsmutfKhSfZjd7nP_R1hJ2OLAWRhbswO7o,6889
 machineconfig/scripts/python/devops_backup_retrieve.py,sha256=jZe5Vki7E2GCMG8hvqUZeOONFC4cNzISoGzq_dMG4GA,5601
-machineconfig/scripts/python/devops_devapps_install.py,sha256=Q2suPkfwwdtIN3mjxH6tGZLYC7tZVxdxrGW7d9phiPA,9972
+machineconfig/scripts/python/devops_devapps_install.py,sha256=kPq8lARp0JEEoaUNfcfO6rFHHYV3x-SBJ0ogzCwDPHQ,9987
 machineconfig/scripts/python/devops_update_repos.py,sha256=c5qBc9cuTGDEqDHufkjDT4d_vvJsswv3tlqk9MAulYk,8063
 machineconfig/scripts/python/dotfile.py,sha256=SRcX-9Ak1jRvF-killBTTm2IWcsNxfiLucH6ZsytAFA,2202
 machineconfig/scripts/python/fire_agents.py,sha256=Hn27ZGWBRlu3mDyJPf_qg_m0i3AbWbWpA-Ce1VeZjUY,9207
@@ -400,8 +400,8 @@ machineconfig/utils/installer.py,sha256=_sjaIqqHN-7n3mYD-iOIli6Bn2792EjOwE-JC528
 machineconfig/utils/io.py,sha256=6LuQMT7CG26atx5_0P30Ru0zHgLwuvpKHfZLUWIjS-U,2873
 machineconfig/utils/links.py,sha256=riNUrG8aGElRszdOPOic4M2AyOcpdcth_-y8JEiZpJ4,10253
 machineconfig/utils/notifications.py,sha256=vvdsY5IX6XEiILTnt5lNyHxhCi0ljdGX2T_67VRfrG4,9009
-machineconfig/utils/options.py,sha256=Fn5Ka3cUtJrJEwjmr0iRrETU6dEtM4y8-lvuYyaSetw,9199
-machineconfig/utils/path_extended.py,sha256=jqkVr_leG6mQsDBG84Hu0SjMPtJ7jxODryi85c45jXE,52518
+machineconfig/utils/options.py,sha256=aEFeVbHfbX0d3VjjZcUAQA0jSOsKhKhr7P0kGHYhPd0,9284
+machineconfig/utils/path_extended.py,sha256=nTETtTxzNaxdrapIH3WzkR__b-1k6Lx7SpRAXqmIJN4,51793
 machineconfig/utils/path_helper.py,sha256=jqOf3TAlw5cqSp4HBAlOqjAR_bzC8_fvjA-_-CooI6Y,8030
 machineconfig/utils/procs.py,sha256=KjEbrwfbdoi5IBM518scxMDVi7NxTZLHuYiKmwdGlzg,11393
 machineconfig/utils/scheduler.py,sha256=bUHDviS_HE9_6LaA1k9Nnfz5rr2FJIfrk5qO2FJ-oUs,15119
@@ -422,8 +422,8 @@ machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=CCs5ebomW1ac
 machineconfig/utils/schemas/installer/installer_types.py,sha256=iAzcALc9z_FAQE9iuGHfX6Z0B1_n3Gt6eC0d6heYik0,599
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=M1ZFCz_kjRZPhxM19rIYUDR5lDDpwa09odR_ihtIFq0,1932
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-3.88.dist-info/METADATA,sha256=9lxn7WjqHpXrQZf633ZzqR190I1ZPVSqK0arz77rq_E,6998
-machineconfig-3.88.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-3.88.dist-info/entry_points.txt,sha256=rSx_9gXd2stziS1OkNy__jF647hrRxRiF6zolLUELc4,1153
-machineconfig-3.88.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-3.88.dist-info/RECORD,,
+machineconfig-3.89.dist-info/METADATA,sha256=x-Ql6nmdV_7gD4-vAs9QZ3LR4kIv7KXml5BDnYrsmic,6998
+machineconfig-3.89.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-3.89.dist-info/entry_points.txt,sha256=rSx_9gXd2stziS1OkNy__jF647hrRxRiF6zolLUELc4,1153
+machineconfig-3.89.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-3.89.dist-info/RECORD,,