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

machineconfig/__init__.py

@@ -2,7 +2,7 @@
 """DS
 """
 
-__version__ = "1.9"
+__version__ = "1.91"
 release_notes = """
 
 imporoved installer

machineconfig/jobs/python/check_installations.py

@@ -18,7 +18,7 @@ from typing import Optional
 
 
 APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
-CLOUD: str = "gdw"  # Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+CLOUD: str="gdw"  # Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
 # my onedrive doesn't allow sharing.
 
 
@@ -42,7 +42,7 @@ def scan(path: P, pct: float = 0.0):
                 repeat_counter += 1
                 if repeat_counter > 2:
                     raise ValueError(f"Error in scanning {path}") from ex
-                print(f"Error in scanning, trying again.")
+                print("Error in scanning, trying again.")
             time.sleep(30)
     df = pd.DataFrame(anal.results.values())
     malicious = []
@@ -82,6 +82,7 @@ def main() -> None:
     apps_paths_raw.print()
     positive_pct: list[Optional[float]] = []
     detailed_results: list[dict[str, Optional[pd.DataFrame]]] = []
+
     for idx, app in enumerate(apps_paths_raw):
         try: res = scan(path=app, pct=idx / len(apps_paths_raw) * 100)
         except ValueError as ve:
@@ -105,12 +106,13 @@ def main() -> None:
     res_df["app_url"] = app_url
     res_df.to_csv(APP_SUMMARY_PATH.with_suffix(".csv").create(parents_only=True), index=False)
     APP_SUMMARY_PATH.with_suffix(".md").write_text(res_df.to_markdown())
-    print(f"Safety Report:")
+    print("Safety Report:")
     print(res_df)
 
 
 def upload(path: P):
-    set_time_out = install_n_import("call_function_with_timeout").SetTimeout
+    import call_function_with_timeout
+    set_time_out = call_function_with_timeout.SetTimeout
     func_with_timeout = set_time_out(lambda: path.to_cloud(CLOUD, rel2home=True, share=True, os_specific=True), timeout=180)
     is_done, _is_timeout, _erro_message, results = func_with_timeout()
     if is_done: return results
@@ -146,7 +148,7 @@ class PrecheckedCloudInstaller:
             exe.move(folder=P.home().joinpath("AppData/Local/Microsoft/WindowsApps"), overwrite=True)
         return True
 
-    def download_safe_apps(self, name: str = "AllEssentials"):
+    def download_safe_apps(self, name: str="AllEssentials"):
         # if platform.system().lower() == "windows":
         #     from machineconfig.jobs.python.python_windows_installers_all import get_cli_py_installers
         #     cli_installers = get_cli_py_installers()

machineconfig/jobs/python/checkout_version.py

@@ -4,7 +4,7 @@
 
 from crocodile.file_management import P, Save, randstr
 from crocodile.meta import Terminal
-from machineconfig.utils.ve import get_ve_profile, get_ve_specs, get_ve_install_script
+from machineconfig.utils.ve import get_ve_profile, get_ve_specs
 from machineconfig.scripts.python.repos import record_a_repo, install_repos
 import platform
 
@@ -12,12 +12,18 @@ import platform
 # TODO: add data requirements for added isolation of file system.
 
 
-def checkout_version(version: str, repo_root: P, exclude_editable: bool = False):
+def checkout_version(version: str, repo_root: P, exclude_editable: bool=False):
     """Checkout a version of the repo and install its requirements."""
     ve_name = get_ve_profile(init_path=repo_root)
     ve_path = P.home().joinpath("venvs", ve_name)
     ve_specs = get_ve_specs(ve_path)
-    py_version = ve_specs['version_major_minor']
+    try:
+        py_version = ve_specs['version']
+    except KeyError as err:
+        # print(f"❌ No python version found in {ve_specs}.")
+        # raise err
+        _ = err
+        py_version = ve_specs['version_info']
     sys = platform.system().lower()
 
     target_dir = repo_root.expanduser().absolute().joinpath(f"versions/{version}").as_posix()
@@ -33,24 +39,29 @@ def checkout_version(version: str, repo_root: P, exclude_editable: bool = False)
     checkout_ve = f"{repo_root.name}-{version}-prod" if not exclude_editable else ve_name
     checkout_ve = input(f"Name of the ve to create (default: {checkout_ve}): ") or checkout_ve
 
-    ve_template = get_ve_install_script(ve_name=checkout_ve, py_version=py_version, system="Windows", delete_if_exists=False, install_crocodile_and_machineconfig=False)
-    version_root_obj.joinpath("install_ve.ps1").write_text(ve_template)
-    ve_template = get_ve_install_script(ve_name=checkout_ve, py_version=py_version, system="Linux", delete_if_exists=False, install_crocodile_and_machineconfig=False)
-    version_root_obj.joinpath("install_ve.sh").write_text(ve_template)
+    install_env = f"""
 
