Siklos/pyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor improvements

Browse source
This commit is contained in:
fdev31 2023-04-28 00:22:54 +02:00
parent 3eb95e09a2
commit 65950cc2ad
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pyprland/ipc.py
View file

@ -24,19 +24,21 @@ async def hyprctlJSON(command) -> list[dict[str, Any]] | dict[str, Any]:
resp = await ctl_reader.read() resp = await ctl_reader.read()
ctl_writer.close() ctl_writer.close()
await ctl_writer.wait_closed() await ctl_writer.wait_closed()
return json.loads(resp) ret = json.loads(resp)
assert isinstance(ret, (list, dict))
return ret
async def hyprctl(command): async def hyprctl(command, base_command="dispatch"):
if DEBUG: if DEBUG:
print(">>>", command) print(">>>", command)
ctl_reader, ctl_writer = await asyncio.open_unix_connection(HYPRCTL) ctl_reader, ctl_writer = await asyncio.open_unix_connection(HYPRCTL)
if isinstance(command, list): if isinstance(command, list):
ctl_writer.write( ctl_writer.write(
f"[[BATCH]] {' ; '.join('dispatch ' + c for c in command)}".encode() f"[[BATCH]] {' ; '.join(f'{base_command} ' + c for c in command)}".encode()
) )
else: else:
ctl_writer.write(f"/dispatch {command}".encode()) ctl_writer.write(f"/{base_command} {command}".encode())
await ctl_writer.drain() await ctl_writer.drain()
resp = await ctl_reader.read(100) resp = await ctl_reader.read(100)
ctl_writer.close() ctl_writer.close()
@ -54,3 +56,4 @@ async def get_focused_monitor_props():
assert isinstance(monitor, dict) assert isinstance(monitor, dict)
if monitor.get("focused") == True: if monitor.get("focused") == True:
return monitor return monitor
raise RuntimeError("no focused monitor")