maketool 0.8.21__tar.gz → 0.8.23__tar.gz

{maketool-0.8.21 → maketool-0.8.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maketool
-Version: 0.8.21
+Version: 0.8.23
 Summary: Python Automation tool for building PySide6 UI and PyInstaller EXE.
 Author-email: Alan Lilly <panofish@gmail.com>
 Requires-Python: >=3.7

{maketool-0.8.21 → maketool-0.8.23}/maketool/sublime.py

@@ -161,6 +161,30 @@ def _upsert_keybindings(existing: list[dict], updates: list[dict]) -> list[dict]
             out.append(upd)
     return out
 
+def _prune_maketool_bindings(existing: list[dict], maketool: list[dict]) -> list[dict]:
+    """
+    Remove existing bindings that represent the same maketool intent
+    (command + args.variant), regardless of key.
+    """
+    def intent(item: dict) -> tuple:
+        return (
+            item.get("command"),
+            (item.get("args") or {}).get("variant")
+        )
+
+    maketool_intents = {intent(m) for m in maketool}
+
+    out = []
+    for item in existing:
+        if not isinstance(item, dict):
+            out.append(item)
+            continue
+        if intent(item) in maketool_intents:
+            continue
+        out.append(item)
+
+    return out
+
 
 def process(user_packages_dir: str) -> None:
     os.makedirs(user_packages_dir, exist_ok=True)
@@ -207,7 +231,11 @@ def process(user_packages_dir: str) -> None:
     ]
 
     existing_keymap = _load_json_or_empty(keymap_file_path)
-    new_keymap = _upsert_keybindings(existing_keymap, maketool_bindings)
+    existing_keymap = _prune_maketool_bindings(
+        existing_keymap,
+        maketool_bindings
+    )
+    new_keymap = _upsert_keybindings(existing_keymap, maketool_bindings)    
 
     # _backup(keymap_file_path)
 

{maketool-0.8.21 → maketool-0.8.23}/maketool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maketool
-Version: 0.8.21
+Version: 0.8.23
 Summary: Python Automation tool for building PySide6 UI and PyInstaller EXE.
 Author-email: Alan Lilly <panofish@gmail.com>
 Requires-Python: >=3.7

{maketool-0.8.21 → maketool-0.8.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "maketool"
-version = "0.8.21"
+version = "0.8.23"
 description = "Python Automation tool for building PySide6 UI and PyInstaller EXE."
 authors = [{ name = "Alan Lilly", email = "panofish@gmail.com" }]
 readme = "README.md"