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

machineconfig/utils/{utils_links.py → links.py}

@@ -1,14 +1,19 @@
-from crocodile.file_management import P, PLike
-from crocodile.core_modules.core_1 import randstr
+from machineconfig.utils.path_reduced import P as PathExtended, PLike
+from machineconfig.utils.utils2 import randstr
+from rich.console import Console
+from rich.panel import Panel
+
+
+console = Console()
 
 
 def build_links(target_paths: list[tuple[PLike, str]], repo_root: PLike):
     """Build symboic links from various relevant paths (e.g. data) to `repo_root/links/<name>` to facilitate easy access from
     tree explorer of the IDE.
     """
-    target_dirs_filtered: list[tuple[P, str]] = []
+    target_dirs_filtered: list[tuple[PathExtended, str]] = []
     for a_dir, a_name in target_paths:
-        a_dir_obj = P(a_dir).resolve()
+        a_dir_obj = PathExtended(a_dir).resolve()
         if not a_dir_obj.exists():
             a_dir_obj.mkdir(parents=True, exist_ok=True)
         target_dirs_filtered.append((a_dir_obj, a_name))
@@ -17,8 +22,8 @@ def build_links(target_paths: list[tuple[PLike, str]], repo_root: PLike):
     repo = git.Repo(repo_root, search_parent_directories=True)
     root_maybe = repo.working_tree_dir
     assert root_maybe is not None
-    repo_root_obj = P(root_maybe)
-    tmp_results_root = P.home().joinpath("tmp_results", "tmp_data", repo_root_obj.name)
+    repo_root_obj = PathExtended(root_maybe)
+    tmp_results_root = PathExtended.home().joinpath("tmp_results", "tmp_data", repo_root_obj.name)
     tmp_results_root.mkdir(parents=True, exist_ok=True)
     target_dirs_filtered.append((tmp_results_root, "tmp_results"))
 
@@ -26,14 +31,14 @@ def build_links(target_paths: list[tuple[PLike, str]], repo_root: PLike):
         links_path = repo_root_obj.joinpath("links", a_name)
         links_path.symlink_to(target=a_target_path)
 
-def symlink_func(this: P, to_this: P, prioritize_to_this: bool=True):
+def symlink_func(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool=True):
     """helper function. creates a symlink from `this` to `to_this`.
     What can go wrong?
     depending on this and to_this existence, one will be prioretized depending on overwrite value.
     True means this will potentially be overwritten (depending on whether to_this exists or not)
     False means to_this will potentially be overwittten."""
-    this = P(this).expanduser().absolute()
-    to_this = P(to_this).expanduser().absolute()
+    this = PathExtended(this).expanduser().absolute()
+    to_this = PathExtended(to_this).expanduser().absolute()
     if this.is_symlink(): this.delete(sure=True)  # delete if it exists as symblic link, not a concrete path.
     if this.exists():  # this is a problem. It will be resolved via `overwrite`
         if prioritize_to_this is True:  # it *can* be deleted, but let's look at target first.
@@ -44,24 +49,18 @@ def symlink_func(this: P, to_this: P, prioritize_to_this: bool=True):
             if to_this.exists(): this.move(path=to_this, overwrite=True)  # this exists, to_this as well, this is prioritized.   # now we are readly to make the link
             else: this.move(path=to_this)  # this exists, to_this doesn't, this is prioritized.
     else:  # this doesn't exist.
-        if not to_this.exists(): to_this.touch()  # we have to touch it (file) or create it (folder)
+        if not to_this.exists():
+            to_this.parent.mkdir(parents=True, exist_ok=True)
+            to_this.touch()  # we have to touch it (file) or create it (folder)
     try:
-        print(f"""
-{'=' * 60}
-🔗 LINKING | Creating symlink from {this} ➡️  {to_this}
-{'=' * 60}
-""")
-        P(this).symlink_to(target=to_this, verbose=True, overwrite=True)
+        console.print(Panel(f"🔗 LINKING | Creating symlink from {this} ➡️  {to_this}", title="Linking", expand=False))
+        PathExtended(this).symlink_to(target=to_this, verbose=True, overwrite=True)
     except Exception as ex:
