mirror of
https://github.com/caelestia-dots/cli.git
synced 2026-06-12 03:49:59 -05:00
fix: Lua dispatcher compat (#112)
* fix: temporary Lua dispatcher compat for workspace dispatchers * fix(resizer): add Lua dispatcher compat for window resize/move/float/center * feat(theme): write current.lua for Hyprland Lua config, current.conf for hyprlang * fix: align gen_lua format with #111 * refactor address review feedback refactor(hypr,theme): address review feedback - cache is_lua_config result to avoid redundant socket calls - remove is_lua_config wrapper, rename _is_lua_config to is_lua_config - move hypr import to top of theme.py - use single line syntax in apply_hypr and apply_colours * restore original specialws behavior and some formatting
This commit is contained in:
@@ -7,6 +7,7 @@ socket_base = f"{os.getenv('XDG_RUNTIME_DIR')}/hypr/{os.getenv('HYPRLAND_INSTANC
|
||||
socket_path = f"{socket_base}/.socket.sock"
|
||||
socket2_path = f"{socket_base}/.socket2.sock"
|
||||
|
||||
_lua_config_cache: bool | None = None
|
||||
|
||||
def message(msg: str, is_json: bool = True) -> str | dict[str, Any]:
|
||||
with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
|
||||
@@ -26,7 +27,36 @@ def message(msg: str, is_json: bool = True) -> str | dict[str, Any]:
|
||||
return json.loads(resp) if is_json else resp
|
||||
|
||||
|
||||
def is_lua_config() -> bool:
|
||||
global _lua_config_cache
|
||||
if _lua_config_cache is not None:
|
||||
return _lua_config_cache
|
||||
try:
|
||||
result = message("systeminfo", is_json=False)
|
||||
for line in result.splitlines():
|
||||
if "configProvider:" in line:
|
||||
_lua_config_cache = "lua" in line.lower()
|
||||
return _lua_config_cache
|
||||
_lua_config_cache = False
|
||||
return False
|
||||
except Exception:
|
||||
_lua_config_cache = False
|
||||
return False
|
||||
|
||||
|
||||
DISPATCHER_MAP_LUA = {
|
||||
"togglespecialworkspace": lambda *a: f'hl.dsp.workspace.toggle_special("{a[0]}")' if a else 'hl.dsp.workspace.toggle_special()',
|
||||
"movetoworkspacesilent": lambda *a: (
|
||||
f'hl.dsp.window.move({{window = "address:{a[0].split(",")[1].replace("address:", "")}", workspace = "{a[0].split(",")[0]}", follow = false}})'
|
||||
),
|
||||
"exec": lambda *a: 'hl.dsp.exec_cmd("' + ' '.join(a).replace('\\', '\\\\').replace('"', '\\"') + '")',
|
||||
}
|
||||
|
||||
|
||||
def dispatch(dispatcher: str, *args: str) -> bool:
|
||||
if is_lua_config() and dispatcher in DISPATCHER_MAP_LUA:
|
||||
lua_dispatch = DISPATCHER_MAP_LUA[dispatcher](*args)
|
||||
return message(f"dispatch {lua_dispatch}", is_json=False) == "ok"
|
||||
return message(f"dispatch {dispatcher} {' '.join(map(str, args))}".rstrip(), is_json=False) == "ok"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user