KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow individual commands to control the response timeout

Browse Source
This commit is contained in:
Kovid Goyal 2021-10-30 12:20:37 +05:30
parent 66a7c3bc4d
commit c3daa969fa
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kitty/rc/base.py
View File

@ -116,6 +116,7 @@ class RemoteCommand:
argspec: str = '...' argspec: str = '...'
options_spec: Optional[str] = None options_spec: Optional[str] = None
no_response: bool = False no_response: bool = False
response_timeout: float = 10. # seconds
string_return_is_error: bool = False string_return_is_error: bool = False
args_count: Optional[int] = None args_count: Optional[int] = None
args_completion: Optional[Dict[str, Tuple[str, Union[Callable[[], Iterable[str]], Tuple[str, ...]]]]] = None args_completion: Optional[Dict[str, Tuple[str, Union[Callable[[], Iterable[str]], Tuple[str, ...]]]]] = None

9
kitty/remote_control.py
View File

@ -114,7 +114,7 @@ class RCIO(TTYIO):
return b''.join(ans) return b''.join(ans)
def do_io(to: Optional[str], send: Dict[str, Any], no_response: bool) -> Dict[str, Any]: def do_io(to: Optional[str], send: Dict[str, Any], no_response: bool, response_timeout: float) -> Dict[str, Any]:
payload = send.get('payload') payload = send.get('payload')
if not isinstance(payload, types.GeneratorType): if not isinstance(payload, types.GeneratorType):
send_data: Union[bytes, Iterable[bytes]] = encode_send(send) send_data: Union[bytes, Iterable[bytes]] = encode_send(send)
@ -131,7 +131,7 @@ def do_io(to: Optional[str], send: Dict[str, Any], no_response: bool) -> Dict[st
io.send(send_data) io.send(send_data)
if no_response: if no_response:
return {'ok': True} return {'ok': True}
received = io.simple_recv(timeout=10) received = io.simple_recv(timeout=response_timeout)
return cast(Dict[str, Any], json.loads(received.decode('ascii'))) return cast(Dict[str, Any], json.loads(received.decode('ascii')))
@ -181,10 +181,13 @@ def main(args: List[str]) -> None:
no_response = c.no_response no_response = c.no_response
if hasattr(opts, 'no_response'): if hasattr(opts, 'no_response'):
no_response = opts.no_response no_response = opts.no_response
response_timeout = c.response_timeout
if hasattr(opts, 'response_timeout'):
response_timeout = opts.response_timeout
send = create_basic_command(cmd, payload=payload, no_response=no_response) send = create_basic_command(cmd, payload=payload, no_response=no_response)
if not global_opts.to and 'KITTY_LISTEN_ON' in os.environ: if not global_opts.to and 'KITTY_LISTEN_ON' in os.environ:
global_opts.to = os.environ['KITTY_LISTEN_ON'] global_opts.to = os.environ['KITTY_LISTEN_ON']
response = do_io(global_opts.to, send, no_response) response = do_io(global_opts.to, send, no_response, response_timeout)
if no_response: if no_response:
return return
if not response.get('ok'): if not response.get('ok'):

5
kitty/shell.py
View File

@ -152,7 +152,10 @@ def run_cmd(global_opts: RCOptions, cmd: str, func: RemoteCommand, opts: Any, it
} }
if payload is not None: if payload is not None:
send['payload'] = payload send['payload'] = payload
response = do_io(global_opts.to, send, func.no_response) response_timeout = func.response_timeout
if hasattr(opts, 'response_timeout'):
response_timeout = opts.response_timeout
response = do_io(global_opts.to, send, func.no_response, response_timeout)
if not response.get('ok'): if not response.get('ok'):
if response.get('tb'): if response.get('tb'):
print_err(response['tb']) print_err(response['tb'])