-    install_requirements = f"""
+uv venv $HOME/venvs/{checkout_ve} --python {py_version} --python-preference only-managed
 . $HOME/scripts/activate_ve {ve_name}
-cd {version_root}
-pip install -r requirements_{sys}.txt
+
+uv pip install pip
+
 {install_editable_packages}
+
+cd {version_root}
+uv pip install -r requirements_{sys}.txt
+
 """
     if sys == "windows":
-        version_root_obj.joinpath("install_requirements.ps1").write_text(install_requirements)
-        if not version_root_obj.joinpath("install_requirements.sh").exists(): version_root_obj.joinpath("install_requirements.sh").write_text(install_requirements)
+        version_root_obj.joinpath("install_env.ps1").write_text(install_env)
+        if not version_root_obj.joinpath("install_env.sh").exists():
+            version_root_obj.joinpath("install_env.sh").write_text(install_env)
     elif sys == "linux":
-        version_root_obj.joinpath("install_requirements.sh").write_text(install_requirements)
-        if not version_root_obj.joinpath("install_requirements.ps1").exists(): version_root_obj.joinpath("install_requirements.ps1").write_text(install_requirements)
-    else: raise NotImplementedError(f"System {sys} not supported.")
+        version_root_obj.joinpath("install_env.sh").write_text(install_env)
+        if not version_root_obj.joinpath("install_env.ps1").exists():
+            version_root_obj.joinpath("install_env.ps1").write_text(install_env)
+    else:
+        raise NotImplementedError(f"System {sys} not supported.")
 
     pip_freeze_script = f"""
 cd '{target_dir}'
@@ -58,23 +69,6 @@ cd '{target_dir}'
 python -m pip freeze {'--exclude-editable' if exclude_editable else ''} > requirements_{sys}.txt
 """
     Terminal().run_script(pip_freeze_script, verbose=True, shell="default").print()
-
-    install_all_script = r"""
-#!/usr/bin/bash
-
-CUR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-. $CUR_DIR/install_ve.sh
-. $CUR_DIR/install_requirements.sh
-"""
-    version_root_obj.joinpath("install.sh").write_text(install_all_script)
-    install_all_script = r"""
-
-$CUR_DIR = Split-Path $MyInvocation.MyCommand.Path -Parent
-. $CUR_DIR/install_ve.ps1
-. $CUR_DIR/install_requirements.ps1
-
-"""
-    version_root_obj.joinpath("install.ps1").write_text(install_all_script)
     print(f"✅ Installed requirements for version {version}.")
 
 
@@ -97,6 +91,7 @@ def main():
 
 def get_editable_packages(ve_name: str):
     file = P.tmp().joinpath(f"tmp_files/editable_requirements_{randstr()}.txt")
