ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dont show a useless traceback when failing to match in a remote command

Browse source 
Fixes #393
This commit is contained in:
Kovid Goyal 2018-03-15 15:45:12 +05:30
parent 2179dab8ed
commit bbfd463357
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kitty/boss.py
View file

@ -190,7 +190,9 @@ def _handle_remote_command(self, cmd, window=None):
response = handle_cmd(self, window, cmd)
except Exception as err:
import traceback
response = {'ok': False, 'error': str(err), 'tb': traceback.format_exc()}
response = {'ok': False, 'error': str(err)}
if not getattr(err, 'hide_traceback', False):
response['tb'] = traceback.format_exc()
else:
response = {'ok': False, 'error': 'Remote control is disabled. Add allow_remote_control yes to your kitty.conf'}
return response

22
kitty/remote_control.py
View file

@ -16,6 +16,14 @@
from .utils import non_blocking_read, parse_address_spec, read_with_timeout
class MatchError(ValueError):
hide_traceback = True
def __init__(self, expression, target='windows'):
ValueError.__init__(self, 'No matching {} for expression: {}'.format(target, expression))
def cmd(short_desc, desc=None, options_spec=None, no_response=False, argspec='...'):
def w(func):
@ -209,7 +217,7 @@ def set_window_title(boss, window, payload):
if match:
windows = tuple(boss.match_windows(match))
if not windows:
raise ValueError('No matching windows for expression: {}'.format(match))
raise MatchError(match)
for window in windows:
if window:
window.set_title(payload['title'])
@ -235,7 +243,7 @@ def set_tab_title(boss, window, payload):
if match:
tabs = tuple(boss.match_tabs(match))
if not tabs:
raise ValueError('No matching windows for expression: {}'.format(match))
raise MatchError(match, 'tabs')
else:
tabs = [boss.tab_for_window(window) if window else boss.active_tab]
for tab in tabs:
@ -263,7 +271,7 @@ def close_window(boss, window, payload):
if match:
windows = tuple(boss.match_windows(match))
if not windows:
raise ValueError('No matching windows for expression: {}'.format(match))
raise MatchError(match)
else:
windows = [window if window and payload['self'] else boss.active_window]
for window in windows:
@ -291,7 +299,7 @@ def close_tab(boss, window, payload):
if match:
tabs = tuple(boss.match_tabs(match))
if not tabs:
raise ValueError('No matching windows for expression: {}'.format(match))
raise MatchError(match, 'tabs')
else:
tabs = [boss.tab_for_window(window) if window and payload['self'] else boss.active_tab]
for tab in tabs:
@ -358,7 +366,7 @@ def new_window(boss, window, payload):
if match:
tabs = tuple(boss.match_tabs(match))
if not tabs:
raise ValueError('No matching windows for expression: {}'.format(match))
raise MatchError(match, 'tabs')
else:
tabs = [boss.active_tab]
tab = tabs[0]
@ -385,7 +393,7 @@ def focus_window(boss, window, payload):
if match:
windows = tuple(boss.match_windows(match))
if not windows:
raise ValueError('No matching windows for expression: {}'.format(match))
raise MatchError(match)
for window in windows:
if window:
boss.set_active_window(window)
@ -426,7 +434,7 @@ def get_text(boss, window, payload):
if match:
windows = tuple(boss.match_windows(match))
if not windows:
raise ValueError('No matching windows for expression: {}'.format(match))
raise MatchError(match)
else:
windows = [window if window and payload['self'] else boss.active_window]
window = windows[0]