machineconfig 5.12__tar.gz → 5.13__tar.gz

{machineconfig-5.12/src/machineconfig.egg-info → machineconfig-5.13}/PKG-INFO

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

{machineconfig-5.12 → machineconfig-5.13}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.12"
+version = "5.13"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -106,6 +106,7 @@ dev = [
     "types-sqlalchemy>=1.4.53.38",
     "types-toml>=0.10.8.20240310",
     "types-urllib3>=1.26.25.14",
+    "vt-py>=0.21.0",
 ]
 docs = [
     "pdoc>=15.0.2",

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig/jobs/python/check_installations.py

@@ -1,19 +1,6 @@
-# """CI
-# """
 
-
-# import time
 import platform
-
-# from typing import Any
-# from rich.console import Console
-# from machineconfig.utils.utils2 import pprint
-# # from rich.progress import track
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-# from machineconfig.utils.installer import get_installed_cli_apps
-# from typing import Optional
-# from datetime import datetime
-# import csv
 
 
 APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig/profile/create.py

@@ -8,6 +8,7 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.pretty import Pretty
 from rich.text import Text
+from rich.table import Table
 
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.links import symlink_func, symlink_copy
@@ -20,7 +21,7 @@ import os
 import ctypes
 import subprocess
 import tomllib
-from typing import Optional, Any, TypedDict
+from typing import Optional, Any, TypedDict, Literal
 
 system = platform.system()  # Linux or Windows
 ERROR_LIST: list[Any] = []  # append to this after every exception captured.
@@ -43,10 +44,35 @@ class SymlinkMapper(TypedDict):
     contents: Optional[bool]
 
 
-def apply_mapper(choice: Optional[str] = None):
+class OperationRecord(TypedDict):
+    program: str
+    file_key: str
+    source: str
+    target: str
+    operation: str
+    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",
+        "copying",
+        "error"
+    ]
+    details: str
+    status: str
+
+
+def apply_mapper(choice: Optional[str], prioritize_to_this: bool):
     symlink_mapper: dict[str, dict[str, SymlinkMapper]] = tomllib.loads(LIBRARY_ROOT.joinpath("profile/mapper.toml").read_text(encoding="utf-8"))
-    prioritize_to_this = True
     exclude: list[str] = []  # "wsl_linux", "wsl_windows"
+    operation_records: list[OperationRecord] = []
 
     program_keys_raw: list[str] = list(symlink_mapper.keys())
     program_keys: list[str] = []
@@ -64,10 +90,6 @@ def apply_mapper(choice: Optional[str] = None):
             return  # terminate function.
         elif len(choice_selected) == 1 and choice_selected[0] == "all":
             choice_selected = "all"  # i.e. program_keys = program_keys
-        # overwrite = choose_from_options(msg="Overwrite existing source file?", options=["yes", "no"], default="yes") == "yes"
-        from rich.prompt import Confirm
-
-        prioritize_to_this = Confirm.ask("Overwrite existing source file?", default=True)
     else:
         choice_selected = choice
 