+    file.parent.mkdir(parents=True, exist_ok=True)
     editable_packages_script = f"""
 . $HOME/scripts/activate_ve {ve_name}
 pip list --editable > {file}

machineconfig/jobs/python/create_bootable_media.py

@@ -1,6 +1,6 @@
 
 
-# 
+# try ventory or netboot.xyz
 
 # # one can either install rufus: https://rufus.ie/en/
 # # however, to create bootable media with multiple OSs to choose from:

machineconfig/jobs/python/python_cargo_build_share.py

@@ -8,7 +8,7 @@ from crocodile.file_management import P
 import platform
 
 
-def build_rust_executable(url: str = r"https://github.com/atanunq/viu"):
+def build_rust_executable(url: str=r"https://github.com/atanunq/viu"):
     tool_name = url.split('/')[-1]
 
     # move command is not required since tool will go to .cargo/bin which is in PATH by default.
@@ -35,7 +35,7 @@ cargo install --path .
         print(f"PermissionError, couldn't delete: {P.home().joinpath(tool_name)}")
 
     if platform.system() == "Windows":
-        exe = exe.move(folder=P.get_env().WindowsApps)
+        exe = exe.move(folder=P.get_env().WindowsPaths().WindowsApps)
     elif platform.system() == "Linux":
         Terminal().run(f"sudo mv {exe} /usr/local/bin")
         exe = P(r"/usr/local/bin").joinpath(exe.name)

machineconfig/jobs/python/tasks.py

@@ -1,4 +1,4 @@
 
-from machineconfig.scripts.python.devops_backup_retrieve import main
+from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
 
-program = main(direction="BACKUP", which="all")
+program = main_backup_retrieve(direction="BACKUP", which="all")

machineconfig/jobs/python_custom_installers/{helix.py → hx.py}

@@ -3,14 +3,14 @@
 Installers do not add runtime files to the machine, hence this script.
 """
 
