machineconfig 1.94__py3-none-any.whl → 1.96__py3-none-any.whl

machineconfig/scripts/python/cloud_mount.py

@@ -3,28 +3,32 @@
 
 
 from machineconfig.utils.utils import PROGRAM_PATH, choose_one_option
-from crocodile.file_management import P, Read
+from machineconfig.utils.utils2 import read_ini
+from machineconfig.utils.path_reduced import P as PathExtended
 
 import platform
 import argparse
 from typing import Optional
+from rich.console import Console
+from rich.panel import Panel
+
+console = Console()
 
 
 DEFAULT_MOUNT = "~/data/rclone"
 
 
 def get_rclone_config():
-    if platform.system() == "Windows": config = Read.ini(P.home().joinpath("AppData/Roaming/rclone/rclone.conf"))
-    elif platform.system() == "Linux": config = Read.ini(P.home().joinpath(".config/rclone/rclone.conf"))
+    if platform.system() == "Windows": config = read_ini(PathExtended.home().joinpath("AppData/Roaming/rclone/rclone.conf"))
+    elif platform.system() in ["Linux", "Darwin"]: config = read_ini(PathExtended.home().joinpath(".config/rclone/rclone.conf"))
     else: raise ValueError("unsupported platform")
     return config
 
 
 def get_mprocs_mount_txt(cloud: str, rclone_cmd: str, cloud_brand: str):  # cloud_brand = config[cloud]["type"]
-    # config = Read.ini(P.home().joinpath(".config/rclone/rclone.conf"))
     header = f"{' ' + cloud + ' | ' + cloud_brand + ' '}".center(50, "=")
     if platform.system() == "Windows":
