machineconfig 5.47__py3-none-any.whl → 5.50__py3-none-any.whl

machineconfig/profile/create_helper.py

@@ -16,10 +16,20 @@ def copy_assets_to_machine(which: Literal["scripts", "settings"]):
         case "scripts":
             source = LIBRARY_ROOT.joinpath("scripts", system)
             target = CONFIG_ROOT.joinpath("scripts", system)
+
         case "settings":
             source = LIBRARY_ROOT.joinpath("settings")
             target = CONFIG_ROOT.joinpath("settings")
     from machineconfig.utils.path_extended import PathExtended
     PathExtended(source).copy(folder=target.parent, overwrite=True)
+    import platform
+    system = platform.system().lower()
+    if system == "linux" and which == "scripts":
+        import subprocess
+        from rich.console import Console
+        console = Console()
+        console.print("\n[bold]📜 Setting executable permissions for scripts...[/bold]")
+        subprocess.run(f"chmod +x {CONFIG_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
+        console.print("[green]✅ Script permissions updated[/green]")
 
 

machineconfig/profile/create_links.py

@@ -28,14 +28,6 @@ SYSTEM = system.lower()
 console = Console()
 
 
-def get_other_systems(current_system: str) -> list[str]:
-    all_systems = ["linux", "windows", "darwin"]
-    return [s for s in all_systems if s != current_system.lower()]
-
-
-OTHER_SYSTEMS = get_other_systems(SYSTEM)
-
-
 class Base(TypedDict):
     this: str
     to_this: str
@@ -54,7 +46,19 @@ def read_mapper() -> MapperFileData:
     mapper_data: dict[str, dict[str, Base]] = tomllib.loads(LIBRARY_ROOT.joinpath("profile/mapper.toml").read_text(encoding="utf-8"))
     public: dict[str, list[ConfigMapper]] = {}
     private: dict[str, list[ConfigMapper]] = {}
+    # def get_other_systems(current_system: str) -> list[str]:
+    #     all_systems = ["linux", "windows", "darwin"]
+    #     return [s for s in all_systems if s != current_system.lower()]
+    # OTHER_SYSTEMS = get_other_systems(SYSTEM)
     for program_key, program_map in mapper_data.items():
+        parts = program_key.split("_")
+        if len(parts) > 1:
+            if parts[-1].lower() == "windows" and SYSTEM != "windows":
+                # console.print(f"Skipping Windows-only program mapping: {program_key}")
+                continue
+            elif parts[-1].lower() == "linux" and SYSTEM == "windows":
+                # console.print(f"Skipping Linux-only program mapping: {program_key}")
+                continue
         for file_name, file_base in program_map.items():
             file_map: ConfigMapper = {
                 "file_name": file_name,
@@ -79,7 +83,9 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
                  method: Literal["symlink", "copy"]
                  ):
     operation_records: list[OperationRecord] = []
-
+    print(f"Working with {len(mapper_data)} programs from mapper data.")
+    if len(mapper_data) == 1:
+        print(mapper_data)
     import os
     if os.name == "nt":
         import ctypes
@@ -102,17 +108,14 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
                 )
             )
             raise RuntimeError("Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
-
     for program_name, program_files in mapper_data.items():
         console.rule(f"🔄 Processing [bold]{program_name}[/] symlinks", style="cyan")
         for a_mapper in program_files:
             config_file_default_path = PathExtended(a_mapper["config_file_default_path"])
             self_managed_config_file_path = PathExtended(a_mapper["self_managed_config_file_path"].replace("CONFIG_ROOT", CONFIG_ROOT.as_posix()))
-            
             # Determine whether to use copy or symlink
             use_copy = method == "copy" or a_mapper.get("copy", False)
-            
-            if "contents" in a_mapper:
+            if "contents" in a_mapper and a_mapper["contents"]:
                 targets = list(self_managed_config_file_path.expanduser().search("*"))
                 for a_target in targets:
                     operation_type = "contents_copy" if use_copy else "contents_symlink"
@@ -213,11 +216,6 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
                     ERROR_LIST.append(e)
                     console.print(f"❌ [red]Error setting SSH permissions[/red]: {e}")
 
-    if system == "Linux":
-        console.print("\n[bold]📜 Setting executable permissions for scripts...[/bold]")
-        subprocess.run(f"chmod +x {CONFIG_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")

machineconfig/profile/mapper.toml

@@ -167,10 +167,10 @@ config = {this = '~/.config/pudb/pudb.cfg', to_this = 'CONFIG_ROOT/settings/pudb
 # AllUsersAllHosts = {this = 'C:\Windows\System32\WindowsPowerShell\v1.0\profile.ps1', to_this = '~/dotfiles/shells/windows_powershell/AllUsersAllHosts/profile.ps1'}
 
 [pwsh_windows]
-CurrentUserCurrentHost = {this = '~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
-CurrentUserAllHosts = {this = '~/Documents/PowerShell/profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/profile.ps1'}
-AllUsersCurrentHost = {this = 'C:\Program Files\PowerShell\7\Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
-AllUsersAllHosts = {this = 'C:\Program Files\PowerShell\7\profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
+# CurrentUserCurrentHost = {this = '~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
+# CurrentUserAllHosts = {this = '~/Documents/PowerShell/profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/profile.ps1'}
+# AllUsersCurrentHost = {this = 'C:\Program Files\PowerShell\7\Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
+# AllUsersAllHosts = {this = 'C:\Program Files\PowerShell\7\profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
 
 [nushell_windows]
 config = {this = '~/AppData/Roaming/nushell/config.nu', to_this = 'CONFIG_ROOT/settings/shells/nushell/config.nu'}

machineconfig/scripts/python/interactive.py

@@ -51,9 +51,8 @@ def display_header() -> None:
     ╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
     """
 
-    import machineconfig
     version = get_machineconfig_version()
-    title = f"✨ MACHINE CONFIGURATION v{version}, @ {machineconfig.__file__} ✨"
+    title = f"✨ MACHINE CONFIGURATION v{version} ✨"
     subtitle = "🎯 Your digital life manager. Dotfiles, data, code and more."
     bug_report = "🐛 Please report bugs to Alex Al-Saffar @ https://github.com/thisismygitrepo/machineconfig"
 

{machineconfig-5.47.dist-info → machineconfig-5.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.47
+Version: 5.50
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -27,6 +27,7 @@ Requires-Dist: pyjson5>=1.6.9
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: euporie>=2.8.14
+Requires-Dist: typer>=0.19.2
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: plot

{machineconfig-5.47.dist-info → machineconfig-5.50.dist-info}/RECORD

@@ -94,11 +94,11 @@ machineconfig/jobs/windows/msc/cli_agents.ps1,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 machineconfig/profile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/profile/backup.toml,sha256=Hb25sIdKVvLqOF62NgiOpGZxd45I6IhsNHu623RtfQQ,766
 machineconfig/profile/bash_shell_profiles.md,sha256=mio0xkMTwO-F3fikWIfgcdQaPCmQrmkxJMNtZsTe9TI,514
-machineconfig/profile/create_helper.py,sha256=IKUspFNg4LDeQO4t3elt9rI9Hhi8b37ZHqBkyBNU6Qk,1018
-machineconfig/profile/create_links.py,sha256=yBqfcujukllbHI1P8M5XDbLXMZ_gb38ZvQK901EPbaA,13962
+machineconfig/profile/create_helper.py,sha256=_iNeuwmcEGTx6sf_f40JKHfOCuJRZQRpyE8Fo_3Q6bI,1519
+machineconfig/profile/create_links.py,sha256=K7T2bq08GZP9fo2NzCOE0pojAgQDe0Ofe7fNfbQlQpw,14219
 machineconfig/profile/create_links_export.py,sha256=OEmuJE-F7FZX5xvOl1rqJzHg_BWtPKCiWdrq4RPOobs,3173
 machineconfig/profile/create_shell_profile.py,sha256=ifsEAK90ovvY7ftyxuY5-Xh8f2JuQYX7IMYUXp6x2Sw,9538
-machineconfig/profile/mapper.toml,sha256=oXWCWF8yyVHC8FncFqTPiRGgdHAhgGbpS4tYAjKlw3I,12886
+machineconfig/profile/mapper.toml,sha256=_zy_Og2cSFeFDISHCInKm7ReZUNCbwibNHYwr0TY01E,12894
 machineconfig/profile/records/generic/shares.toml,sha256=FduDztfyQtZcr5bfx-RSKhEEweweQSWfVXkKWnx8hCY,143
 machineconfig/profile/records/linux/apps_summary_report.csv,sha256=pw9djvaRUPalKDLn2sl3odcbD2_Zx3aEupsQ8UPfaaY,2738
 machineconfig/profile/records/linux/apps_summary_report.md,sha256=l77oofA6Rliql0ZgKGIZi8bstFoGyyGTxeS8p2PtOj0,5634
@@ -127,7 +127,7 @@ machineconfig/scripts/python/devops.py,sha256=SilJAQXAPBKXjF91zcpJV9YRS721M5UPbX
 machineconfig/scripts/python/devops_navigator.py,sha256=JYRKB8pVK5gyxcsrEYPC4IvUeX7rP4eMIkaattt8_t0,35090
 machineconfig/scripts/python/fire_jobs.py,sha256=l2qByVK2rxWDUGFliU3HYwrtAI1XsUvOtcGLX4DUA5U,13689
 machineconfig/scripts/python/ftpx.py,sha256=dFFCRKygZvNXkkwpo6vZgJmUv7buTNoVLLKT9wNp0Wc,9323
-machineconfig/scripts/python/interactive.py,sha256=jgnvCAhk5_D60skraQBIqJzH6v8ULvN5Jq420z3TOWQ,11831
+machineconfig/scripts/python/interactive.py,sha256=IRveYja_9omEEhRyM1M6_SlljPY2Eo_GGoK9tTi1nsk,11778
 machineconfig/scripts/python/sessions.py,sha256=lO_aTnh7T05XoCa8Ox-ROAWBKMtbo-DZzlFDUqzSipM,8716
 machineconfig/scripts/python/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/ai/generate_files.py,sha256=Vfjgd0skJu-WTgqUxmOVFzaNMfSFBaFmY5oGGVY7MZY,2860
@@ -403,8 +403,8 @@ machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=Xbi59rU35AzR
 machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoSpdmTIdgS9LS-RvE-QZ-D260tD3o,1214
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-5.47.dist-info/METADATA,sha256=qQlk_75QfjpJwXdd1X07K2Lxsthyie6TtawEv1i3m04,3111
-machineconfig-5.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-5.47.dist-info/entry_points.txt,sha256=z7b9guivf0GSKUG6b8ALgbDoRg2LuPfkGP_p-PxgX9g,469
-machineconfig-5.47.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-5.47.dist-info/RECORD,,
+machineconfig-5.50.dist-info/METADATA,sha256=WQMZNGnUR152bdVtttdXTR4DOHRI06xEgYpAZ95vtRw,3140
+machineconfig-5.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-5.50.dist-info/entry_points.txt,sha256=z7b9guivf0GSKUG6b8ALgbDoRg2LuPfkGP_p-PxgX9g,469
+machineconfig-5.50.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-5.50.dist-info/RECORD,,