-# from pathlib import Path
-from machineconfig.utils.installer import Installer, LINUX_INSTALL_PATH, WINDOWS_INSTALL_PATH
+from crocodile.file_management import P
+from machineconfig.utils.installer import Installer, WINDOWS_INSTALL_PATH
 from typing import Optional
 import platform
 
 
 config_dict = {
-        "repo_url": "https://github.com/helix-editor/helix",
+        "repo_url": "CUSTOM",
         "doc": "Helix is a post-modern modal text editor.",
         "filename_template_windows_amd_64": "helix-{}-x86_64-windows.zip",
         "filename_template_linux_amd_64": "helix-{}-x86_64-linux.tar.xz",
@@ -20,7 +20,9 @@ config_dict = {
 
 
 def main(version: Optional[str]):
-    inst = Installer.from_dict(d=config_dict, name="hx")
+    config_dict_copy = config_dict.copy()
+    config_dict_copy["repo_url"] = "https://github.com/helix-editor/helix"
+    inst = Installer.from_dict(d=config_dict_copy, name="hx")
     downloaded, _version_to_be_installed = inst.download(version=version)
     hx_file_search = downloaded.search("hx", folders=False, files=True, r=True)
     assert len(hx_file_search) == 1
@@ -29,14 +31,24 @@ def main(version: Optional[str]):
     runtime = contrib.parent / "runtime"
     assert runtime.exists()
     assert contrib.exists()
+    P.home().joinpath(".config/helix/runtime").delete(sure=True)
+    P.home().joinpath(".config/helix/contrib").delete(sure=True)
     if platform.system() == "Linux":
-        hx_file.move(folder=LINUX_INSTALL_PATH)
+        # hx_file.move(folder=LINUX_INSTALL_PATH)  # to be added later
         contrib.move(folder="~/.config/helix")
         runtime.move(folder="~/.config/helix")
     elif platform.system() == "Windows":
         hx_file.move(folder=WINDOWS_INSTALL_PATH)
         contrib.move(folder="~/.config/helix")
         runtime.move(folder="~/.config/helix")
+    else:
+        print("Unsupported OS")
+    downloaded.delete(sure=True)
+
+    if platform.system() == "Linux":
+        inst.install(version=version)  # because we can't normally move hx (without privliage) # hx_file.move(folder=LINUX_INSTALL_PATH)
+
+    return ""
 
 
 if __name__ == "__main__":

machineconfig/profile/create.py

@@ -6,15 +6,15 @@ This script Takes away all config files from the computer, place them in one dir
 """
 
 
-from crocodile.environment import system, UserName  # ProgramFiles, WindowsApps  # , exe
+from crocodile.environment import system  # ProgramFiles, WindowsApps  # , exe
 from crocodile.meta import Terminal
 from crocodile.file_management import P
-from machineconfig.utils.utils import symlink, LIBRARY_ROOT, REPO_ROOT, display_options
+from machineconfig.utils.utils import symlink_func, symlink_copy, LIBRARY_ROOT, REPO_ROOT, display_options
 from machineconfig.profile.shell import create_default_shell_profile
 # import os
 import subprocess
 from rich.console import Console
-from typing import Optional, Any
+from typing import Optional, Any, TypedDict
 
 
 ERROR_LIST: list[Any] = []  # append to this after every exception captured.
@@ -23,18 +23,16 @@ OTHER_SYSTEM = "windows" if system == "Linux" else "linux"
 SYSTEM = system.lower()
 
 
-# =================== SYMLINKS ====================================
-
-
-def symlink_contents(source_dir: P, target_dir: P, overwrite: bool = True):
-    for a_target in target_dir.expanduser().search("*"):
-        symlink(this=source_dir.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
+class SymlinkMapper(TypedDict):
+    this: str
+    to_this: str
+    contents: Optional[bool]
 
 
 def main_symlinks(choice: Optional[str] = None):
     symlink_mapper = LIBRARY_ROOT.joinpath("profile/mapper.toml").readit()
-    symlink_mapper['wsl_windows']['home']["to_this"] = symlink_mapper['wsl_windows']['home']["to_this"].replace("username", UserName)
-    symlink_mapper['wsl_linux']['home']["to_this"] = symlink_mapper['wsl_linux']['home']["to_this"].replace("username", UserName)
+    # symlink_mapper['wsl_windows']['home']["to_this"] = symlink_mapper['wsl_windows']['home']["to_this"].replace("username", UserName)
+    # symlink_mapper['wsl_linux']['home']["to_this"] = symlink_mapper['wsl_linux']['home']["to_this"].replace("username", UserName)
 
     overwrite = True
     exclude: list[str] = []  # "wsl_linux", "wsl_windows"
@@ -43,7 +41,6 @@ def main_symlinks(choice: Optional[str] = None):
     program_keys: list[str] = []
     for program_key in program_keys_raw:
         if program_key in exclude or OTHER_SYSTEM in program_key:
-            # print(f"Skipping {program_key} for {system}")
             continue
         else: program_keys.append(program_key)
 
@@ -56,13 +53,12 @@ def main_symlinks(choice: Optional[str] = None):
         # overwrite = display_options(msg="Overwrite existing source file?", options=["yes", "no"], default="yes") == "yes"
         from rich.prompt import Confirm
         overwrite = Confirm.ask("Overwrite existing source file?", default=True)
-
     else: choice_selected = choice
 
     if isinstance(choice_selected, str):
         if str(choice_selected) == "all" and system == "Windows" and not Terminal.is_user_admin():
             print("*" * 200)
-            raise RuntimeError(f"Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
+            raise RuntimeError("Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
         elif choice_selected == "all":
             print(f"{program_keys=}")
             pass  # i.e. program_keys = program_keys
@@ -74,17 +70,23 @@ def main_symlinks(choice: Optional[str] = None):
             this = P(file_map['this'])
             to_this = P(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
             if "contents" in file_map:
-                try: symlink_contents(source_dir=this, target_dir=to_this, overwrite=overwrite)
+                try:
+                    for a_target in to_this.expanduser().search("*"):
+                        symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
                 except Exception as ex: print("Config error: ", program_key, file_key, "missing keys 'this ==> to_this'.", ex)
+            if "copy" in file_map:
+                try:
+                    symlink_copy(this=this, to_this=to_this, prioritize_to_this=overwrite)
+                except Exception as ex: print("Config error: ", program_key, file_key, ex)
             else:
-                try: symlink(this=this, to_this=to_this, prioritize_to_this=overwrite)
+                try: symlink_func(this=this, to_this=to_this, prioritize_to_this=overwrite)
                 except Exception as ex: print("Config error: ", program_key, file_key, "missing keys 'this ==> to_this'.", ex)
 
             if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
                 try:
-                    subprocess.run(f"chmod 700 ~/.ssh/", check=True)
-                    subprocess.run(f"chmod 700 ~/dotfiles/creds/.ssh/", check=True)  # may require sudo
-                    subprocess.run(f"chmod 600 ~/dotfiles/creds/.ssh/*", check=True)
+                    subprocess.run("chmod 700 ~/.ssh/", check=True)
+                    subprocess.run("chmod 700 ~/dotfiles/creds/.ssh/", check=True)  # may require sudo
+                    subprocess.run("chmod 600 ~/dotfiles/creds/.ssh/*", check=True)
                 except Exception as e:
                     ERROR_LIST.append(e)
                     print("Caught error", e)
@@ -98,11 +100,11 @@ def main_symlinks(choice: Optional[str] = None):
 def main(choice: Optional[str] = None):
     console = Console()
     print("\n")
-    console.rule(f"CREATING SYMLINKS")
+    console.rule("CREATING SYMLINKS")
     main_symlinks(choice=choice)
 
     print("\n")
-    console.rule(f"CREATING SYMLINKS")
+    console.rule("CREATING SYMLINKS")
     create_default_shell_profile()
 
 

machineconfig/profile/create_hardlinks.py

@@ -0,0 +1,101 @@
+
+"""
+This script Takes away all config files from the computer, place them in one directory
+`dotfiles`, and create symlinks to those files from thier original locations.
+
+"""
+
+
+from crocodile.environment import system  # ProgramFiles, WindowsApps  # , exe
+from crocodile.meta import Terminal
+from crocodile.file_management import P
+from machineconfig.utils.utils import symlink_copy as symlink_func, LIBRARY_ROOT, REPO_ROOT, display_options
+from machineconfig.profile.shell import create_default_shell_profile
+# import os
+import subprocess
+from rich.console import Console
+from typing import Optional, Any
+
+
+ERROR_LIST: list[Any] = []  # append to this after every exception captured.
+CONFIG_ROOT = LIBRARY_ROOT.parent.parent.joinpath("settings")
+OTHER_SYSTEM = "windows" if system == "Linux" else "linux"
+SYSTEM = system.lower()
+
+
+def main_symlinks(choice: Optional[str] = None):
+    symlink_mapper = LIBRARY_ROOT.joinpath("profile/mapper.toml").readit()
+    # symlink_mapper['wsl_windows']['home']["to_this"] = symlink_mapper['wsl_windows']['home']["to_this"].replace("username", UserName)
+    # symlink_mapper['wsl_linux']['home']["to_this"] = symlink_mapper['wsl_linux']['home']["to_this"].replace("username", UserName)
+
+    overwrite = True
+    exclude: list[str] = []  # "wsl_linux", "wsl_windows"
+
+    program_keys_raw: list[str] = list(symlink_mapper.keys())
+    program_keys: list[str] = []
+    for program_key in program_keys_raw:
+        if program_key in exclude or OTHER_SYSTEM in program_key:
+            # print(f"Skipping {program_key} for {system}")
+            continue
+        else: program_keys.append(program_key)
+
+    program_keys.sort()
+    if choice is None:
+        choice_selected = display_options(msg="Which symlink to create?", options=program_keys + ["all", "none(EXIT)"], default="none(EXIT)", fzf=True, multi=True)
+        assert isinstance(choice_selected, list)
+        if len(choice_selected) == 1 and choice_selected[0] == "none(EXIT)": return  # terminate function.
+        elif len(choice_selected) == 1 and choice_selected[0] == "all": choice_selected = "all"  # i.e. program_keys = program_keys
+        # overwrite = display_options(msg="Overwrite existing source file?", options=["yes", "no"], default="yes") == "yes"
+        from rich.prompt import Confirm
+        overwrite = Confirm.ask("Overwrite existing source file?", default=True)
+
+    else: choice_selected = choice
+
+    if isinstance(choice_selected, str):
+        if choice_selected == "all":
+            print(f"{program_keys=}")
+            pass  # i.e. program_keys = program_keys
+        else: program_keys = [choice_selected]
+    else: program_keys = choice_selected
+
+    for program_key in program_keys:
+        for file_key, file_map in symlink_mapper[program_key].items():
+            this = P(file_map['this'])
+            to_this = P(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            if "contents" in file_map:
+                try:
+                    for a_target in to_this.expanduser().search("*"):
+                        symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
+                except Exception as ex: print("Config error: ", program_key, file_key, "missing keys 'this ==> to_this'.", ex)
+            else:
+                try: symlink_func(this=this, to_this=to_this, prioritize_to_this=overwrite)
+                except Exception as ex: print("Config error: ", program_key, file_key, "missing keys 'this ==> to_this'.", ex)
+
+            if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
+                try:
+                    subprocess.run("chmod 700 ~/.ssh/", check=True)
+                    subprocess.run("chmod 700 ~/dotfiles/creds/.ssh/", check=True)  # may require sudo
+                    subprocess.run("chmod 600 ~/dotfiles/creds/.ssh/*", check=True)
+                except Exception as e:
+                    ERROR_LIST.append(e)
+                    print("Caught error", e)
+
+    if system == "Linux": Terminal().run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R')
+    print("\n\n", "*" * 200)
+    if len(ERROR_LIST) > 0:
+        print("Errors caught: ", ERROR_LIST)
+
+
+def main(choice: Optional[str] = None):
+    console = Console()
+    print("\n")
+    console.rule("CREATING SYMLINKS")
+    main_symlinks(choice=choice)
+
+    print("\n")
+    console.rule("CREATING SYMLINKS")
+    create_default_shell_profile()
+
+
+if __name__ == '__main__':
+    pass

machineconfig/profile/shell.py

@@ -22,10 +22,10 @@ system = platform.system()
 def create_default_shell_profile():
     profile_path = get_shell_profile_path()
     profile = profile_path.read_text()
-    if system == "Windows": source = f". {LIBRARY_ROOT.joinpath('settings/shells/pwsh/init.ps1').collapseuser().str.replace('~', '$HOME')}"
-    else: source = f"source {LIBRARY_ROOT.joinpath('settings/shells/bash/init.sh').collapseuser().str.replace('~', '$HOME')}"
+    if system == "Windows": source = f". {LIBRARY_ROOT.joinpath('settings/shells/pwsh/init.ps1').collapseuser().to_str().replace('~', '$HOME')}"
+    else: source = f"source {LIBRARY_ROOT.joinpath('settings/shells/bash/init.sh').collapseuser().to_str().replace('~', '$HOME')}"
 
-    if source in profile: print(f"Skipping sourcing init script; already in profile")
+    if source in profile: print("Skipping sourcing init script; already in profile")
     else:
         profile += "\n" + source + "\n"
         if system == "Linux":
@@ -50,7 +50,7 @@ def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = No
     env_path = LIBRARY_ROOT.joinpath("profile/env_path.toml").readit()
     dirs = env_path[f'path_{system.lower()}']['extension']
 
-    print(f"Current PATH: ", "\n============")
+    print("Current PATH: ", "\n============")
     P.get_env().PATH.print()
 
     if choice is None:
@@ -62,7 +62,7 @@ def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = No
 
     addition = PathVar.append_temporarily(dirs=dirs)
     profile_path_obj = P(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
-    profile_path_obj.copy(name=profile_path_obj.name + f".orig_" + randstr())
+    profile_path_obj.copy(name=profile_path_obj.name + ".orig_" + randstr())
     profile_path_obj.modify_text(addition, addition, replace_line=False, notfound_append=True)
 
 

machineconfig/scripts/python/cloud_copy.py

@@ -1,8 +1,10 @@
 
-"""CC
+"""
+CC
 """
 
-from crocodile.file_management import P, Struct
+from crocodile.file_management import P
+from crocodile.core import Struct
 from crocodile.meta import RepeatUntilNoException
 import getpass
 from machineconfig.scripts.python.cloud_sync import parse_cloud_source_target, ArgsDefaults, Args
@@ -13,22 +15,20 @@ import os
 from typing import Optional
 
 
-@RepeatUntilNoException()
+@RepeatUntilNoException(retry=3, sleep=1)
 def get_securely_shared_file(url: Optional[str] = None, folder: Optional[str] = None) -> None:
     folder_obj = P.cwd() if folder is None else P(folder)
 
     if os.environ.get("DECRYPTION_PASSWORD") is not None:
-        pwd: str = str(os.environ.get("DECRYPTION_PASSWORD"))
+        pwd: str=str(os.environ.get("DECRYPTION_PASSWORD"))
     else:
         pwd = getpass.getpass(prompt="Enter decryption password: ")
-
     if url is None:
         if os.environ.get("SHARE_URL") is not None:
             url = os.environ.get("SHARE_URL")
             assert url is not None
         else:
             url = input("Enter share url: ")
-
     from rich.progress import Progress
     with Progress(transient=True) as progress:
         _task = progress.add_task("Downloading ... ", total=None)
@@ -63,23 +63,26 @@ def arg_parser() -> None:
 
     args = parser.parse_args()
     args_dict = vars(args)
-    source: str = args_dict.pop("source")
-    target: str = args_dict.pop("target")
+    source: str=args_dict.pop("source")
+    target: str=args_dict.pop("target")
     args_obj = Args(**args_dict)
-    Struct(args_obj.__dict__).print(as_config=True, title=f"CLI config")
+    Struct(args_obj.__dict__).print(as_config=True, title="CLI config")
 
-    if args_obj.config == "ss" and (source.startswith("http") or source.startswith("bit.ly")): return get_securely_shared_file(url=source, folder=target)
-    if args_obj.rel2home is True and args_obj.root is None: args_obj.root = "myhome"
+    if args_obj.config == "ss" and (source.startswith("http") or source.startswith("bit.ly")):
+        return get_securely_shared_file(url=source, folder=target)
+    if args_obj.rel2home is True and args_obj.root is None:
+        args_obj.root = "myhome"
 
+    # print(f"source: {source}")
     cloud, source, target = parse_cloud_source_target(args=args_obj, source=source, target=target)
 
-    assert args_obj.key is None, f"Key is not supported yet."
+    assert args_obj.key is None, "Key is not supported yet."
     if cloud in source:
         P(target).from_cloud(cloud=cloud, remotepath=source.replace(cloud + ":", ""),
-                                unzip=args_obj.zip, decrypt=args_obj.encrypt, pwd=args_obj.pwd,
-                                overwrite=args_obj.overwrite,
-                                rel2home=args_obj.rel2home, os_specific=args_obj.os_specific, root=args_obj.root, strict=False,
-                                )
+                            unzip=args_obj.zip, decrypt=args_obj.encrypt, pwd=args_obj.pwd,
+                            overwrite=args_obj.overwrite,
+                            rel2home=args_obj.rel2home, os_specific=args_obj.os_specific, root=args_obj.root, strict=False,
+                            )
     elif cloud in target:
         res = P(source).to_cloud(cloud=cloud, remotepath=target.replace(cloud + ":", ""),
                                     zip=args_obj.zip, encrypt=args_obj.encrypt, pwd=args_obj.pwd,