hyprconf2lua 1.2.1__tar.gz → 1.3.1__tar.gz

{hyprconf2lua-1.2.1/src/hyprconf2lua.egg-info → hyprconf2lua-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyprconf2lua
-Version: 1.2.1
+Version: 1.3.1
 Summary: Convert Hyprland hyprlang .conf files to Lua .lua config format (v0.55+)
 Author: hyprconf2lua contributors
 License: MIT

{hyprconf2lua-1.2.1 → hyprconf2lua-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyprconf2lua"
-version = "1.2.1"
+version = "1.3.1"
 description = "Convert Hyprland hyprlang .conf files to Lua .lua config format (v0.55+)"
 readme = "README.md"
 license = {text = "MIT"}

hyprconf2lua-1.3.1/src/hyprconf2lua/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.3.1"

{hyprconf2lua-1.2.1 → hyprconf2lua-1.3.1}/src/hyprconf2lua/codegen.py

@@ -51,7 +51,7 @@ class Codegen:
 
     def generate(self, config: ConfigFile) -> str:
         self.lines = []
-        self.emit("-- Generated by hyprconf2lua v1.2.1")
+        self.emit("-- Generated by hyprconf2lua v1.3.1")
         self.emit("-- https://github.com/yourusername/hyprconf2lua")
         self.emit("-- Manual review may be needed for complex directives")
         self.emit("")
@@ -222,6 +222,53 @@ class Codegen:
             self.emit("end)")
             self.emit("")
 
+    def _is_gradient(self, val: str) -> bool:
+        parts = val.strip().split()
+        if len(parts) < 3:
+            return False
+        angle = parts[-1]
+        if not angle.endswith("deg"):
+            return False
+        try:
+            float(angle[:-3])
+        except ValueError:
+            return False
+        return True
+
+    def _format_gradient(self, val: str) -> str:
+        parts = val.strip().split()
+        angle = parts[-1][:-3]
+        colors = [self.to_lua_val(p) for p in parts[:-1]]
+        return f"{{ colors = {{ {', '.join(colors)} }}, angle = {angle} }}"
+
+    def _emit_directive(self, key: str, values: List[str]):
+        if len(values) == 1 and self._is_gradient(values[0]):
+            self.translated_count += 1
+            self.emit(f"{key} = {self._format_gradient(values[0])},")
+        elif len(values) == 1:
+            self.translated_count += 1
+            val = self.to_lua_val(values[0])
+            self.emit(f"{key} = {val},")
+        else:
+            self.translated_count += 1
+            vals = [self.to_lua_val(v) for v in values]
+            self.emit(f"{key} = {{ {', '.join(vals)} }},")
+
+    def _group_section_body(self, directives: List[BlockStmt]) -> List[BlockStmt]:
+        grouped: List[BlockStmt] = []
+        dot_groups = {}
+        for d in directives:
+            if isinstance(d, Directive) and "." in d.key:
+                prefix, suffix = d.key.split(".", 1)
+                if prefix not in dot_groups:
+                    dot_groups[prefix] = []
+                dot_groups[prefix].append(Directive(suffix, d.value, d.line, d.col))
+            else:
+                grouped.append(d)
+        for prefix, subs in dot_groups.items():
+            grouped.append(Section(prefix, subs, 0))
+        return grouped
+
     def emit_section_config(self, section_name: str, directives: List[BlockStmt]):
         if not directives:
             return
@@ -231,7 +278,7 @@ class Codegen:
         self.emit(f"{section_name} = {{")
         self.indent()
 
-        for d in directives:
+        for d in self._group_section_body(directives):
             if isinstance(d, Comment):
                 self.emit(f"--{d.text[1:]}")
             elif isinstance(d, Section):
@@ -242,14 +289,7 @@ class Codegen:
                     if isinstance(sd, Comment):
                         self.emit(f"--{sd.text[1:]}")
                     elif isinstance(sd, Directive):
-                        self.translated_count += 1
-                        key = sd.key
-                        if len(sd.value) == 1:
-                            val = self.to_lua_val(sd.value[0])
-                            self.emit(f"{key} = {val},")
-                        else:
-                            vals = [self.to_lua_val(v) for v in sd.value]
-                            self.emit(f"{key} = {{ {', '.join(vals)} }},")
+                        self._emit_directive(sd.key, sd.value)
                     elif isinstance(sd, Section):
                         self.passthrough_count += 1
                         self.emit(f"-- Nested subsection {sd.name}:")
@@ -261,14 +301,7 @@ class Codegen:
                 self.dedent()
                 self.emit("},")
             elif isinstance(d, Directive):
-                self.translated_count += 1
-                key = d.key
-                if len(d.value) == 1:
-                    val = self.to_lua_val(d.value[0])
-                    self.emit(f"{key} = {val},")
-                else:
-                    vals = [self.to_lua_val(v) for v in d.value]
-                    self.emit(f"{key} = {{ {', '.join(vals)} }},")
+                self._emit_directive(d.key, d.value)
 
         self.dedent()
         self.emit("},")
@@ -322,6 +355,15 @@ class Codegen:
             if not has_plugins:
                 self.emit("-- TODO: manual review (plugin config)")
             return
+        if stmt.name == "device":
+            name = ""
+            body = []
+            for child in stmt.body:
+                if isinstance(child, Directive) and child.key == "name":
+                    name = child.value[0] if child.value else ""
+                else:
+                    body.append(child)
+            return self.visit(DeviceSection(name, body, stmt.line))
         if stmt.name in KNOWN_SECTIONS:
             self.emit_section_config(stmt.name, stmt.body)
         else:
@@ -330,17 +372,11 @@ class Codegen:
             self.indent()
             self.emit(f"{stmt.name} = {{")
             self.indent()
-            for child in stmt.body:
+            for child in self._group_section_body(stmt.body):
                 if isinstance(child, Comment):
                     self.emit(f"--{child.text[1:]}")
                 elif isinstance(child, Directive):
-                    k = child.key
-                    if len(child.value) == 1:
-                        v = self.to_lua_val(child.value[0])
-                        self.emit(f"{k} = {v},")
-                    else:
-                        vals = [self.to_lua_val(v) for v in child.value]
-                        self.emit(f"{k} = {{ {', '.join(vals)} }},")
+                    self._emit_directive(child.key, child.value)
             self.dedent()
             self.emit("},")
             self.dedent()
@@ -470,8 +506,12 @@ class Codegen:
         if dispatcher in DISPATCHER_MAP:
             func, needs_args = DISPATCHER_MAP[dispatcher]
 
+            if dispatcher == "movetoworkspace":
+                args = self.build_dispatcher_args(params, needs_args, func)
+                return f'{func}({args})'
+
             if dispatcher == "movetoworkspacesilent":
-                args = self.build_dispatcher_args(params, needs_args)
+                args = self.build_dispatcher_args(params, needs_args, func)
                 return f'{func}({args}, {{ follow = false }})'
 
             if dispatcher == "movefocus":
@@ -535,7 +575,7 @@ class Codegen:
                 resolved = self.resolve_val(params[0]) if params else ""
                 return f'{func}({self.quote(resolved)})'
 
-            args = self.build_dispatcher_args(params, needs_args)
+            args = self.build_dispatcher_args(params, needs_args, func)
             return f'{func}({args})' if needs_args else f'{func}()'
 
         if dispatcher == "mouse":

{hyprconf2lua-1.2.1 → hyprconf2lua-1.3.1}/src/hyprconf2lua/mappings.py

@@ -51,6 +51,7 @@ DISPATCHER_MAP = {
     "moveoutofgroup":    ("hl.dsp.window.move", True),
     "focusurgentorlast": ("hl.dsp.focus", True),
     "focusonemonitor":   ("hl.dsp.focus", True),
+    "forcekillactive":   ("hl.dsp.window.kill", False),
 }
 
 BIND_FLAGS_TO_OPTIONS = {

{hyprconf2lua-1.2.1 → hyprconf2lua-1.3.1}/src/hyprconf2lua/parser.py

@@ -302,7 +302,7 @@ class Parser:
             params = [cmd] if cmd else []
         else:
             params = [v.strip() for v in values[3:]]
-        mods = [m.strip() for m in mods_str.replace(",", " ").split()] if mods_str else []
+        mods = [m.strip() for m in mods_str.replace(",", " ").split() if m.strip() and m.strip() != "&"] if mods_str else []
         return BindDirective(mods, key, dispatcher, params, flags, line)
 
     def parse_monitor(self, line: int) -> MonitorDirective:
@@ -344,15 +344,42 @@ class Parser:
                         break
                 key = ":".join(key_parts)
 
-                self.expect("EQUALS")
-                val = self.parse_value_rest()
-
-                if key == "name":
-                    name = val
-                elif key.startswith("match:"):
-                    match[key[len("match:"):]] = val
+                if key == "match" and self.peek().type == "BLOCK_OPEN":
+                    self.advance()
+                    self.skip_newlines()
+                    while self.peek().type not in ("BLOCK_CLOSE", "EOF"):
+                        t2 = self.peek()
+                        if t2.type == "COMMENT":
+                            self.advance()
+                        elif t2.type == "IDENT":
+                            mk_parts = [self.advance().value]
+                            while self.peek().type == "COLON":
+                                self.advance()
+                                if self.peek().type == "IDENT":
+                                    mk_parts.append(self.advance().value)
+                                else:
+                                    break
+                            mk_key = ":".join(mk_parts)
+                            self.expect("EQUALS")
+                            mk_val = self.parse_value_rest()
+                            if mk_key.startswith("match:"):
+                                match[mk_key[len("match:"):]] = mk_val
+                            else:
+                                match[mk_key] = mk_val
+                        else:
+                            self.advance()
+                        self.skip_newlines()
+                    self.expect("BLOCK_CLOSE")
                 else:
-                    effects[key] = [val]
+                    self.expect("EQUALS")
+                    val = self.parse_value_rest()
+
+                    if key == "name":
+                        name = val
+                    elif key.startswith("match:"):
+                        match[key[len("match:"):]] = val
+                    else:
+                        effects[key] = [val]
             else:
                 self.advance()
             self.skip_newlines()

{hyprconf2lua-1.2.1 → hyprconf2lua-1.3.1/src/hyprconf2lua.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyprconf2lua
-Version: 1.2.1
+Version: 1.3.1
 Summary: Convert Hyprland hyprlang .conf files to Lua .lua config format (v0.55+)
 Author: hyprconf2lua contributors
 License: MIT

{hyprconf2lua-1.2.1 → hyprconf2lua-1.3.1}/tests/test_converter.py

@@ -528,6 +528,77 @@ def test_bracket_in_windowrule_params():
     assert result.success
 
 
+def test_forcekillactive_dispatcher():
+    result = convert('bind = SUPER, Q, forcekillactive\n')
+    assert result.success
+    assert "hl.dsp.window.kill" in result.lua
+
+
+def test_ampersand_in_bind_mods():
+    result = convert('bind = $mainMod & SHIFT & A, exec, kitty\n')
+    assert result.success
+    assert "hl.bind" in result.lua
+    assert "&" not in result.lua.split("hl.bind")[-1].split("hl.dsp")[0]
+
+
+def test_ampersand_in_bind_mods_nospace():
+    result = convert('bind = $mainMod&$SHIFT&A, exec, kitty\n')
+    assert result.success
+
+
+def test_device_without_prefix():
+    result = convert('device {\n    name = razer-cobra-pro\n    sensitivity = 0.0\n}\n')
+    assert result.success
+    assert "hl.device" in result.lua
+    assert "razer-cobra-pro" in result.lua
+
+
+def test_gradient_conversion():
+    result = convert('general {\n    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg\n}\n')
+    assert result.success
+    assert "colors" in result.lua
+    assert "angle = 45" in result.lua
+
+
+def test_col_dot_prefix_grouped():
+    result = convert('general {\n    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg\n    col.inactive_border = rgba(595959aa)\n    gaps_in = 5\n}\n')
+    assert result.success
+    assert result.lua.count("col = {") == 1
+
+
+def test_match_block_in_windowrule():
+    result = convert('windowrule {\n  name = my-rule\n  float = on\n  match {\n    class = .*\n    title = my-window\n  }\n}\n')
+    assert result.success
+    assert "class = \".*\"" in result.lua
+    assert "title = \"my-window\"" in result.lua
+    assert "float = true" in result.lua
+
+
+def test_match_block_in_windowrulev2():
+    result = convert('windowrulev2 {\n  name = v2-match\n  opacity = 0.9 0.8\n  match {\n    class = (kitty)\n  }\n}\n')
+    assert result.success
+    assert "class = \"(kitty)\"" in result.lua
+    assert "opacity = { 0.9, 0.8 }" in result.lua
+
+
+def test_match_block_in_layerrule():
+    result = convert('layerrule {\n  name = my-layer\n  blur = true\n  match {\n    namespace = rofi\n  }\n}\n')
+    assert result.success
+    assert "namespace" in result.lua
+
+
+def test_movetoworkspace_conversion():
+    result = convert('bind = $mainMod SHIFT, 1, movetoworkspace, 1\n')
+    assert result.success
+    assert "workspace = 1" in result.lua
+
+
+def test_movetoworkspacesilent_conversion():
+    result = convert('bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1\n')
+    assert result.success
+    assert "workspace = 1" in result.lua
+
+
 if __name__ == "__main__":
     test_lexer_basic()
     test_lexer_comment()
@@ -574,4 +645,15 @@ if __name__ == "__main__":
     test_bracket_in_workspace()
     test_bracket_in_exec_on()
     test_bracket_in_windowrule_params()
+    test_forcekillactive_dispatcher()
+    test_ampersand_in_bind_mods()
+    test_ampersand_in_bind_mods_nospace()
+    test_device_without_prefix()
+    test_gradient_conversion()
+    test_col_dot_prefix_grouped()
+    test_match_block_in_windowrule()
+    test_match_block_in_windowrulev2()
+    test_match_block_in_layerrule()
+    test_movetoworkspace_conversion()
+    test_movetoworkspacesilent_conversion()
     print("All tests passed!")

hyprconf2lua-1.2.1/src/hyprconf2lua/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.2.1"