machineconfig 5.19__py3-none-any.whl → 5.21__py3-none-any.whl

machineconfig/scripts/python/interactive.py

@@ -19,8 +19,8 @@ for better user experience with checkbox selections.
 
 import sys
 from pathlib import Path
-from platform import system
 from typing import cast
+import platform
 
 import questionary
 from questionary import Choice
@@ -80,14 +80,14 @@ def get_installation_choices() -> list[str]:
         Choice(value="retrieve_data", title="💾 Retrieve Data                  - Backup restoration", checked=False),
     ]
     # Add Windows-specific options
-    if system() == "Windows":
+    if platform.system() == "Windows":
         choices.append(Choice(value="install_windows_desktop", title="💻 Install Windows Desktop Apps   - Brave, Windows Terminal, PowerShell, VSCode (Windows only)", checked=False))
     selected = questionary.checkbox("Select the installation options you want to execute:", choices=choices, show_description=True).ask()
     return selected or []
 
 
 def execute_installations(selected_options: list[str]) -> None:
-    if system() == "Windows":
+    if platform.system() == "Windows":
         from machineconfig import setup_windows as module
         script_path = Path(module.__file__).parent / "ve.ps1"
         run_shell_script(script_path.read_text(encoding="utf-8"))
@@ -109,26 +109,24 @@ def execute_installations(selected_options: list[str]) -> None:
             run_shell_script(". $HOME/.bashrc")
 
     if "upgrade_system" in selected_options:
-        if system() == "Windows":
+        if platform.system() == "Windows":
             console.print("❌ System upgrade is not applicable on Windows via this script.", style="bold red")
-        elif system() == "Linux":
+        elif platform.system() == "Linux":
             console.print(Panel("🔄 [bold magenta]SYSTEM UPDATE[/bold magenta]\n[italic]Package management[/italic]", border_style="magenta"))
             run_shell_script("sudo nala upgrade -y")
         else:
-            console.print(f"❌ System upgrade not supported on {system()}.", style="bold red")
+            console.print(f"❌ System upgrade not supported on {platform.system()}.", style="bold red")
     if "install_repos" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
-        if system() == "Windows":
-            from machineconfig import setup_windows as module
-            script_path = Path(module.__file__).parent / "repos.ps1"
+        if platform.system() == "Windows":
+            from machineconfig.setup_windows import REPOS
         else:
