hyprconf2lua 1.3.0__tar.gz → 1.3.1__tar.gz

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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyprconf2lua"
-version = "1.3.0"
+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.3.0 → 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.3.0")
+        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("")
@@ -506,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":
@@ -571,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.3.0 → hyprconf2lua-1.3.1}/src/hyprconf2lua/parser.py

@@ -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.3.0 → hyprconf2lua-1.3.1/src/hyprconf2lua.egg-info}/PKG-INFO

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

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

@@ -563,10 +563,42 @@ def test_gradient_conversion():
 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
-    # Both col.* keys should be grouped under one 'col' section
     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()
@@ -619,4 +651,9 @@ if __name__ == "__main__":
     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.3.0/src/hyprconf2lua/__init__.py

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