hyprconf2lua 1.3.2__tar.gz → 1.4.0__tar.gz

{hyprconf2lua-1.3.2/src/hyprconf2lua.egg-info → hyprconf2lua-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyprconf2lua
-Version: 1.3.2
+Version: 1.4.0
 Summary: Convert Hyprland hyprlang .conf files to Lua .lua config format (v0.55+)
 Author: hyprconf2lua contributors
 License: MIT
@@ -17,6 +17,8 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
 
 # hyprconf2lua

{hyprconf2lua-1.3.2 → hyprconf2lua-1.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyprconf2lua"
-version = "1.3.2"
+version = "1.4.0"
 description = "Convert Hyprland hyprlang .conf files to Lua .lua config format (v0.55+)"
 readme = "README.md"
 license = {text = "MIT"}
@@ -23,6 +23,9 @@ classifiers = [
     "Topic :: Utilities",
 ]
 
+[project.optional-dependencies]
+dev = ["pytest"]
+
 [project.urls]
 Homepage = "https://github.com/Prateek-squadron/hyprconf2lua"
 Repository = "https://github.com/Prateek-squadron/hyprconf2lua"

hyprconf2lua-1.4.0/src/hyprconf2lua/__init__.py

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

{hyprconf2lua-1.3.2 → hyprconf2lua-1.4.0}/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.2")
+        self.emit("-- Generated by hyprconf2lua v1.4.0")
         self.emit("-- https://github.com/Prateek-squadron/hyprconf2lua")
         self.emit("-- Manual review may be needed for complex directives")
         self.emit("")
@@ -550,6 +550,16 @@ class Codegen:
                     return f'{func}({{ forward = false }})'
                 return f'{func}({{ forward = true }})'
 
+            if dispatcher == "moveintogroup":
+                if params:
+                    dir_map = {"l": "left", "r": "right", "u": "up", "d": "down"}
+                    d = dir_map.get(params[0], params[0])
+                    return f'{func}({{ into_group = "{d}" }})'
+                return None
+
+            if dispatcher == "moveoutofgroup":
+                return f'{func}({{ out_of_group = true }})'
+
             if dispatcher == "workspace":
                 return self.build_workspace_dispatcher(func, params)
 
@@ -565,12 +575,6 @@ class Codegen:
             if dispatcher == "focusonemonitor":
                 return f'{func}({{ on_monitor = true }})'
 
-            if dispatcher == "mouse":
-                mouse_actions = {"272": "drag", "273": "resize"}
-                if params and params[0] in mouse_actions:
-                    return f'hl.dsp.window.{mouse_actions[params[0]]}()'
-                return None
-
             if dispatcher in ("exec", "execr"):
                 resolved = self.resolve_val(params[0]) if params else ""
                 return f'{func}({self.quote(resolved)})'
@@ -584,16 +588,6 @@ class Codegen:
                 return f'hl.dsp.window.{mouse_actions[params[0]]}()'
             return None
 
-        if dispatcher in ("moveintogroup",):
-            if params:
-                dir_map = {"l": "left", "r": "right", "u": "up", "d": "down"}
-                d = dir_map.get(params[0], params[0])
-                return f'hl.dsp.window.move({{ into_group = "{d}" }})'
-            return None
-
-        elif dispatcher in ("moveoutofgroup",):
-            return f'hl.dsp.window.move({{ out_of_group = true }})'
-
         return None
 
     def build_workspace_dispatcher(self, func: str, params: List[str]) -> str:
@@ -835,7 +829,6 @@ class Codegen:
             return
 
         self.emit(f'-- source = {path} -> requires manual conversion')
-        home_relative = path.replace("~", "").replace(os_path := "", ".hypr/")
 
         import os as _os
         just_name = _os.path.splitext(_os.path.basename(path))[0]

{hyprconf2lua-1.3.2 → hyprconf2lua-1.4.0}/src/hyprconf2lua/mappings.py

@@ -75,8 +75,6 @@ WINDOW_RULE_MAP = {
     "noshadow":     ("shadow", "false"),
     "noanim":       ("no_anim", "true"),
     "dimaround":    ("dim_around", "true"),
-    "noblur":       ("blur", "false"),
-    "noshadow":     ("shadow", "false"),
     "nomaxsize":    ("max_size", "false"),
     "fakefullscreen": ("fake_fullscreen", "true"),
     "noinitialfocus": ("no_initial_focus", "true"),
@@ -96,7 +94,6 @@ WINDOW_RULE_PARAM_MAP = {
     "size":         ("size", True),
     "minsize":      ("min_size", True),
     "maxsize":      ("max_size", True),
-    "maxsize":      ("max_size", True),
     "idleinhibit":  ("idle_inhibit", True),
     "xray":         ("xray", True),
     "center":       ("center", True),

{hyprconf2lua-1.3.2 → hyprconf2lua-1.4.0}/src/hyprconf2lua/parser.py

@@ -172,6 +172,23 @@ class Parser:
         current = []
         while self.peek().type not in ("NEWLINE", "EOF") and \
               self.peek().type != "COMMENT":
+            if self.peek().type == "BLOCK_CLOSE":
+                break
+            if self.peek().type == "BLOCK_OPEN":
+                self.advance()
+                current.append("{")
+                depth = 1
+                while depth > 0 and self.peek().type not in ("EOF", "NEWLINE"):
+                    t = self.advance()
+                    if t.type == "BLOCK_OPEN":
+                        depth += 1
+                    elif t.type == "BLOCK_CLOSE":
+                        depth -= 1
+                    if depth > 0:
+                        current.append(t.value)
+                if depth == 0:
+                    current.append("}")
+                continue
             if self.peek().type == "COMMA":
                 self.advance()
                 values.append(self._join_tokens(current))

{hyprconf2lua-1.3.2 → hyprconf2lua-1.4.0/src/hyprconf2lua.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyprconf2lua
-Version: 1.3.2
+Version: 1.4.0
 Summary: Convert Hyprland hyprlang .conf files to Lua .lua config format (v0.55+)
 Author: hyprconf2lua contributors
 License: MIT
@@ -17,6 +17,8 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
 
 # hyprconf2lua

{hyprconf2lua-1.3.2 → hyprconf2lua-1.4.0}/src/hyprconf2lua.egg-info/SOURCES.txt

@@ -14,5 +14,6 @@ src/hyprconf2lua.egg-info/PKG-INFO
 src/hyprconf2lua.egg-info/SOURCES.txt
 src/hyprconf2lua.egg-info/dependency_links.txt
 src/hyprconf2lua.egg-info/entry_points.txt
+src/hyprconf2lua.egg-info/requires.txt
 src/hyprconf2lua.egg-info/top_level.txt
 tests/test_converter.py

hyprconf2lua-1.4.0/src/hyprconf2lua.egg-info/requires.txt

@@ -0,0 +1,3 @@
+
+[dev]
+pytest

{hyprconf2lua-1.3.2 → hyprconf2lua-1.4.0}/tests/test_converter.py

@@ -88,14 +88,11 @@ def test_lexer_variable():
 
 
 def test_lexer_error():
+    from hyprconf2lua.lexer import LexerError
     import pytest
-    try:
-        from hyprconf2lua.lexer import LexerError
-    except ImportError:
-        pytest.skip("need pytest")
 
     with pytest.raises(LexerError):
-        tokenize("key = value `bad`")
+        tokenize("key = value !bad")
 
 
 def test_parse_variable():
@@ -599,61 +596,67 @@ def test_movetoworkspacesilent_conversion():
     assert "workspace = 1" in result.lua
 
 
-if __name__ == "__main__":
-    test_lexer_basic()
-    test_lexer_comment()
-    test_lexer_section()
-    test_lexer_variable()
-    test_parse_variable()
-    test_parse_section()
-    test_parse_bind()
-    test_parse_monitor()
-    test_parse_windowrule()
-    test_parse_windowrulev2()
-    test_parse_env()
-    test_parse_exec()
-    test_parse_device()
-    test_full_conversion()
-    test_conversion_report()
-    test_empty_config()
-    test_comment_only()
-    test_variable_reference()
-    test_multiple_monitors()
-    test_bezier_conversion()
-    test_bind_with_flags()
-    test_bindm_conversion()
-    test_layerrule_conversion()
-    test_workspace_conversion()
-    test_exec_ordering()
-    test_env_with_comma_value()
-    test_mouse_bind_movewindow()
-    test_mouse_bind_resizewindow()
-    test_windowrule_with_at_sign()
-    test_submap_conversion()
-    test_plugin_section()
-    test_plugin_subsections()
-    test_unbind_conversion()
-    test_unknown_section_autoconvert()
-    test_colon_separated_nested_key()
-    test_colon_two_level_key()
-    test_monitor_extra_fields()
-    test_hl_annotation()
-    test_no_todo_on_unknown_section()
-    test_backslash_in_regex()
-    test_backslash_in_windowrule_class()
-    test_bracket_in_windowrule()
-    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!")
+def test_single_line_section():
+    result = convert('general { gaps_in = 5 }\n')
+    assert result.success
+    assert "hl.config" in result.lua
+    assert "gaps_in = 5" in result.lua
+
+
+def test_empty_file():
+    result = convert("")
+    assert result.success
+
+
+def test_whitespace_only():
+    result = convert("   \n  \n  \n")
+    assert result.success
+
+
+def test_tab_indentation():
+    result = convert("general {\n\tgaps_in = 5\n}\n")
+    assert result.success
+    assert "gaps_in = 5" in result.lua
+
+
+def test_bind_no_params():
+    result = convert("bind = SUPER, Q, exec\n")
+    assert result.success
+
+
+def test_unbind_no_args():
+    result = convert("unbind = ,\n")
+    assert result.success
+
+
+def test_exec_shutdown():
+    result = convert("exec-shutdown = killall waybar\n")
+    assert result.success
+    assert "hl.on" in result.lua or "exec_shutdown" in result.lua
+
+
+def test_gesture_multiple():
+    result = convert("gesture {\n    workspace_swipe = true\n    workspace_swipe_fingers = 3\n}\n")
+    assert result.success
+    assert "hl.gesture" in result.lua
+    assert "swipe fingers" in result.lua
+
+
+def test_moveintogroup_dispatcher():
+    result = convert("bind = SUPER, T, moveintogroup, l\n")
+    assert result.success
+    assert "into_group" in result.lua
+    assert '"left"' in result.lua
+
+
+def test_moveoutofgroup_dispatcher():
+    result = convert("bind = SUPER, T, moveoutofgroup\n")
+    assert result.success
+    assert "out_of_group" in result.lua
+
+
+def test_nested_subsection_in_decoration():
+    result = convert("decoration {\n    blur {\n        size = 3\n        passes = 2\n    }\n}\n")
+    assert result.success
+    assert "blur" in result.lua
+    assert "size = 3" in result.lua

hyprconf2lua-1.3.2/src/hyprconf2lua/__init__.py

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