-            from machineconfig import setup_linux as module
-            script_path = Path(module.__file__).parent / "repos.sh"
-        run_shell_script(script_path.read_text(encoding="utf-8"))
+            from machineconfig.setup_linux import REPOS
+        run_shell_script(REPOS.read_text(encoding="utf-8"))
 
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
-        if system() == "Windows":
+        if platform.system() == "Windows":
             powershell_script = """Write-Host "🔧 Installing and configuring SSH server..."
 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
 Start-Service sshd

machineconfig/scripts/python/repos.py

@@ -35,7 +35,7 @@ CloudOption = Annotated[
 
 
 
-@app.command()
+@app.command(no_args_is_help=True)
 def push(directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
     no_sync: NoSyncOption = False,
@@ -43,7 +43,7 @@ def push(directory: DirectoryArgument = None,
     """🚀 Push changes across repositories."""
     from machineconfig.scripts.python.repos_helper import git_operations
     git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, no_sync=no_sync)
-@app.command()
+@app.command(no_args_is_help=True)
 def pull(
     directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
@@ -52,7 +52,7 @@ def pull(
     """⬇️ Pull changes across repositories."""
     from machineconfig.scripts.python.repos_helper import git_operations
     git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, no_sync=no_sync)
-@app.command()
+@app.command(no_args_is_help=True)
 def commit(
     directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
@@ -61,8 +61,8 @@ def commit(
     """💾 Commit changes across repositories."""
     from machineconfig.scripts.python.repos_helper import git_operations
     git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, no_sync=no_sync)
-@app.command()
-def all(
+@app.command(no_args_is_help=True)
+def cleanup(
     directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
     no_sync: NoSyncOption = False,
@@ -72,7 +72,7 @@ def all(
     git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, no_sync=no_sync)
 
 
-@sync_app.command()
+@sync_app.command(no_args_is_help=True)
 def capture(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -86,7 +86,7 @@ def capture(
     from machineconfig.utils.path_extended import PathExtended
     if cloud is not None:
         PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
-@sync_app.command()
+@sync_app.command(no_args_is_help=True)
 def clone(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -97,7 +97,7 @@ def clone(
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
 
 
-@sync_app.command(name="checkout-to-commit")
+@sync_app.command(name="checkout-to-commit", no_args_is_help=True)
 def checkout_command(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -108,7 +108,7 @@ def checkout_command(
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=True)
 
 
-@sync_app.command(name="checkout-to-branch")
+@sync_app.command(name="checkout-to-branch", no_args_is_help=True)
 def checkout_to_branch_command(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -119,7 +119,7 @@ def checkout_to_branch_command(
     clone_from_specs(directory, cloud, checkout_branch_flag=True, checkout_commit_flag=False)
 
 
-@app.command()
+@app.command(no_args_is_help=True)
 def analyze(
     directory: DirectoryArgument = None,
 ) -> None:

machineconfig/scripts/python/sessions.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Optional, Literal
 import typer
-
+from machineconfig.scripts.python.sessions_multiprocess import create_from_function
 
 def balance_load(layout_path: Path = typer.Argument(..., help="Path to the layout.json file"),
            max_thresh: int = typer.Option(..., help="Maximum tabs per layout"),
@@ -69,7 +69,7 @@ def find_layout_file(layout_path: str, ) -> Path:
     return choice_file
 
 
-def launch(ctx: typer.Context,
+def run(ctx: typer.Context,
            layout_path: Optional[str] = typer.Argument(None, help="Path to the layout.json file"),
         max_tabs: int = typer.Option(10, help="A Sanity checker that throws an error if any layout exceeds the maximum number of tabs to launch."),
         max_layouts: int = typer.Option(10, help="A Sanity checker that throws an error if the total number of layouts exceeds this number."),
@@ -133,14 +133,11 @@ def launch(ctx: typer.Context,
 
 
 def main_from_parser():
-    layouts_app = typer.Typer(help="Layouts management subcommands")
-    layouts_app.command("run")(launch)
-    layouts_app.command("balance-load")(balance_load)
-    import sys
-    if len(sys.argv) == 1:
-        layouts_app(["--help"])
-    else:
-        layouts_app()
+    layouts_app = typer.Typer(help="Layouts management subcommands", no_args_is_help=True)
+    layouts_app.command("create-from-function", no_args_is_help=True)(create_from_function)
+    layouts_app.command("run", no_args_is_help=True)(run)
+    layouts_app.command("balance-load", no_args_is_help=True)(balance_load)
+    layouts_app()
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/sessions_multiprocess.py

@@ -0,0 +1,56 @@
+
+
+from typing import Optional
+from pathlib import Path
+import typer
+
+
+def create_from_function(
+        num_process: int = typer.Option(..., "--num-process", "-n", help="Number of parallel processes to run"),
+        path: str = typer.Option(".", "--path", "-p", help="Path to a Python or Shell script file or a directory containing such files"),
+        function: Optional[str] = typer.Option(None, "--function", "-f", help="Function to run from the Python file. If not provided, you will be prompted to choose."),
+):
+    from machineconfig.utils.ve import get_ve_activate_line, get_ve_path_and_ipython_profile
+    from machineconfig.utils.options import choose_from_options
+    from machineconfig.utils.path_helper import match_file_name, sanitize_path
+    from machineconfig.utils.path_extended import PathExtended
+    from machineconfig.utils.accessories import get_repo_root
+
+    path_obj = sanitize_path(path)
+    if not path_obj.exists():
+        suffixes = {".py"}
+        choice_file = match_file_name(sub_string=path, search_root=PathExtended.cwd(), suffixes=suffixes)
+    elif path_obj.is_dir():
+        from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
+        print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
+        files = search_for_files_of_interest(path_obj)
+        print(f"🔍 Got #{len(files)} results.")
+        choice_file = choose_from_options(multi=False, options=files, fzf=True, msg="Choose one option")
+        choice_file = PathExtended(choice_file)
+    else:
+        choice_file = path_obj
+
+
+    repo_root = get_repo_root(Path(choice_file))
+    print(f"💾 Selected file: {choice_file}.\nRepo root: {repo_root}")
+    ve_root_from_file, ipy_profile = get_ve_path_and_ipython_profile(choice_file)
+    if ipy_profile is None:
+        ipy_profile = "default"
+
+    _activate_ve_line = get_ve_activate_line(ve_root=ve_root_from_file or "$HOME/code/machineconfig/.venv")
+
+    # =========================  choosing function to run
+    if function is None or function.strip() == "":
+        from machineconfig.scripts.python.fire_jobs_route_helper import choose_function_or_lines
+        choice_function, choice_file, _kwargs_dict = choose_function_or_lines(choice_file, kwargs_dict={})
+    else:
+        choice_function = function
+
+    from machineconfig.cluster.sessions_managers.zellij_local import run_zellij_layout
+    from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
+    layout: LayoutConfig = {"layoutName": "fireNprocess", "layoutTabs": []}
+    for an_arg in range(num_process):
+        layout["layoutTabs"].append({"tabName": f"tab{an_arg}", "startDir": str(PathExtended.cwd()), "command": f"uv run -m fire {choice_file} {choice_function} --idx={an_arg} --idx_max={num_process}"})
+    print(layout)
+    run_zellij_layout(layout_config=layout)
+

machineconfig/utils/links.py

@@ -8,39 +8,40 @@ from typing import TypedDict, Literal
 console = Console()
 
 
-class SymlinkResult(TypedDict):
-    action: Literal[
-        "already_linked",
-        "relinking", 
-        "fixing_broken_link",
-        "identical_files",
-        "backing_up_source",
-        "backing_up_target", 
-        "relinking_to_new_target",
-        "moving_to_target",
-        "new_link",
-        "new_link_and_target",
-        "linking",
-        "error"
-    ]
-    details: str
+ActionType = Literal[
+    "already_linked",
+    "relinking",
+    "fixing_broken_link",
+    "identical_files",
+    "backupConfigDefaultPath",
+    "backing_up_source",
+    "backing_up_target",
+    "relink2newSelfManagedPath",
+    "relinking_to_new_target",
+    "move2selfManagedPath",
+    "moving_to_target",
+    "new_link",
+    "newLinkAndSelfManagedPath",
+    "new_link_and_target",
+    "linking",
+    "copying",
+    "error"
+]
+
 
+class OperationResult(TypedDict):
+    action: ActionType
+    details: str
 
-class CopyResult(TypedDict):
-    action: Literal[
-        "already_linked",
-        "relinking",
-        "fixing_broken_link", 
-        "backing_up_source",
-        "backing_up_target",
-        "relinking_to_new_target",
-        "moving_to_target",
-        "new_link",
-        "new_link_and_target",
-        "copying",
-        "error"
-    ]
+class OperationRecord(TypedDict):
+    action: ActionType
     details: str
+    program: str
+    file_key: str
+    defaultPath: str
+    selfManaged: str
+    operation: str
+    status: str
 
 
 def files_are_identical(file1: PathExtended, file2: PathExtended) -> bool:
@@ -79,14 +80,24 @@ def build_links(target_paths: list[tuple[PLike, str]], repo_root: PLike):
     tmp_results_root.mkdir(parents=True, exist_ok=True)
     target_dirs_filtered.append((tmp_results_root, "tmp_results"))
 
+    links_dir = repo_root_obj.joinpath("links")
+    links_dir.mkdir(parents=True, exist_ok=True)
+    
     for a_target_path, a_name in target_dirs_filtered:
-        links_path = repo_root_obj.joinpath("links", a_name)
-        links_path.symlink_to(target=a_target_path)
+        links_path = links_dir.joinpath(a_name)
+        if links_path.exists() or links_path.is_symlink():
+            if links_path.is_symlink() and links_path.resolve() == a_target_path.resolve():
+                continue
+            links_path.unlink(missing_ok=True)
+        try:
+            links_path.symlink_to(target=a_target_path)
+        except OSError as ex:
+            console.print(Panel(f"❌ Failed to create symlink {links_path} -> {a_target_path}: {ex}", title="Symlink Error", expand=False))
 
 
 def symlink_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended,
                  on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]
-                 ) -> SymlinkResult:
+                 ) -> OperationResult:
     """helper function. creates a symlink from `config_file_default_path` to `self_managed_config_file_path`.
 
     Returns a dict with 'action' and 'details' keys describing what was done.
