machineconfig 5.48__tar.gz → 5.50__tar.gz

{machineconfig-5.48/src/machineconfig.egg-info → machineconfig-5.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.48
+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.48 → machineconfig-5.50}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.48"
+version = "5.50"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -36,6 +36,7 @@ dependencies = [
     "questionary>=2.1.1",
     "typer-slim>=0.19.2",
     "euporie>=2.8.14",
+    "typer>=0.19.2",
 ]
 
 [project.optional-dependencies]

{machineconfig-5.48 → machineconfig-5.50}/src/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"

{machineconfig-5.48 → machineconfig-5.50}/src/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-5.48 → machineconfig-5.50}/src/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.48 → machineconfig-5.50/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.48
+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.48 → machineconfig-5.50}/src/machineconfig.egg-info/requires.txt

@@ -14,6 +14,7 @@ pyjson5>=1.6.9
 questionary>=2.1.1
 typer-slim>=0.19.2
 euporie>=2.8.14
+typer>=0.19.2
 
 [plot]
 duckdb-engine>=0.17.0