-        sub_text_path = P.tmpfile(suffix=".ps1").write_text(f"""
+        sub_text_path = PathExtended.tmpfile(suffix=".ps1").write_text(f"""
 echo "{header}"
 iex 'rclone about {cloud}:'
 echo 'See {DEFAULT_MOUNT}/{cloud} for the mounted cloud'
@@ -42,11 +46,9 @@ mprocs "echo 'see {DEFAULT_MOUNT}/{cloud} for the mounted cloud'; rclone about {
 
 
 def mount(cloud: Optional[str], network: Optional[str], destination: Optional[str]) -> None:
-    print(f"""
-╔{'═' * 70}╗
-║ ☁️  Cloud Mount Utility                                                   ║
-╚{'═' * 70}╝
-""")
+    # draw header box dynamically
+    title = "☁️  Cloud Mount Utility"
+    console.print(Panel(title, title_align="left", border_style="blue"))
     
     config = get_rclone_config()
     if cloud is None:
@@ -57,30 +59,25 @@ def mount(cloud: Optional[str], network: Optional[str], destination: Optional[st
 
     if network is None:
         if destination is None:
-            mount_loc = P(DEFAULT_MOUNT).expanduser().joinpath(cloud)
+            mount_loc = PathExtended(DEFAULT_MOUNT).expanduser().joinpath(cloud)
         else:
-            mount_loc = P(destination)
+            mount_loc = PathExtended(destination)
         
-        print(f"""
-╭{'─' * 70}╮
-│ 📂 Mount location: {mount_loc}                          │
-╰{'─' * 70}╯
-""")
+        mount_info = f"📂 Mount location: {mount_loc}"
+        console.print(Panel(mount_info, border_style="blue"))
 
         if platform.system() == "Windows":
             print("🪟 Creating mount directory on Windows...")
-            mount_loc.parent.create()
-        elif platform.system() == "Linux":
-            print("🐧 Creating mount directory on Linux...")
-            try: mount_loc.create()
+            mount_loc.parent.mkdir(parents=True, exist_ok=True)
+        elif platform.system() in ["Linux", "Darwin"]:
+            system_name = "Linux" if platform.system() == "Linux" else "macOS"
+            print(f"🐧 Creating mount directory on {system_name}...")
+            try: mount_loc.mkdir(parents=True, exist_ok=True)
             except (FileExistsError, OSError) as err:
                 # We need a umount command here.
-                print(f"""
-╭{'─' * 70}╮
-│ ⚠️  WARNING: Mount directory issue                                        │
-│    {err}                                                           
-╰{'─' * 70}╯
-""")
+                warning_line = "⚠️  WARNING: Mount directory issue"
+                err_line = f"{err}"
+                console.print(Panel(f"{warning_line}\n{err_line}", title="Warning", border_style="yellow"))
                 pass
         else: raise ValueError("unsupported platform")
 
@@ -90,12 +87,7 @@ def mount(cloud: Optional[str], network: Optional[str], destination: Optional[st
     else: raise ValueError("network mount only supported on windows")
 
     mount_cmd = f"rclone mount {cloud}: {mount_loc} --vfs-cache-mode full --file-perms=0777"
-    print(f"""
-╭{'─' * 70}╮
-│ 🚀 Preparing mount command:                                              │
-│ {mount_cmd}
-╰{'─' * 70}╯
-""")
+    console.print(Panel(f"🚀 Preparing mount command:\n{mount_cmd}", border_style="blue"))
 
     # txt = get_mprocs_mount_txt(cloud, mount_cmd)
     if platform.system() == "Windows":
@@ -103,7 +95,7 @@ def mount(cloud: Optional[str], network: Optional[str], destination: Optional[st
         txt = f"""
 wt --window 0 --profile "Windows PowerShell" --startingDirectory "$HOME/data/rclone" `; split-pane --horizontal  --profile "Command Prompt" --size 0.2 powershell -Command "{mount_cmd}" `; split-pane --vertical --profile "Windows PowerShell" --size 0.2 powershell -NoExit -Command "rclone about {cloud}:"  `; move-focus up
 """
-    elif platform.system() == "Linux": txt = f"""
+    elif platform.system() in ["Linux", "Darwin"]: txt = f"""
 
 ZJ_SESSIONS=$(zellij list-sessions)
 
@@ -126,6 +118,8 @@ sleep 0.1; zellij action resize decrease up
 sleep 0.1; zellij action resize decrease up
 sleep 0.1; zellij action resize decrease up
 sleep 0.1; zellij action resize decrease up
+sleep 0.1; zellij action resize decrease up
+sleep 0.1; zellij action resize decrease up
 zellij run --direction right --name about -- rclone about {cloud}:
 zellij action move-focus up
 # zellij action write-chars "cd $HOME/data/rclone/{cloud}; sleep 0.1; ls"
@@ -137,27 +131,23 @@ zellij action move-focus up
     else: raise ValueError("unsupported platform")
     # print(f"running command: \n{txt}")
     PROGRAM_PATH.write_text(txt)
-    print(f"""
-╔{'═' * 70}╗
-║ ✅ Cloud mount command prepared successfully                              ║
-║ 🔄 Running mount process...                                              ║
-╚{'═' * 70}╝
-""")
+    # draw success box dynamically
+    title1 = "✅ Cloud mount command prepared successfully"
+    title2 = "🔄 Running mount process..."
+    console.print(Panel(f"{title1}\n{title2}", title="Success", border_style="green"))
 
 
 def main():
-    print(f"""
-╔{'═' * 70}╗
-║ ☁️  RCLONE CLOUD MOUNT                                                    ║
-╚{'═' * 70}╝
-""")
+    # draw main title box dynamically
+    main_title = "☁️  RCLONE CLOUD MOUNT"
+    console.print(Panel(main_title, title_align="left", border_style="blue"))
     
     parser = argparse.ArgumentParser(description='mount cloud')
     parser.add_argument('cloud', nargs='?', type=str, default=None, help='cloud to mount')
     parser.add_argument('destination', nargs='?', type=str, default=None, help='destination to mount')
     parser.add_argument('--network', type=str, default=None, help='mount network drive')
     args = parser.parse_args()
-    mount(cloud=args.clEoud, network=args.network, destination=args.destination)
+    mount(cloud=args.cloud, network=args.network, destination=args.destination)
 
 
 if __name__ == '__main__':

machineconfig/scripts/python/cloud_repo_sync.py

@@ -1,15 +1,21 @@
 """utils"""
 
 import git
-from crocodile.file_management import P, Read
+from machineconfig.utils.path_reduced import P as PathExtended
 from crocodile.meta import Terminal
-from crocodile.core import randstr
+from machineconfig.utils.utils2 import randstr, read_ini
 
 from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
-from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, get_shell_file_executing_python_script, write_shell_script_to_file, choose_one_option
+from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, choose_one_option
+from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
 import platform
 import argparse
 from typing import Optional, Literal
+from rich.console import Console
+from rich.panel import Panel
+# from rich.text import Text
+
+console = Console()
 
 _ = fetch_dotfiles
 
@@ -19,74 +25,43 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
          pwd: Optional[str] = None):
     if cloud is None:
         try:
-            cloud_resolved = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
-            print(f"""
-╭{'─' * 70}╮
-│ ⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}     │
-╰{'─' * 70}╯
-""")
+            cloud_resolved = read_ini(DEFAULTS_PATH)['general']['rclone_config_name']
+            console.print(Panel(f"⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}", title="Default Cloud", border_style="yellow"))
         except FileNotFoundError:
-            print(f"""
-╔{'═' * 70}╗
-║ ❌ ERROR: No cloud profile found                                          ║
-╠{'═' * 70}╣
-║ Location: {DEFAULTS_PATH}                        
-║ Please set one up or provide one via the --cloud flag.                   ║
-╚{'═' * 70}╝
-""")
+            console.print(Panel(f"❌ ERROR: No cloud profile found\nLocation: {DEFAULTS_PATH}\nPlease set one up or provide one via the --cloud flag.", title="Error", border_style="red"))
             return ""
     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_root = PathExtended(args.repo).expanduser().absolute()
+    repo_local_root = PathExtended.cwd() if path is None else PathExtended(path).expanduser().absolute()
     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_local_root = PathExtended(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").mkdir(parents=True, exist_ok=True)
     repo_remote_root = CONFIG_PATH.joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
     
     try:
-        print(f"""
-╔{'═' * 70}╗
-║ 📥 DOWNLOADING REMOTE REPOSITORY                                          ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("📥 DOWNLOADING REMOTE REPOSITORY", title_align="left", border_style="blue"))
         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(f"""
-╔{'═' * 70}╗
-║ 🆕 Remote repository doesn't exist                                        ║
-║ 📤 Creating new remote and exiting...                                     ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("🆕 Remote repository doesn't exist\n📤 Creating new remote and exiting...", title_align="left", border_style="green"))
         repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
         return ""
         
     repo_remote_obj = git.Repo(repo_remote_root)
     if repo_remote_obj.is_dirty():
-        print(f"""
-╔{'═' * 70}╗
-║ ⚠️  WARNING: REMOTE REPOSITORY IS DIRTY                                    ║
-╠{'═' * 70}╣
-║ Location: {repo_remote_root}               
-║ Please commit or stash changes before proceeding.                        ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel(f"⚠️  WARNING: REMOTE REPOSITORY IS DIRTY\nLocation: {repo_remote_root}\nPlease commit or stash changes before proceeding.", title="Warning", border_style="yellow"))
 
     script = f"""
 echo ""
-echo "╔{'═' * 70}╗"
-echo "║ 💾 COMMITTING LOCAL CHANGES                                               ║"
-echo "╚{'═' * 70}╝"
+echo 'echo -e "\\033[1;34m═════ COMMITTING LOCAL CHANGES ═════\\033[0m"'
 cd {repo_local_root}
 git status
 git add .
 git commit -am "{message}"
 echo ""
 echo ""
-echo "╔{'═' * 70}╗"
-echo "║ 🔄 PULLING LATEST FROM REMOTE                                             ║"
-echo "╚{'═' * 70}╝"
+echo 'echo -e "\\033[1;34m═════ PULLING LATEST FROM REMOTE ═════\\033[0m"'
 cd {repo_local_root}
 echo '-> Trying to removing originEnc remote from local repo if it exists.'
 # git remote remove originEnc
@@ -102,33 +77,20 @@ git pull originEnc master
     res = Terminal().run(f". {shell_path}", shell="powershell").capture().print()
 
     if res.is_successful(strict_err=True, strict_returcode=True):
-        print(f"""
-╔{'═' * 70}╗
-║ ✅ Pull succeeded!                                                        ║
-╠{'═' * 70}╣
-║ 🧹 Removing originEnc remote and local copy                               ║
-║ 📤 Pushing merged repository to cloud storage                             ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("✅ Pull succeeded!\n🧹 Removing originEnc remote and local copy\n📤 Pushing merged repository to cloud storage", title="Success", border_style="green"))
         repo_remote_root.delete(sure=True)
         from git.remote import Remote
         Remote.remove(repo_local_obj, "originEnc")
         repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
+        return "success"
     else:
-        print(f"""
-╔{'═' * 70}╗
-║ ⚠️  MERGE FAILED                                                          ║
-╠{'═' * 70}╣
-║ 💾 Keeping local copy of remote at:                                       ║
-║ 📂 {repo_remote_root}                    
-╚{'═' * 70}╝
-""")
+        console.print(Panel(f"⚠️  MERGE FAILED\n💾 Keeping local copy of remote at:\n📂 {repo_remote_root}", title="Merge Failed", border_style="red"))
 
         # ================================================================================
         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.to_str()}', local_repo=r'{repo_local_root.to_str()}', cloud=r'{cloud_resolved}')
+from machineconfig.scripts.python.helpers.repo_sync_helpers import delete_remote_repo_copy_and_push_local as func
+func(remote_repo=r'{str(repo_remote_root)}', local_repo=r'{str(repo_local_root)}', cloud=r'{cloud_resolved}')
 """
         shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_name="ve")
         # ================================================================================
@@ -138,7 +100,7 @@ func(remote_repo=r'{repo_remote_root.to_str()}', local_repo=r'{repo_local_root.t
 rm -rfd {repo_local_root}
 mv {repo_remote_root} {repo_local_root}
 """
-        if platform.system() == "Linux": program_2 += """
+        if platform.system() in ["Linux", "Darwin"]: program_2 += """
 sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
@@ -149,8 +111,8 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
         # ================================================================================
         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()}')
+from machineconfig.scripts.python.helper.repo_sync_helpers import inspect_repos as func
+func(repo_local_root=r'{str(repo_local_root)}', repo_remote_root=r'{str(repo_remote_root)}')
 """
         shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_name="ve")
         # ================================================================================
@@ -166,13 +128,7 @@ git commit -am "finished merging"
         shell_file_4 = write_shell_script_to_file(shell_script=program_4)
         # ================================================================================
 
-        print(f"""
-╔{'═' * 70}╗
-║ 🔄 RESOLVE MERGE CONFLICT                                                 ║
-╠{'═' * 70}╣
-║ Choose an option to resolve the conflict:                                ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("🔄 RESOLVE MERGE CONFLICT\nChoose an option to resolve the conflict:", title_align="left", border_style="blue"))
         
         print(f"• 1️⃣  {option1:75} 👉 {shell_file_1}")
         print(f"• 2️⃣  {option2:75} 👉 {shell_file_2}")
@@ -192,15 +148,13 @@ git commit -am "finished merging"
             case "overwriteLocal": program_content = program_2
             case "InspectRepos": program_content = shell_file_3.read_text()
             case "RemoveLocalRclone": program_content = program_4
+            case _: 
+                raise ValueError(f"Unknown action: {action}")
         PROGRAM_PATH.write_text(program_content)
     return program_content
 
 def args_parser():
-    print(f"""
-╔{'═' * 70}╗
-║ 🔄 Repository Synchronization Utility                                     ║
-╚{'═' * 70}╝
-""")
+    console.print(Panel("🔄 Repository Synchronization Utility", title_align="left", border_style="blue"))
 
     parser = argparse.ArgumentParser(description="Secure Repo CLI.")
     # parser.add_argument("cmd", help="command to run", choices=["pull", "push"])

machineconfig/scripts/python/cloud_sync.py

@@ -7,39 +7,35 @@ from machineconfig.scripts.python.helpers.cloud_helpers import Args
 from machineconfig.scripts.python.cloud_mount import get_mprocs_mount_txt
 from machineconfig.utils.utils import PROGRAM_PATH
 import argparse
+from rich.console import Console
+from rich.panel import Panel
+
+console = Console()
 
 
 def args_parser():
-    print(f"""
-╔{'═' * 70}╗
-║ ☁️  Cloud Sync Utility                                                    ║
-╚{'═' * 70}╝
-""")
-    
+    title = "☁️  Cloud Sync Utility"
+    console.print(Panel(title, title_align="left", border_style="blue"))
     parser = argparse.ArgumentParser(description="""A wrapper for rclone sync and rclone bisync, with some extra features.""")
-
     parser.add_argument("source", help="source", default=None)
     parser.add_argument("target", help="target", default=None)
-
     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("--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
-
     parser.add_argument("--bisync", "-b", help="Bidirectional sync.", action="store_true")  # default is False
     parser.add_argument("--delete", "-D", help="Delete files in remote that are not in local.", action="store_true")  # default is False
     parser.add_argument("--verbose", "-v", help="Verbosity of mprocs to show details of syncing.", action="store_true")  # default is False
 
     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)
 
@@ -49,42 +45,36 @@ def args_parser():
     cloud, source, target = parse_cloud_source_target(args=args_obj, source=source, target=target)
     # map short flags to long flags (-u -> --upload), for easier use in the script
     if bisync:
-        print(f"""
-╔{'═' * 70}╗
-║ 🔄 BI-DIRECTIONAL SYNC                                                    ║
-╠{'═' * 70}╣
-║ Source: {source}                       
-║ Target: {target}                       
-╚{'═' * 70}╝
-""")
+        title = "🔄 BI-DIRECTIONAL SYNC"
+        source_line = f"Source: {source}"
+        target_line = f"Target: {target}"
+        console.print(Panel(f"{source_line}\n{target_line}", title=title, border_style="blue"))
         rclone_cmd = f"""rclone bisync '{source}' '{target}' --resync"""
     else:
-        print(f"""
-╔{'═' * 70}╗
-║ 📤 ONE-WAY SYNC                                                           ║
-╠{'═' * 70}╣
-║ Source: {source}                       
-║ ↓                                                                        ║
-║ Target: {target}                       
-╚{'═' * 70}╝
-""")
-        rclone_cmd = f"""rclone sync '{source}' '{target}' """
+        title = "📤 ONE-WAY SYNC"
+        source_line = f"Source: {source}"
+        arrow_line = "↓"
+        target_line = f"Target: {target}"
+        console.print(Panel(f"{source_line}\n{arrow_line}\n{target_line}", title=title, border_style="blue"))
+        if delete:
+            rclone_cmd = f"rclone sync -P \"{source}\" \"{target}\" --delete-during --transfers={transfers}"
+        else:
+            rclone_cmd = f"rclone sync -P \"{source}\" \"{target}\" --transfers={transfers}"
 
     rclone_cmd += f" --progress --transfers={transfers} --verbose"
     # rclone_cmd += f"  --vfs-cache-mode full"
-    if delete: rclone_cmd += " --delete-during"
+    if delete:
+        rclone_cmd += " --delete-during"
+
+    if verbose:
+        txt = get_mprocs_mount_txt(cloud=cloud, rclone_cmd=rclone_cmd, cloud_brand="Unknown")
+    else:
+        txt = f"""{rclone_cmd}"""
+
+    title = "🚀 EXECUTING COMMAND"
+    cmd_line = f"{rclone_cmd[:65]}..."
+    console.print(Panel(f"{title}\n{cmd_line}", title="[bold blue]Command[/bold blue]", expand=False))
 
-    if verbose: txt = get_mprocs_mount_txt(cloud=cloud, rclone_cmd=rclone_cmd, cloud_brand="Unknown")
-    else: txt = f"""{rclone_cmd}"""
-    
-    print(f"""
-╔{'═' * 70}╗
-║ 🚀 EXECUTING COMMAND                                                      ║
-╠{'═' * 70}╣
-║ {rclone_cmd[:65]}... ║
-╚{'═' * 70}╝
-""")
-    
     PROGRAM_PATH.write_text(txt)