-        print(f"""
-❌ ERROR | Failed at linking {this} ➡️  {to_this}.
-Reason: {ex}
-{'=' * 60}
-""")
+        console.print(Panel(f"❌ ERROR | Failed at linking {this} ➡️  {to_this}. Reason: {ex}", title="Error", expand=False))
 
-def symlink_copy(this: P, to_this: P, prioritize_to_this: bool=True):
-    this = P(this).expanduser().absolute()
-    to_this = P(to_this).expanduser().absolute()
+def symlink_copy(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool=True):
+    this = PathExtended(this).expanduser().absolute()
+    to_this = PathExtended(to_this).expanduser().absolute()
     if this.is_symlink(): this.delete(sure=True)  # delete if it exists as symblic link, not a concrete path.
     if this.exists():  # this is a problem. It will be resolved via `overwrite`
         if prioritize_to_this is True:  # it *can* be deleted, but let's look at target first.
@@ -72,17 +71,11 @@ def symlink_copy(this: P, to_this: P, prioritize_to_this: bool=True):
             if to_this.exists(): this.move(path=to_this, overwrite=True)  # this exists, to_this as well, this is prioritized.   # now we are readly to make the link
             else: this.move(path=to_this)  # this exists, to_this doesn't, this is prioritized.
     else:  # this doesn't exist.
-        if not to_this.exists(): to_this.touch()  # we have to touch it (file) or create it (folder)
+        if not to_this.exists():
+            to_this.parent.mkdir(parents=True, exist_ok=True)
+            to_this.touch()  # we have to touch it (file) or create it (folder)
     try:
-        print(f"""
-{'=' * 60}
-📋 COPYING | Copying {to_this} to {this}
-{'=' * 60}
-""")
+        console.print(Panel(f"📋 COPYING | Copying {to_this} to {this}", title="Copying", expand=False))
         to_this.copy(path=this, overwrite=True, verbose=True)
     except Exception as ex:
-        print(f"""
-❌ ERROR | Failed at copying {to_this} to {this}.
-Reason: {ex}
-{'=' * 60}
-""")
+        console.print(Panel(f"❌ ERROR | Failed at copying {to_this} to {this}. Reason: {ex}", title="Error", expand=False))

machineconfig/utils/{utils_options.py → options.py}

@@ -1,8 +1,5 @@
-from crocodile.core import List as L
 from crocodile.meta import Terminal
-from crocodile.file_management import P
-
-# import crocodile.environment as env
+from pathlib import Path
 from rich.text import Text
 from rich.panel import Panel
 from rich.console import Console
@@ -15,12 +12,11 @@ T = TypeVar("T")
 
 
 def check_tool_exists(tool_name: str, install_script: Optional[str] = None) -> bool:
-    """This is the CLI equivalent of `install_n_import` function of crocodile. """
     if platform.system() == "Windows":
         tool_name = tool_name.replace(".exe", "") + ".exe"
 
     if platform.system() == "Windows": cmd = "where.exe"
-    elif platform.system() == "Linux": cmd = "which"
+    elif platform.system() in ["Linux", "Darwin"]: cmd = "which"
     else: raise NotImplementedError(f"platform {platform.system()} not implemented")
 
     try:
@@ -29,11 +25,8 @@ def check_tool_exists(tool_name: str, install_script: Optional[str] = None) -> b
     except (subprocess.CalledProcessError, FileNotFoundError):
         res = False
     if res is False and install_script is not None:
-        print(f"""
-{'=' * 60}
-📥 INSTALLING TOOL | Installing {tool_name}...
-{'=' * 60}
-""")
+        console = Console()
+        console.print(Panel(f"📥 INSTALLING TOOL | Installing {tool_name}...", border_style="bold blue", expand=False))
         Terminal().run(install_script, shell="powershell").print()
         return check_tool_exists(tool_name=tool_name, install_script=None)
     return res
@@ -63,6 +56,7 @@ def display_options(msg: str, options: Iterable[T], header: str="", tail: str=""
     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):
         from pyfzf.pyfzf import FzfPrompt
         fzf_prompt = FzfPrompt()
