rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use HintingError for all hinting errors

Browse Source
This commit is contained in:
Florian Bruhin 2016-08-17 20:08:35 +02:00
parent eabac17c58
commit 0d35502e87
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qutebrowser/browser/hints.py
View File

@ -300,11 +300,8 @@ class HintActions(QObject):
args = context.get_args(urlstr) args = context.get_args(urlstr)
text = ' '.join(args) text = ' '.join(args)
if text[0] not in modeparsers.STARTCHARS: if text[0] not in modeparsers.STARTCHARS:
message.error(self._win_id, raise HintingError("Invalid command text '{}'.".format(text))
"Invalid command text '{}'.".format(text), message.set_cmd_text(self._win_id, text)
immediately=True)
else:
message.set_cmd_text(self._win_id, text)
def download(self, elem, context): def download(self, elem, context):
"""Download a hint URL. """Download a hint URL.
@ -315,7 +312,7 @@ class HintActions(QObject):
""" """
url = elem.resolve_url(context.baseurl) url = elem.resolve_url(context.baseurl)
if url is None: if url is None:
raise HintingError raise HintingError("No suitable link found for this element.")
if context.rapid: if context.rapid:
prompt = False prompt = False
else: else:
@ -352,7 +349,7 @@ class HintActions(QObject):
userscripts.run_async(context.tab, cmd, *args, win_id=self._win_id, userscripts.run_async(context.tab, cmd, *args, win_id=self._win_id,
env=env) env=env)
except userscripts.UnsupportedError as e: except userscripts.UnsupportedError as e:
message.error(self._win_id, str(e), immediately=True) raise HintingError(str(e))
def spawn(self, url, context): def spawn(self, url, context):
"""Spawn a simple command from a hint. """Spawn a simple command from a hint.
@ -569,11 +566,6 @@ class HintManager(QObject):
hintstr.insert(0, chars[0]) hintstr.insert(0, chars[0])
return ''.join(hintstr) return ''.join(hintstr)
def _show_url_error(self):
"""Show an error because no link was found."""
message.error(self._win_id, "No suitable link found for this element.",
immediately=True)
def _check_args(self, target, *args): def _check_args(self, target, *args):
"""Check the arguments passed to start() and raise if they're wrong. """Check the arguments passed to start() and raise if they're wrong.
@ -907,7 +899,9 @@ class HintManager(QObject):
elif self._context.target in url_handlers: elif self._context.target in url_handlers:
url = elem.resolve_url(self._context.baseurl) url = elem.resolve_url(self._context.baseurl)
if url is None: if url is None:
self._show_url_error() message.error(self._win_id,
"No suitable link found for this element.",
immediately=True)
return return
handler = functools.partial(url_handlers[self._context.target], handler = functools.partial(url_handlers[self._context.target],
url, self._context) url, self._context)
@ -926,8 +920,8 @@ class HintManager(QObject):
try: try:
handler() handler()
except HintingError: except HintingError as e:
self._show_url_error() message.error(self._win_id, str(e), immediately=True)
@cmdutils.register(instance='hintmanager', scope='tab', hide=True, @cmdutils.register(instance='hintmanager', scope='tab', hide=True,
modes=[usertypes.KeyMode.hint]) modes=[usertypes.KeyMode.hint])