redxef/i3toolwait
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Don't run into timeout if some programs don't specify a workspace.

Browse source
This commit is contained in:
redxef 2022-10-29 02:07:14 +02:00
parent 53f8ca5eec
commit 9f4853485d
Signed by: redxef
GPG key ID: 7DAC3AA211CBD921
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
i3toolwait
View file

@ -297,8 +297,9 @@ async def wait_signal(s):
asyncio.get_running_loop().remove_signal_handler(s) asyncio.get_running_loop().remove_signal_handler(s)
async def run(configs: list[dict], *, timeout: int, debug: bool): async def run(configs: list[dict], *, timeout: int, debug: bool):
ipc = await i3ipc.aio.Connection().connect() window_configs = [c for c in configs if c.get('workspace') is not None]
ipc.on('window::new', window_new(configs, debug=debug)) ipc = await i3ipc.aio.Connection().connect() # we only wait for configs which spawn a window
ipc.on('window::new', window_new(window_configs, debug=debug))
variables = { variables = {
'pid': os.getpid(), 'pid': os.getpid(),
@ -318,6 +319,8 @@ async def run(configs: list[dict], *, timeout: int, debug: bool):
coroutines += [coro] coroutines += [coro]
await asyncio.gather(*coroutines) await asyncio.gather(*coroutines)
try: try:
if window_configs:
# run main loop only if we wait for something
await asyncio.wait_for(ipc.main(), timeout=timeout/1000) await asyncio.wait_for(ipc.main(), timeout=timeout/1000)
except asyncio.TimeoutError: except asyncio.TimeoutError:
return 1 return 1
@ -334,7 +337,7 @@ def main(ctx, debug):
@click.pass_context @click.pass_context
@click.option('--filter', '-f', default='True', help="A filter expression for the raw ipc dictionary.") @click.option('--filter', '-f', default='True', help="A filter expression for the raw ipc dictionary.")
@click.option('--timeout', '-t', default=3000, help="Wait time for a window to appear (and match) in milliseconds.") @click.option('--timeout', '-t', default=3000, help="Wait time for a window to appear (and match) in milliseconds.")
@click.option('--workspace', '-w', required=True, help="The workspace to move to.") @click.option('--workspace', '-w', default=None, help="The workspace to move to.")
@click.argument('program', nargs=-1) @click.argument('program', nargs=-1)
def simple(ctx, filter, timeout, workspace, program): def simple(ctx, filter, timeout, workspace, program):
""" """
@ -352,8 +355,8 @@ def simple(ctx, filter, timeout, workspace, program):
@main.command() @main.command()
@click.pass_context @click.pass_context
@click.option('--timeout', '-t', default=3000, help="Wait time for a window to appear (and match) in milliseconds.") @click.option('--timeout', '-t', default=3000, help="Wait time for a window to appear (and match) in milliseconds.")
@click.option('--configs', '-c', default='-', type=click.File('r'), help="A list of startup programs in json") @click.argument('config', type=click.File('r'), default='-')
def config(ctx, timeout, configs): def config(ctx, timeout, config):
""" """
Start a program and move it's created window to the desired i3 workspace. Start a program and move it's created window to the desired i3 workspace.
@ -363,8 +366,8 @@ def config(ctx, timeout, configs):
1 when no window has been found. 1 when no window has been found.
""" """
debug = ctx.obj['DEBUG'] debug = ctx.obj['DEBUG']
configs = yaml.load(configs, Loader=SafeLoader) config = yaml.load(config, Loader=SafeLoader)
ctx.exit(asyncio.run(run(configs, timeout=timeout, debug=debug))) ctx.exit(asyncio.run(run(config, timeout=timeout, debug=debug)))
if __name__ == '__main__': if __name__ == '__main__':
main() main()