@@ -81,7 +75,6 @@ def display_options(msg: str, options: Iterable[T], header: str="", tail: str=""
         choice_idx_s = [options_strings.index(x) for x in choice_string_multi]
         return [list(options)[x] for x in choice_idx_s]
     else:
-        console = Console()
         if default is not None:
             assert default in options, f"Default `{default}` option not in options `{list(options)}`"
             default_msg = Text(" <<<<-------- DEFAULT", style="bold red")
@@ -99,7 +92,7 @@ def display_options(msg: str, options: Iterable[T], header: str="", tail: str=""
 
         if choice_string == "":
             if default_string is None:
-                print("🧨 Default option not available!")
+                console.print(Panel("🧨 Default option not available!", title="Error", expand=False))
                 return display_options(msg=msg, options=options, header=header, tail=tail, prompt=prompt, default=default, fzf=fzf, multi=multi, custom_input=custom_input)
             choice_idx = options_strings.index(default_string)
             assert default is not None, "🧨 Default option not available!"
@@ -116,7 +109,7 @@ def display_options(msg: str, options: Iterable[T], header: str="", tail: str=""
                 else:
                     _ = ie
                     # raise ValueError(f"Unknown choice. {choice_string}") from ie
-                    print(f"❓ Unknown choice: '{choice_string}'")
+                    console.print(Panel(f"❓ Unknown choice: '{choice_string}'", title="Error", expand=False))
                     return display_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.
                 if choice_string in options_strings:  # string input
@@ -127,37 +120,30 @@ def display_options(msg: str, options: Iterable[T], header: str="", tail: str=""
                 else:
                     _ = te
                     # raise ValueError(f"Unknown choice. {choice_string}") from te
-                    print(f"❓ Unknown choice: '{choice_string}'")
+                    console.print(Panel(f"❓ Unknown choice: '{choice_string}'", title="Error", expand=False))
                     return display_options(msg=msg, options=options, header=header, tail=tail, prompt=prompt, default=default, fzf=fzf, multi=multi, custom_input=custom_input)
-        print(f"✅ Selected option {choice_idx}: {choice_one}")
+        console.print(Panel(f"✅ Selected option {choice_idx}: {choice_one}", title="Selected", expand=False))
         if multi: return [choice_one]
     return choice_one
 
 
 def choose_cloud_interactively() -> str:
-    print(f"""
-{'=' * 60}
-🔍 LISTING CLOUD REMOTES | Fetching available cloud remotes...
-{'=' * 60}
-""")
+    console = Console()
+    console.print(Panel("🔍 LISTING CLOUD REMOTES | Fetching available cloud remotes...", border_style="bold blue", expand=False))
     tmp = Terminal().run("rclone listremotes").op_if_successfull_or_default(strict_returcode=False)
-    # consider this: remotes = Read.ini(P.home().joinpath(".config/rclone/rclone.conf")).sections()
     if isinstance(tmp, str):
-        remotes: list[str] = L(tmp.splitlines()).apply(lambda x: x.replace(":", "")).list
+        remotes: list[str] = [x.replace(":", "") for x in tmp.splitlines()]
 
     else: raise ValueError(f"Got {tmp} from rclone listremotes")
     if len(remotes) == 0:
         raise RuntimeError("You don't have remotes. Configure your rclone first to get cloud services access.")
     cloud: str = choose_one_option(msg="WHICH CLOUD?", options=list(remotes), default=remotes[0], fzf=True)
-    print(f"""
-✅ SELECTED CLOUD | {cloud}
-{'=' * 60}
-""")
+    console.print(Panel(f"✅ SELECTED CLOUD | {cloud}", border_style="bold blue", expand=False))
     return cloud
 
 def get_ssh_hosts() -> list[str]:
     from paramiko import SSHConfig
     c = SSHConfig()
-    c.parse(open(P.home().joinpath(".ssh/config").to_str(), encoding="utf-8"))
+    c.parse(open(Path.home().joinpath(".ssh/config"), encoding="utf-8"))
     return list(c.get_hostnames())
 def choose_ssh_host(multi: bool=True): return display_options(msg="", options=get_ssh_hosts(), multi=multi, fzf=True)

machineconfig/utils/path.py

@@ -0,0 +1,112 @@
+from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.options import choose_one_option
+from rich.console import Console
+from rich.panel import Panel
+import platform
+import subprocess
+from typing import TypeVar
+from pathlib import Path
+
+
+T = TypeVar("T")
+console = Console()
+
+def sanitize_path(a_path: PathExtended) -> PathExtended:
+    path = PathExtended(a_path)
+    if path.as_posix().startswith("/home") or path.as_posix().startswith("/Users"):
+        if platform.system() == "Windows":  # path copied from Linux/Mac to Windows
+            # For Linux: /home/username, for Mac: /Users/username
+            skip_parts = 3 if path.as_posix().startswith("/home") else 3  # Both have 3 parts to skip
+            path = PathExtended.home().joinpath(*path.parts[skip_parts:])
+            assert path.exists(), f"File not found: {path}"
+            source_os = "Linux" if a_path.as_posix().startswith("/home") else "macOS"
+            console.print(Panel(f"🔗 PATH MAPPING | {source_os} → Windows: `{a_path}` ➡️ `{path}`", title="Path Mapping", expand=False))
+        elif platform.system() in ["Linux", "Darwin"] and PathExtended.home().as_posix() not in path.as_posix():  # copied between Unix-like systems with different username
+            skip_parts = 3  # Both /home/username and /Users/username have 3 parts to skip
+            path = PathExtended.home().joinpath(*path.parts[skip_parts:])
+            assert path.exists(), f"File not found: {path}"
+            current_os = "Linux" if platform.system() == "Linux" else "macOS"
+            source_os = "Linux" if a_path.as_posix().startswith("/home") else "macOS"
+            console.print(Panel(f"🔗 PATH MAPPING | {source_os} → {current_os}: `{a_path}` ➡️ `{path}`", title="Path Mapping", expand=False))
+    elif path.as_posix().startswith("C:"):
+        if platform.system() in ["Linux", "Darwin"]:  # path copied from Windows to Linux/Mac
+            xx = str(a_path).replace("\\\\", "/")
+            path = PathExtended.home().joinpath(*PathExtended(xx).parts[3:])  # exclude C:\\Users\\username
+            assert path.exists(), f"File not found: {path}"
+            target_os = "Linux" if platform.system() == "Linux" else "macOS"
+            console.print(Panel(f"🔗 PATH MAPPING | Windows → {target_os}: `{a_path}` ➡️ `{path}`", title="Path Mapping", expand=False))
+        elif platform.system() == "Windows" and PathExtended.home().as_posix() not in path.as_posix():  # copied from Windows to Windows with different username
+            path = PathExtended.home().joinpath(*path.parts[2:])
+            assert path.exists(), f"File not found: {path}"
+            console.print(Panel(f"🔗 PATH MAPPING | Windows → Windows: `{a_path}` ➡️ `{path}`", title="Path Mapping", expand=False))
+    return path.expanduser().absolute()
+
+
+def find_scripts(root: Path, name_substring: str) -> tuple[list[Path], list[Path]]:
+    filename_matches = []
+    partial_path_matches = []
+    for entry in root.iterdir():
+        if entry.is_dir():
+            if entry.name in {".links", ".venv", ".git", ".idea", ".vscode", "node_modules", "__pycache__"}:
+                # prune this entire subtree
+                continue
+            tmp1, tmp2 = find_scripts(entry, name_substring)
+            filename_matches.extend(tmp1)
+            partial_path_matches.extend(tmp2)
+        elif entry.is_file() and entry.suffix in {".py", ".sh", ".ps1"}:
+            if name_substring.lower() in entry.name.lower():
+                filename_matches.append(entry)
+            elif name_substring.lower() in entry.as_posix().lower():
+                partial_path_matches.append(entry)
+    return filename_matches, partial_path_matches
+
+
+def match_file_name(sub_string: str, search_root: PathExtended) -> PathExtended:
+    search_root_obj = search_root.absolute()
+    # assume subscript is filename only, not a sub_path. There is no need to fzf over the paths.
+    filename_matches, partial_path_matches = find_scripts(search_root_obj, sub_string)
+    if len(filename_matches) == 1: return PathExtended(filename_matches[0])
+    console.print(Panel(f"Partial filename match with case-insensitivity failed. This generated #{len(filename_matches)} results.", title="Search", expand=False))
+    if len(filename_matches) < 10:
+        print("\n".join([a_potential_match.as_posix() for a_potential_match in filename_matches]))
+    if len(filename_matches) > 1:
+        print("Try to narrow down filename_matches search by case-sensitivity.")
+        # let's see if avoiding .lower() helps narrowing down to one result
+        reduced_scripts = [a_potential_match for a_potential_match in filename_matches if sub_string in a_potential_match.name]
+        if len(reduced_scripts) == 1: return PathExtended(reduced_scripts[0])
+        elif len(reduced_scripts) > 1:
+            choice = choose_one_option(msg="Multiple matches found", options=reduced_scripts, fzf=True)
+            return PathExtended(choice)
+        print(f"Result: This still generated {len(reduced_scripts)} results.")
+        if len(reduced_scripts) < 10:
+            print("\n".join([a_potential_match.as_posix() for a_potential_match in reduced_scripts]))
+
+    console.print(Panel(f"Partial path match with case-insensitivity failed. This generated #{len(partial_path_matches)} results.", title="Search", expand=False))
+    if len(partial_path_matches) == 1:
+        return PathExtended(partial_path_matches[0])
+    elif len(partial_path_matches) > 1:
+        print("Try to narrow down partial_path_matches search by case-sensitivity.")
+        reduced_scripts = [a_potential_match for a_potential_match in partial_path_matches if sub_string in a_potential_match.as_posix()]
+        if len(reduced_scripts) == 1: return PathExtended(reduced_scripts[0])
+        print(f"Result: This still generated {len(reduced_scripts)} results.")
+    try:
+        fzf_cmd = f"cd '{search_root_obj}'; fd --type file --strip-cwd-prefix | fzf --ignore-case --exact --query={sub_string}"
+        console.print(Panel(f"🔍 Second attempt: SEARCH STRATEGY | Using fd to search for '{sub_string}' in '{search_root_obj}' ...\n{fzf_cmd}", title="Search Strategy", expand=False))
+        search_res_raw = subprocess.run(fzf_cmd, stdout=subprocess.PIPE, text=True, check=True, shell=True,).stdout
+        search_res = search_res_raw.strip().split("\\n")[:-1]
+    except subprocess.CalledProcessError as cpe:
+        console.print(Panel(f"❌ ERROR | FZF search failed with '{sub_string}' in '{search_root_obj}'.\n{cpe}", title="Error", expand=False))
+        import sys
+        sys.exit(f"💥 FILE NOT FOUND | Path {sub_string} does not exist @ root {search_root_obj}. No search results.")
+    if len(search_res) == 1: return search_root_obj.joinpath(search_res_raw)
+
+    print(f"⚠️ WARNING | Multiple search results found for `{sub_string}`\n'{search_res_raw}'")
+    cmd = f"cd '{search_root_obj}'; fd --type file | fzf --select-1 --query={sub_string}"
+    console.print(Panel(f"🔍 SEARCH STRATEGY | Trying with raw fzf search ...\n{cmd}", title="Search Strategy", expand=False))
+    try:
+        res = subprocess.run(cmd, check=True, stdout=subprocess.PIPE, text=True, shell=True).stdout.strip()
+    except subprocess.CalledProcessError as cpe:
+        console.print(Panel(f"❌ ERROR | FZF search failed with '{sub_string}' in '{search_root_obj}'. {cpe}", title="Error", expand=False))
+        msg = Panel(f"💥 FILE NOT FOUND | Path {sub_string} does not exist @ root {search_root_obj}. No search results", title="File Not Found", expand=False)
+        raise FileNotFoundError(msg) from cpe
+    return search_root_obj.joinpath(res)