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

machineconfig/utils/links.py

@@ -1,5 +1,5 @@
-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
 
@@ -11,9 +11,9 @@ 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))
@@ -22,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"))
 
@@ -31,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.
@@ -49,16 +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:
         console.print(Panel(f"🔗 LINKING | Creating symlink from {this} ➡️  {to_this}", title="Linking", expand=False))
-        P(this).symlink_to(target=to_this, verbose=True, overwrite=True)
+        PathExtended(this).symlink_to(target=to_this, verbose=True, overwrite=True)
     except Exception as ex:
         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.
@@ -69,7 +71,9 @@ 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:
         console.print(Panel(f"📋 COPYING | Copying {to_this} to {this}", title="Copying", expand=False))
         to_this.copy(path=this, overwrite=True, verbose=True)

machineconfig/utils/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
@@ -19,7 +16,7 @@ def check_tool_exists(tool_name: str, install_script: Optional[str] = None) -> b
         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:
@@ -134,9 +131,8 @@ def choose_cloud_interactively() -> str:
     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:
@@ -148,6 +144,6 @@ def choose_cloud_interactively() -> str:
 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

@@ -1,99 +1,112 @@
-from crocodile.core import List as L
-from crocodile.file_management import P
-from machineconfig.utils.options import check_tool_exists, choose_one_option
+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 Optional, TypeVar
+from typing import TypeVar
+from pathlib import Path
+
 
 T = TypeVar("T")
 console = Console()
 
-def sanitize_path(a_path: P) -> P:
-    path = P(a_path)
-    if path.as_posix().startswith("/home"):
-        if platform.system() == "Windows":  # path copied from Linux to Windows
-            path = P.home().joinpath(*path.parts[3:])  # exclude /home/username
+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}"
-            console.print(Panel(f"🔗 PATH MAPPING | Linux → Windows: `{a_path}` ➡️ `{path}`", title="Path Mapping", expand=False))
-        elif platform.system() == "Linux" and P.home().as_posix() not in path.as_posix():  # copied from Linux to Linux with different username
-            path = P.home().joinpath(*path.parts[3:])  # exclude /home/username (three parts: /, home, username)
+            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}"
-            console.print(Panel(f"🔗 PATH MAPPING | Linux → Linux: `{a_path}` ➡️ `{path}`", title="Path Mapping", expand=False))
+            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() == "Linux":  # path copied from Windows to Linux
+        if platform.system() in ["Linux", "Darwin"]:  # path copied from Windows to Linux/Mac
             xx = str(a_path).replace("\\\\", "/")
-            path = P.home().joinpath(*P(xx).parts[3:])  # exclude C:\\Users\\username
+            path = PathExtended.home().joinpath(*PathExtended(xx).parts[3:])  # exclude C:\\Users\\username
             assert path.exists(), f"File not found: {path}"
-            console.print(Panel(f"🔗 PATH MAPPING | Windows → Linux: `{a_path}` ➡️ `{path}`", title="Path Mapping", expand=False))
-        elif platform.system() == "Windows" and P.home().as_posix() not in path.as_posix():  # copied from Windows to Windows with different username
-            path = P.home().joinpath(*path.parts[2:])
+            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 match_file_name(sub_string: str, search_root: Optional[P] = None) -> P:
-    """Look up current directory for file name that matches the passed substring."""
-    search_root_obj = search_root if search_root is not None else P.cwd()
-    search_root_obj = search_root_obj.absolute()
-    console.print(Panel(f"🔍 SEARCH | Looking for '{sub_string}' in {search_root_obj}", title="Search", expand=False))
 
-    search_root_objects = search_root_obj.search("*", not_in=["links", ".venv", ".git", ".idea", ".vscode", "node_modules", "__pycache__"])
-    search_results: L[P] = L([a_search_root_obj.search(f"*{sub_string}*", r=True) for a_search_root_obj in search_root_objects])
-    if len(search_results) > 0:
-        search_results = search_results.reduce(lambda x, y: x + y)  # type: ignore
-    else:
-        pass
-    search_results = search_results.filter(lambda x: x.suffix in (".py", ".sh", ".ps1"))
-    if len(search_results) == 1:
-        path_obj = search_results.list[0]
-    elif len(search_results) > 1:
-        msg = "Search results are ambiguous or non-existent, choose manually:"
-        console.print(Panel(f"⚠️ WARNING | {msg}", title="Warning", expand=False))
-        choice = choose_one_option(msg=msg, options=search_results.list, fzf=True)
-        path_obj = P(choice)
-    else:
-        # let's do a final retry with sub_string.small()
-        sub_string_small = sub_string.lower()
-        if sub_string_small != sub_string:
-            console.print(Panel("🔄 RETRY | Searching with lowercase letters", title="Retry", expand=False))
-            return match_file_name(sub_string=sub_string_small)
-        from git.repo import Repo
-        from git.exc import InvalidGitRepositoryError
-        try:
-            repo = Repo(search_root_obj, search_parent_directories=True)
-            repo_root_dir = P(repo.working_dir)
-            if repo_root_dir != search_root_obj:  # may be user is in a subdirectory of the repo root, try with root dir.
-                console.print(Panel("🔄 RETRY | Searching from repository root instead of current directory", title="Retry", expand=False))
-                return match_file_name(sub_string=sub_string, search_root=repo_root_dir)
-            else:
-                search_root_obj = repo_root_dir
-        except InvalidGitRepositoryError:
-            pass
+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
+
 
-        if check_tool_exists(tool_name="fzf"):
-            try:
-                console.print(Panel(f"🔍 SEARCH STRATEGY | Using fd to search for '{sub_string}' in '{search_root_obj}' ...", title="Search Strategy", expand=False))
-                fzf_cmd = f"cd '{search_root_obj}'; fd --type f --strip-cwd-prefix | fzf --filter={sub_string}"
-                search_res = subprocess.run(fzf_cmd, stdout=subprocess.PIPE, text=True, check=True, shell=True).stdout.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))
-                msg = Panel(f"💥 FILE NOT FOUND | Path {sub_string} does not exist. No search results", title="File Not Found", expand=False)
-                raise FileNotFoundError(msg) from cpe
+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]))
 
-            if len(search_res) == 1: return search_root_obj.joinpath(search_res[0])
-            else:
-                console.print(Panel("🔍 SEARCH STRATEGY | Trying with raw fzf search ...", title="Search Strategy", expand=False))
-                try:
-                    res = subprocess.run(f"cd '{search_root_obj}'; fd | fzf --query={sub_string}", 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. No search results", title="File Not Found", expand=False)
-                    raise FileNotFoundError(msg) from cpe
-                return search_root_obj.joinpath(res)
+    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)
 
-        msg = Panel(f"💥 FILE NOT FOUND | Path {sub_string} does not exist. No search results", title="File Not Found", expand=False)
-        raise FileNotFoundError(msg)
-    console.print(Panel(f"✅ MATCH FOUND | `{sub_string}` ➡️ `{path_obj}`", title="Match Found", expand=False))
-    return path_obj
+    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)