@@ -103,6 +114,10 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
     """
     config_file_default_path = PathExtended(config_file_default_path).expanduser().absolute()
     self_managed_config_file_path = PathExtended(self_managed_config_file_path).expanduser().absolute()
+    
+    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
+        raise ValueError(f"config_file_default_path and self_managed_config_file_path resolve to the same location: {config_file_default_path.resolve()}")
+    
     action_taken = ""
     details = ""
     
@@ -112,7 +127,7 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
             if config_file_default_path.is_symlink():
                 # Check if symlink already points to correct target
                 try:
-                    if config_file_default_path.readlink().resolve() == self_managed_config_file_path.resolve():
+                    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
                         # Case: config_file_default_path exists AND self_managed_config_file_path exists AND config_file_default_path is a symlink pointing to self_managed_config_file_path
                         action_taken = "already_linked"
                         details = "Symlink already correctly points to target"
@@ -135,7 +150,7 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                 if files_are_identical(config_file_default_path, self_managed_config_file_path):
                     # Files are identical, just delete this and create symlink
                     action_taken = "identical_files"
-                    details = "Files identical, removed source and will create symlink"
+                    details = "Files identical, removed config_file_default_path and will create symlink"
                     console.print(Panel(f"🔗 IDENTICAL FILES | Files are identical, deleting {config_file_default_path} and creating symlink to {self_managed_config_file_path}", title="Identical Files", expand=False))
                     config_file_default_path.delete(sure=True)
                 else:
@@ -156,13 +171,13 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                         self_managed_config_file_path.move(path=backup_name)
                         config_file_default_path.move(path=self_managed_config_file_path)
                     elif on_conflict == "overwriteDefaultPath":
-                        action_taken = "backing_up_source"
+                        action_taken = "backupConfigDefaultPath"
                         details = "Overwriting default path, creating symlink to self-managed config"
                         console.print(Panel(f"📦 OVERWRITE DEFAULT | Deleting {config_file_default_path}, creating symlink to {self_managed_config_file_path}", title="Overwrite Default", expand=False))
                         config_file_default_path.delete(sure=True)
                     elif on_conflict == "backupDefaultPath":
                         backup_name = f"{config_file_default_path}.orig_{randstr()}"
-                        action_taken = "backing_up_source"
+                        action_taken = "backupConfigDefaultPath"
                         details = f"Backed up default path to {backup_name}"
                         console.print(Panel(f"📦 BACKUP DEFAULT | Moving {config_file_default_path} to {backup_name}, creating symlink to {self_managed_config_file_path}", title="Backup Default", expand=False))
                         config_file_default_path.move(path=backup_name)
@@ -170,8 +185,8 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
             # self_managed_config_file_path doesn't exist
             if config_file_default_path.is_symlink():
                 # Case: config_file_default_path exists AND self_managed_config_file_path doesn't exist AND config_file_default_path is a symlink (pointing anywhere)
-                action_taken = "relinking_to_new_target"
-                details = "Removed existing symlink, will create target and new symlink"
+                action_taken = "relink2newSelfManagedPath"
+                details = "Removed existing symlink, will create self_managed_config_file_path and new symlink"
                 console.print(Panel(f"🔄 RELINKING | Updating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Relinking", expand=False))
                 config_file_default_path.delete(sure=True)
                 # Create self_managed_config_file_path
@@ -179,8 +194,8 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                 self_managed_config_file_path.touch()
             else:
                 # Case: config_file_default_path exists AND self_managed_config_file_path doesn't exist AND config_file_default_path is a concrete path
-                action_taken = "moving_to_target"
-                details = "Moved source to target location, will create symlink"
+                action_taken = "move2selfManagedPath"
+                details = "Moved config_file_default_path to self_managed_config_file_path location, will create symlink"
                 console.print(Panel(f"📁 MOVING | Moving {config_file_default_path} to {self_managed_config_file_path}, then creating symlink", title="Moving", expand=False))
                 config_file_default_path.move(path=self_managed_config_file_path)
     else:
@@ -188,22 +203,23 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
         if self_managed_config_file_path.exists():
             # Case: config_file_default_path doesn't exist AND self_managed_config_file_path exists
             action_taken = "new_link"
-            details = "Creating new symlink to existing target"
+            details = "Creating new symlink to existing self_managed_config_file_path"
             console.print(Panel(f"🆕 NEW LINK | Creating new symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="New Link", expand=False))
         else:
             # Case: config_file_default_path doesn't exist AND self_managed_config_file_path doesn't exist
-            action_taken = "new_link_and_target"
-            details = "Creating target file and new symlink"
+            action_taken = "newLinkAndSelfManagedPath"
+            details = "Creating self_managed_config_file_path file and new symlink"
             console.print(Panel(f"🆕 NEW LINK & TARGET | Creating {self_managed_config_file_path} and symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="New Link & Target", expand=False))
             self_managed_config_file_path.parent.mkdir(parents=True, exist_ok=True)
             self_managed_config_file_path.touch()
     
     # Create the symlink
     try:
-        action_taken = action_taken or "linking"
-        details = details or "Creating symlink"
-        console.print(Panel(f"🔗 LINKING | Creating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Linking", expand=False))
-        PathExtended(config_file_default_path).symlink_to(target=self_managed_config_file_path, verbose=True, overwrite=True)
+        if not action_taken:
+            action_taken = "linking"
+            details = "Creating symlink"
+            console.print(Panel(f"🔗 LINKING | Creating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Linking", expand=False))
+        PathExtended(config_file_default_path).symlink_to(target=self_managed_config_file_path, verbose=True, overwrite=False)
         return {"action": action_taken, "details": details}
     except Exception as ex:
         action_taken = "error"
@@ -212,87 +228,105 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
         return {"action": action_taken, "details": details}
 
 
-def copy_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended, on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]) -> CopyResult:
+def copy_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended, on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]) -> OperationResult:
     config_file_default_path = PathExtended(config_file_default_path).expanduser().absolute()
     self_managed_config_file_path = PathExtended(self_managed_config_file_path).expanduser().absolute()
+    
+    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
+        raise ValueError(f"config_file_default_path and self_managed_config_file_path resolve to the same location: {config_file_default_path.resolve()}")
+    
     action_taken = ""
     details = ""
     
-    if config_file_default_path.exists():
-        if self_managed_config_file_path.exists():
+    match (config_file_default_path.exists(), self_managed_config_file_path.exists()):
+        case (True, True):
+            # Both files exist
             if config_file_default_path.is_symlink():
                 try:
-                    if config_file_default_path.readlink().resolve() == self_managed_config_file_path.resolve():
+                    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
                         action_taken = "already_linked"
-                        details = "Symlink already correctly points to target"
-                        console.print(Panel(f"✅ ALREADY LINKED | {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Already Linked", expand=False))
+                        details = "File at default path is already a symlink to self-managed config"
+                        console.print(Panel(f"✅ ALREADY CORRECT | {config_file_default_path} already points to {self_managed_config_file_path}", title="Already Correct", expand=False))
                         return {"action": action_taken, "details": details}
                     else:
                         action_taken = "relinking"
-                        details = "Updated existing symlink to point to new target"
-                        console.print(Panel(f"🔄 RELINKING | Updating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Relinking", expand=False))
+                        details = "Removing symlink at default path that points elsewhere"
+                        console.print(Panel(f"🔄 REMOVING SYMLINK | Removing symlink {config_file_default_path} (points elsewhere), will copy from {self_managed_config_file_path}", title="Removing Symlink", expand=False))
                         config_file_default_path.delete(sure=True)
                 except OSError:
                     action_taken = "fixing_broken_link"
-                    details = "Removed broken symlink and will create new one"
-                    console.print(Panel(f"🔄 FIXING BROKEN LINK | Fixing broken symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Fixing Broken Link", expand=False))
+                    details = "Removed broken symlink at default path"
+                    console.print(Panel(f"🔄 FIXING BROKEN SYMLINK | Removing broken symlink {config_file_default_path}, will copy from {self_managed_config_file_path}", title="Fixing Broken Symlink", expand=False))
                     config_file_default_path.delete(sure=True)
             else:
-                if on_conflict == "throwError":
-                    raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")
-                elif on_conflict == "overwriteSelfManaged":
-                    action_taken = "backing_up_target"
-                    details = "Overwriting self-managed config, moving default path to self-managed location"
-                    console.print(Panel(f"📦 OVERWRITE SELF-MANAGED | Deleting {self_managed_config_file_path}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Overwrite Self-Managed", expand=False))
-                    self_managed_config_file_path.delete(sure=True)
-                    config_file_default_path.move(path=self_managed_config_file_path)
-                elif on_conflict == "backupSelfManaged":
-                    backup_name = f"{self_managed_config_file_path}.orig_{randstr()}"
-                    action_taken = "backing_up_target"
-                    details = f"Backed up self-managed config to {backup_name}"
-                    console.print(Panel(f"📦 BACKUP SELF-MANAGED | Moving {self_managed_config_file_path} to {backup_name}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Backup Self-Managed", expand=False))
-                    self_managed_config_file_path.move(path=backup_name)
-                    config_file_default_path.move(path=self_managed_config_file_path)
-                elif on_conflict == "overwriteDefaultPath":
-                    action_taken = "backing_up_source"
-                    details = "Overwriting default path, creating symlink to self-managed config"
-                    console.print(Panel(f"📦 OVERWRITE DEFAULT | Deleting {config_file_default_path}, copying {self_managed_config_file_path}", title="Overwrite Default", expand=False))
+                # Check if files are identical first
+                if files_are_identical(config_file_default_path, self_managed_config_file_path):
+                    # Files are identical, just delete this and proceed with copy
+                    action_taken = "identical_files"
+                    details = "Files identical, removed config_file_default_path and will copy"
+                    console.print(Panel(f"🔗 IDENTICAL FILES | Files are identical, deleting {config_file_default_path} and copying from {self_managed_config_file_path}", title="Identical Files", expand=False))
                     config_file_default_path.delete(sure=True)
-                elif on_conflict == "backupDefaultPath":
-                    backup_name = f"{config_file_default_path}.orig_{randstr()}"
-                    action_taken = "backing_up_source"
-                    details = f"Backed up default path to {backup_name}"
-                    console.print(Panel(f"📦 BACKUP DEFAULT | Moving {config_file_default_path} to {backup_name}, copying {self_managed_config_file_path}", title="Backup Default", expand=False))
-                    config_file_default_path.move(path=backup_name)
-        else:
+                else:
+                    # Files are different, use on_conflict strategy
+                    match on_conflict:
+                        case "throwError":
+                            raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")
+                        case "overwriteSelfManaged":
+                            action_taken = "backing_up_target"
+                            details = "Overwriting self-managed config with default path content"
+                            console.print(Panel(f"📦 OVERWRITE SELF-MANAGED | Deleting {self_managed_config_file_path}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Overwrite Self-Managed", expand=False))
+                            self_managed_config_file_path.delete(sure=True)
+                            config_file_default_path.move(path=self_managed_config_file_path)
+                        case "backupSelfManaged":
+                            backup_name = f"{self_managed_config_file_path}.orig_{randstr()}"
+                            action_taken = "backing_up_target"
+                            details = f"Backed up self-managed config to {backup_name}"
+                            console.print(Panel(f"📦 BACKUP SELF-MANAGED | Moving {self_managed_config_file_path} to {backup_name}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Backup Self-Managed", expand=False))
+                            self_managed_config_file_path.move(path=backup_name)
+                            config_file_default_path.move(path=self_managed_config_file_path)
+                        case "overwriteDefaultPath":
+                            action_taken = "backupConfigDefaultPath"
+                            details = "Overwriting default path with self-managed config"
+                            console.print(Panel(f"📦 OVERWRITE DEFAULT | Deleting {config_file_default_path}, will copy from {self_managed_config_file_path}", title="Overwrite Default", expand=False))
+                            config_file_default_path.delete(sure=True)
+                        case "backupDefaultPath":
+                            backup_name = f"{config_file_default_path}.orig_{randstr()}"
+                            action_taken = "backupConfigDefaultPath"
+                            details = f"Backed up default path to {backup_name}"
+                            console.print(Panel(f"📦 BACKUP DEFAULT | Moving {config_file_default_path} to {backup_name}, will copy from {self_managed_config_file_path}", title="Backup Default", expand=False))
+                            config_file_default_path.move(path=backup_name)
+        case (True, False):
+            # config_file_default_path exists, self_managed_config_file_path doesn't
             if config_file_default_path.is_symlink():
-                action_taken = "relinking_to_new_target"
-                details = "Removed existing symlink, will create target and new symlink"
-                console.print(Panel(f"🔄 RELINKING | Updating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Relinking", expand=False))
+                action_taken = "relink2newSelfManagedPath"
+                details = "Removed existing symlink, will create self_managed_config_file_path and copy"
+                console.print(Panel(f"🔄 REMOVING SYMLINK | Removing symlink {config_file_default_path}, creating {self_managed_config_file_path}", title="Removing Symlink", expand=False))
                 config_file_default_path.delete(sure=True)
                 self_managed_config_file_path.parent.mkdir(parents=True, exist_ok=True)
                 self_managed_config_file_path.touch()
             else:
-                action_taken = "moving_to_target"
-                details = "Moved source to target location, will copy"
-                console.print(Panel(f"📁 MOVING | Moving {config_file_default_path} to {self_managed_config_file_path}, then copying", title="Moving", expand=False))
+                action_taken = "move2selfManagedPath"
+                details = "Moved config_file_default_path to self_managed_config_file_path location, will copy back"
+                console.print(Panel(f"📁 MOVING | Moving {config_file_default_path} to {self_managed_config_file_path}, then copying back", title="Moving", expand=False))
                 config_file_default_path.move(path=self_managed_config_file_path)
-    else:
-        if self_managed_config_file_path.exists():
+        case (False, True):
+            # config_file_default_path doesn't exist, self_managed_config_file_path does
             action_taken = "new_link"
-            details = "Copying existing target to source location"
-            console.print(Panel(f"🆕 NEW LINK | Copying {self_managed_config_file_path} to {config_file_default_path}", title="New Link", expand=False))
-        else:
-            action_taken = "new_link_and_target"
-            details = "Creating target file and copying to source"
-            console.print(Panel(f"🆕 NEW LINK & TARGET | Creating {self_managed_config_file_path} and copying to {config_file_default_path}", title="New Link & Target", expand=False))
+            details = "Copying existing self_managed_config_file_path to config_file_default_path location"
+            console.print(Panel(f"🆕 NEW COPY | Copying {self_managed_config_file_path} to {config_file_default_path}", title="New Copy", expand=False))
+        case (False, False):
+            # Neither exists
+            action_taken = "newLinkAndSelfManagedPath"
+            details = "Creating self_managed_config_file_path file and copying to config_file_default_path"
+            console.print(Panel(f"🆕 NEW FILE & COPY | Creating {self_managed_config_file_path} and copying to {config_file_default_path}", title="New File & Copy", expand=False))
             self_managed_config_file_path.parent.mkdir(parents=True, exist_ok=True)
             self_managed_config_file_path.touch()
     
     try:
-        action_taken = action_taken or "copying"
-        details = details or "Copying file"
-        console.print(Panel(f"📋 COPYING | Copying {self_managed_config_file_path} to {config_file_default_path}", title="Copying", expand=False))
+        if not action_taken:
+            action_taken = "copying"
+            details = "Copying file"
+            console.print(Panel(f"📋 COPYING | Copying {self_managed_config_file_path} to {config_file_default_path}", title="Copying", expand=False))
         self_managed_config_file_path.copy(path=config_file_default_path, overwrite=True, verbose=True)
         return {"action": action_taken, "details": details}
     except Exception as ex:
@@ -300,3 +334,5 @@ def copy_map(config_file_default_path: PathExtended, self_managed_config_file_pa
         details = f"Failed to copy file: {str(ex)}"
         console.print(Panel(f"❌ ERROR | Failed at copying {self_managed_config_file_path} to {config_file_default_path}. Reason: {ex}", title="Error", expand=False))
         return {"action": action_taken, "details": details}
+
+

{machineconfig-5.19.dist-info → machineconfig-5.21.dist-info}/METADATA

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