@@ -114,22 +136,85 @@ def apply_mapper(choice: Optional[str] = None):
         for file_key, file_map in symlink_mapper[program_key].items():
             this = PathExtended(file_map["this"])
             to_this = PathExtended(file_map["to_this"].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            
             if "contents" in file_map:
                 try:
-                    for a_target in to_this.expanduser().search("*"):
-                        symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=prioritize_to_this)
+                    targets = list(to_this.expanduser().search("*"))
+                    for a_target in targets:
+                        result = symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=prioritize_to_this)
+                        operation_records.append({
+                            "program": program_key,
+                            "file_key": file_key,
+                            "source": str(this.joinpath(a_target.name)),
+                            "target": str(a_target),
+                            "operation": "contents_symlink",
+                            "action": result["action"],
+                            "details": result["details"],
+                            "status": "success"
+                        })
                 except Exception as ex:
                     console.print(f"❌ [red]Config error[/red]: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
-            if "copy" in file_map:
+                    operation_records.append({
+                        "program": program_key,
+                        "file_key": file_key,
+                        "source": str(this),
+                        "target": str(to_this),
+                        "operation": "contents_symlink",
+                        "action": "error",
+                        "details": f"Failed to process contents: {str(ex)}",
+                        "status": f"error: {str(ex)}"
+                    })
+                    
+            elif "copy" in file_map:
                 try:
-                    symlink_copy(this=this, to_this=to_this, prioritize_to_this=prioritize_to_this)
+                    result = symlink_copy(this=this, to_this=to_this, prioritize_to_this=prioritize_to_this)
+                    operation_records.append({
+                        "program": program_key,
+                        "file_key": file_key,
+                        "source": str(this),
+                        "target": str(to_this),
+                        "operation": "copy",
+                        "action": result["action"],
+                        "details": result["details"],
+                        "status": "success"
+                    })
                 except Exception as ex:
                     console.print(f"❌ [red]Config error[/red]: {program_key} | {file_key} | {ex}")
+                    operation_records.append({
+                        "program": program_key,
+                        "file_key": file_key,
+                        "source": str(this),
+                        "target": str(to_this),
+                        "operation": "copy",
+                        "action": "error",
+                        "details": f"Failed to copy: {str(ex)}",
+                        "status": f"error: {str(ex)}"
+                    })
             else:
                 try:
-                    symlink_func(this=this, to_this=to_this, prioritize_to_this=prioritize_to_this)
+                    result = symlink_func(this=this, to_this=to_this, prioritize_to_this=prioritize_to_this)
+                    operation_records.append({
+                        "program": program_key,
+                        "file_key": file_key,
+                        "source": str(this),
+                        "target": str(to_this),
+                        "operation": "symlink",
+                        "action": result["action"],
+                        "details": result["details"],
+                        "status": "success"
+                    })
                 except Exception as ex:
                     console.print(f"❌ [red]Config error[/red]: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
+                    operation_records.append({
+                        "program": program_key,
+                        "file_key": file_key,
+                        "source": str(this),
+                        "target": str(to_this),
+                        "operation": "symlink",
+                        "action": "error",
+                        "details": f"Failed to create symlink: {str(ex)}",
+                        "status": f"error: {str(ex)}"
+                    })
 
             if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
                 try:
@@ -147,6 +232,35 @@ def apply_mapper(choice: Optional[str] = None):
         subprocess.run(f"chmod +x {LIBRARY_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
         console.print("[green]✅ Script permissions updated[/green]")
 
+    # Display operation summary table
+    if operation_records:
+        table = Table(title="🔗 Symlink Operations Summary", show_header=True, header_style="bold magenta")
+        table.add_column("Program", style="cyan", no_wrap=True)
+        table.add_column("File Key", style="blue", no_wrap=True)
+        table.add_column("Source", style="green")
+        table.add_column("Target", style="yellow")
+        table.add_column("Operation", style="magenta", no_wrap=True)
+        table.add_column("Action", style="red", no_wrap=True)
+        table.add_column("Details", style="white")
+        table.add_column("Status", style="red", no_wrap=True)
+        
+        for record in operation_records:
+            status_style = "green" if record["status"] == "success" else "red"
+            action_style = "green" if record["action"] != "error" else "red"
+            table.add_row(
+                record["program"],
+                record["file_key"],
+                record["source"],
+                record["target"],
+                record["operation"],
+                f"[{action_style}]{record['action']}[/{action_style}]",
+                record["details"],
+                f"[{status_style}]{record['status']}[/{status_style}]"
+            )
+        
+        console.print("\n")
+        console.print(table)
+
     if len(ERROR_LIST) > 0:
         console.print(
             Panel(
@@ -169,7 +283,7 @@ def apply_mapper(choice: Optional[str] = None):
 def main_symlinks():
     console.print("")
     console.rule("[bold blue]🔗 CREATING SYMLINKS 🔗")
-    apply_mapper(choice="all")
+    apply_mapper(choice="all", prioritize_to_this=True)
 
 
 def main_profile():

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig/scripts/python/count_lines.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 
 from typing import TYPE_CHECKING
 from git import Repo
@@ -7,15 +6,12 @@ from datetime import datetime
 
 from pathlib import Path
 from rich.progress import track
-import polars as pl
-import plotly.graph_objects as go
-
-import plotly.express as px
 import typer
 
 
 if TYPE_CHECKING:
     from typing import Any, Dict, List, Optional, Union
+    import polars as pl
 
 
 app = typer.Typer()
@@ -110,6 +106,10 @@ def analyze_over_time(repo_path: str = typer.Argument(..., help="Path to the git
     except Exception as e:
         print(f"❌ Error analyzing commits: {str(e)}")
         return
+
+    import polars as pl
+    import plotly.graph_objects as go
+
     df = pl.DataFrame(commit_data)
     df = df.sort("dtmExit")
     # Create interactive plotly figure with dark theme and all bells and whistles
@@ -184,6 +184,10 @@ def analyze_over_time(repo_path: str = typer.Argument(..., help="Path to the git
 
 
 def _print_python_files_by_size_impl(repo_path: str) -> "Union[pl.DataFrame, Exception]":
+    import polars as pl
+    import plotly.graph_objects as go
+    import plotly.express as px
+
     try:
         import os
         if not os.path.exists(repo_path):

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig/scripts/python/count_lines_frontend.py

@@ -7,7 +7,7 @@ def analyze_repo_development(repo_path: str = typer.Argument(..., help="Path to
     from pathlib import Path
     count_lines_path = Path(count_lines.__file__).resolve().parent.joinpath("count_lines.py")
     # --project $HOME/code/machineconfig 
-    cmd = f"""uv run --python 3.13 --with machineconfig--group plot {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.13 --with machineconfig --group plot {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_script
     run_script(cmd)
 

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig/scripts/python/interactive.py

@@ -186,8 +186,8 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
 
     if "retrieve_repositories" in selected_options:
         console.print(Panel("📚 [bold bright_magenta]REPOSITORIES[/bold bright_magenta]\n[italic]Project code retrieval[/italic]", border_style="bright_magenta"))
-        from machineconfig.scripts.python import repos as module
-        module.main(directory=str(Path.home() / "code"), capture=True, cloud="odg1")
+        from machineconfig.scripts.python import repos
+        repos.clone(directory=str(Path.home() / "code"), cloud="odg1")
 
     if "retrieve_data" in selected_options:
         console.print(Panel("💾 [bold bright_cyan]DATA RETRIEVAL[/bold bright_cyan]\n[italic]Backup restoration[/italic]", border_style="bright_cyan"))

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig/scripts/python/repos.py

@@ -73,7 +73,7 @@ def all(
 
 
 @sync_app.command()
-def record(
+def capture(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
 ) -> None:
@@ -87,7 +87,7 @@ def record(
     if cloud is not None:
         PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
 @sync_app.command()
-def capture(
+def clone(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
 ) -> None:

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig/utils/links.py

@@ -2,11 +2,62 @@ from machineconfig.utils.path_extended import PathExtended, PLike
 from machineconfig.utils.accessories import randstr
 from rich.console import Console
 from rich.panel import Panel
-
+import hashlib
+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
+
+
+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"
+    ]
+    details: str
+
+
+def files_are_identical(file1: PathExtended, file2: PathExtended) -> bool:
+    """Check if two files are identical by comparing their SHA256 hashes."""
+    def get_file_hash(path: PathExtended) -> str:
+        hash_sha256 = hashlib.sha256()
+        with open(path, "rb") as f:
+            for chunk in iter(lambda: f.read(4096), b""):
+                hash_sha256.update(chunk)
+        return hash_sha256.hexdigest()
+    
+    try:
+        return get_file_hash(file1) == get_file_hash(file2)
+    except (OSError, IOError):
+        return False
+
+
 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.
@@ -33,12 +84,14 @@ def build_links(target_paths: list[tuple[PLike, str]], repo_root: PLike):
         links_path.symlink_to(target=a_target_path)
 
 
-def symlink_func(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool):
+def symlink_func(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool) -> SymlinkResult:
     """helper function. creates a symlink from `this` to `to_this`.
 
+    Returns a dict with 'action' and 'details' keys describing what was done.
+
     this: exists           AND    to_this exists            AND this is a symlink pointing to to_this              ===> Resolution: AUTO: do nothing, already linked correctly.
     this: exists           AND    to_this exists            AND this is a symlink pointing to somewhere else       ===> Resolution: AUTO: delete this symlink, create symlink to to_this
-    this: exists           AND    to_this exists            AND this is a concrete path                            ===> Resolution: DANGER: require user input to decide (param prioritize_to_this). Give two options: 1) prioritize `this`: to_this is backed up as to_this.orig_<randstr()>, to_this is deleted,  and symlink is created from this to to_this as normal; 2) prioritize `to_this`: `this` is backed up as this.orig_<randstr()>, `this` is deleted, and symlink is created from this to to_this as normal.
+    this: exists           AND    to_this exists            AND this is a concrete path                            ===> Resolution: DANGER: If files are identical (same hash), delete `this` and create symlink to `to_this`. Otherwise, two options: 1) prioritize `this`: to_this is backed up as to_this.orig_<randstr()>, to_this is deleted,  and symlink is created from this to to_this as normal; 2) prioritize `to_this`: `this` is backed up as this.orig_<randstr()>, `this` is deleted, and symlink is created from this to to_this as normal.
 
     this: exists           AND    to_this doesn't exist     AND this is a symlink pointing to somewhere else       ===> Resolution: AUTO: delete this symlink, create symlink to to_this (touch to_this)
     this: exists           AND    to_this doesn't exist     AND this is a symlink pointing to to_this              ===> Resolution: AUTO: delete this symlink, create symlink to to_this (touch to_this)
@@ -50,6 +103,9 @@ def symlink_func(this: PathExtended, to_this: PathExtended, prioritize_to_this:
     """
     this = PathExtended(this).expanduser().absolute()
     to_this = PathExtended(to_this).expanduser().absolute()
+    action_taken = ""
+    details = ""
+    
     # Case analysis based on docstring
     if this.exists():
         if to_this.exists():
@@ -58,33 +114,53 @@ def symlink_func(this: PathExtended, to_this: PathExtended, prioritize_to_this:
                 try:
                     if this.readlink().resolve() == to_this.resolve():
                         # Case: this exists AND to_this exists AND this is a symlink pointing to to_this
+                        action_taken = "already_linked"
+                        details = "Symlink already correctly points to target"
                         console.print(Panel(f"✅ ALREADY LINKED | {this} ➡️  {to_this}", title="Already Linked", expand=False))
-                        return
+                        return {"action": action_taken, "details": details}
                     else:
                         # Case: this exists AND to_this exists AND this is a symlink pointing to somewhere else
+                        action_taken = "relinking"
+                        details = "Updated existing symlink to point to new target"
                         console.print(Panel(f"🔄 RELINKING | Updating symlink from {this} ➡️  {to_this}", title="Relinking", expand=False))
                         this.delete(sure=True)
                 except OSError:
                     # Broken symlink case
+                    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 {this} ➡️  {to_this}", title="Fixing Broken Link", expand=False))
                     this.delete(sure=True)
             else:
                 # Case: this exists AND to_this exists AND this is a concrete path
-                if prioritize_to_this:
-                    # prioritize `to_this`: `this` is backed up, `this` is deleted, symlink created
-                    backup_name = f"{this}.orig_{randstr()}"
-                    console.print(Panel(f"📦 BACKING UP | Moving {this} to {backup_name}, prioritizing {to_this}", title="Backing Up", expand=False))
-                    this.move(path=backup_name)
+                if files_are_identical(this, to_this):
+                    # Files are identical, just delete this and create symlink
+                    action_taken = "identical_files"
+                    details = "Files identical, removed source and will create symlink"
+                    console.print(Panel(f"🔗 IDENTICAL FILES | Files are identical, deleting {this} and creating symlink to {to_this}", title="Identical Files", expand=False))
+                    this.delete(sure=True)
                 else:
-                    # prioritize `this`: to_this is backed up, to_this is deleted, this content moved to to_this location
-                    backup_name = f"{to_this}.orig_{randstr()}"
-                    console.print(Panel(f"📦 BACKING UP | Moving {to_this} to {backup_name}, prioritizing {this}", title="Backing Up", expand=False))
-                    to_this.move(path=backup_name)
-                    this.move(path=to_this)
+                    # Files are different, use prioritization logic
+                    if prioritize_to_this:
+                        # prioritize `to_this`: `this` is backed up, `this` is deleted, symlink created
+                        backup_name = f"{this}.orig_{randstr()}"
+                        action_taken = "backing_up_source"
+                        details = f"Backed up source to {backup_name}, prioritizing target"
+                        console.print(Panel(f"📦 BACKING UP | Moving {this} to {backup_name}, prioritizing {to_this}", title="Backing Up", expand=False))
+                        this.move(path=backup_name)
+                    else:
+                        # prioritize `this`: to_this is backed up, to_this is deleted, this content moved to to_this location
+                        backup_name = f"{to_this}.orig_{randstr()}"
+                        action_taken = "backing_up_target"
+                        details = f"Backed up target to {backup_name}, prioritizing source"
+                        console.print(Panel(f"📦 BACKING UP | Moving {to_this} to {backup_name}, prioritizing {this}", title="Backing Up", expand=False))
+                        to_this.move(path=backup_name)
+                        this.move(path=to_this)
         else:
             # to_this doesn't exist
             if this.is_symlink():
                 # Case: this exists AND to_this doesn't exist AND this is a symlink (pointing anywhere)
+                action_taken = "relinking_to_new_target"
+                details = "Removed existing symlink, will create target and new symlink"
                 console.print(Panel(f"🔄 RELINKING | Updating symlink from {this} ➡️  {to_this}", title="Relinking", expand=False))
                 this.delete(sure=True)
                 # Create to_this
@@ -92,70 +168,111 @@ def symlink_func(this: PathExtended, to_this: PathExtended, prioritize_to_this:
                 to_this.touch()
             else:
                 # Case: this exists AND to_this doesn't exist AND this is a concrete path
+                action_taken = "moving_to_target"
+                details = "Moved source to target location, will create symlink"
                 console.print(Panel(f"📁 MOVING | Moving {this} to {to_this}, then creating symlink", title="Moving", expand=False))
                 this.move(path=to_this)
     else:
         # this doesn't exist
         if to_this.exists():
             # Case: this doesn't exist AND to_this exists
+            action_taken = "new_link"
+            details = "Creating new symlink to existing target"
             console.print(Panel(f"🆕 NEW LINK | Creating new symlink from {this} ➡️  {to_this}", title="New Link", expand=False))
         else:
             # Case: this doesn't exist AND to_this doesn't exist
+            action_taken = "new_link_and_target"
+            details = "Creating target file and new symlink"
             console.print(Panel(f"🆕 NEW LINK & TARGET | Creating {to_this} and symlink from {this} ➡️  {to_this}", title="New Link & Target", expand=False))
             to_this.parent.mkdir(parents=True, exist_ok=True)
             to_this.touch()
+    
     # Create the symlink
     try:
+        action_taken = action_taken or "linking"
+        details = details or "Creating symlink"
         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)
+        return {"action": action_taken, "details": details}
     except Exception as ex:
+        action_taken = "error"
+        details = f"Failed to create symlink: {str(ex)}"
         console.print(Panel(f"❌ ERROR | Failed at linking {this} ➡️  {to_this}. Reason: {ex}", title="Error", expand=False))
+        return {"action": action_taken, "details": details}
 
 
-def symlink_copy(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool):
+def symlink_copy(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool) -> CopyResult:
     this = PathExtended(this).expanduser().absolute()
     to_this = PathExtended(to_this).expanduser().absolute()
+    action_taken = ""
+    details = ""
+    
     if this.exists():
         if to_this.exists():
             if this.is_symlink():
                 try:
                     if this.readlink().resolve() == to_this.resolve():
+                        action_taken = "already_linked"
+                        details = "Symlink already correctly points to target"
                         console.print(Panel(f"✅ ALREADY LINKED | {this} ➡️  {to_this}", title="Already Linked", expand=False))
-                        return
+                        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 {this} ➡️  {to_this}", title="Relinking", expand=False))
                         this.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 {this} ➡️  {to_this}", title="Fixing Broken Link", expand=False))
                     this.delete(sure=True)
             else:
                 if prioritize_to_this:
                     backup_name = f"{this}.orig_{randstr()}"
+                    action_taken = "backing_up_source"
+                    details = f"Backed up source to {backup_name}, prioritizing target"
                     console.print(Panel(f"📦 BACKING UP | Moving {this} to {backup_name}, prioritizing {to_this}", title="Backing Up", expand=False))
                     this.move(path=backup_name)
                 else:
                     backup_name = f"{to_this}.orig_{randstr()}"
+                    action_taken = "backing_up_target"
+                    details = f"Backed up target to {backup_name}, prioritizing source"
                     console.print(Panel(f"📦 BACKING UP | Moving {to_this} to {backup_name}, prioritizing {this}", title="Backing Up", expand=False))
                     to_this.move(path=backup_name)
                     this.move(path=to_this)
         else:
             if this.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 {this} ➡️  {to_this}", title="Relinking", expand=False))
                 this.delete(sure=True)
                 to_this.parent.mkdir(parents=True, exist_ok=True)
                 to_this.touch()
             else:
+                action_taken = "moving_to_target"
+                details = "Moved source to target location, will copy"
                 console.print(Panel(f"📁 MOVING | Moving {this} to {to_this}, then copying", title="Moving", expand=False))
                 this.move(path=to_this)
     else:
         if to_this.exists():
+            action_taken = "new_link"
+            details = "Copying existing target to source location"
             console.print(Panel(f"🆕 NEW LINK | Copying {to_this} to {this}", 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 {to_this} and copying to {this}", title="New Link & Target", expand=False))
             to_this.parent.mkdir(parents=True, exist_ok=True)
             to_this.touch()
+    
     try:
+        action_taken = action_taken or "copying"
+        details = details or "Copying file"
         console.print(Panel(f"📋 COPYING | Copying {to_this} to {this}", title="Copying", expand=False))
         to_this.copy(path=this, overwrite=True, verbose=True)
+        return {"action": action_taken, "details": details}
     except Exception as ex:
+        action_taken = "error"
+        details = f"Failed to copy file: {str(ex)}"
         console.print(Panel(f"❌ ERROR | Failed at copying {to_this} to {this}. Reason: {ex}", title="Error", expand=False))
+        return {"action": action_taken, "details": details}

{machineconfig-5.12 → machineconfig-5.13/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-5.12 → machineconfig-5.13}/src/machineconfig.egg-info/SOURCES.txt

@@ -88,10 +88,7 @@ src/machineconfig/jobs/linux/msc/lid.sh
 src/machineconfig/jobs/linux/msc/network.sh
 src/machineconfig/jobs/python/__init__.py
 src/machineconfig/jobs/python/check_installations.py
-src/machineconfig/jobs/python/create_bootable_media.py
-src/machineconfig/jobs/python/python_cargo_build_share.py
 src/machineconfig/jobs/python/python_ve_symlink.py
-src/machineconfig/jobs/python/tasks.py
 src/machineconfig/jobs/python/vscode/api.py
 src/machineconfig/jobs/python/vscode/sync_code.py
 src/machineconfig/jobs/windows/start_terminal.ps1

machineconfig-5.12/src/machineconfig/jobs/python/create_bootable_media.py

@@ -1,16 +0,0 @@
-# try ventory or netboot.xyz
-
-# # one can either install rufus: https://rufus.ie/en/
-# # however, to create bootable media with multiple OSs to choose from:
-
-# PathExtended(r'https://github.com/ventoy/Ventoy/archive/refs/tags/v1.0.78.zip').download().unzip().search[0]()
-# download_folder = PathExtended.home().joinpath("Downloads/os")
-# download_folder.mkdir(parents=True, exist_ok=True)
-# PathExtended(r'https://mirrors.layeronline.com/linuxmint/stable/21/linuxmint-21-cinnamon-64bit.iso').download(folder=download_folder)
-# download_folder2 = PathExtended.home().joinpath("Downloads/os")
-# download_folder2.mkdir(parents=True, exist_ok=True)
-# PathExtended(r'https://download.manjaro.org/kde/21.3.7/manjaro-kde-21.3.7-minimal-220816-linux515.iso').download(folder=download_folder2)
-
-
-# if __name__ == '__main__':
-#     pass