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

Avoid code duplication in KeyParser

Browse Source
This commit is contained in:
Florian Bruhin 2014-02-05 11:05:08 +01:00
parent 9c19fd21d6
commit 43c2e21daa
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
qutebrowser/commands/keys.py
View File

@ -91,15 +91,7 @@ class KeyParser(QObject):
except KeyError: except KeyError:
logging.debug('No binding found for {}.'.format(modstr + keystr)) logging.debug('No binding found for {}.'.format(modstr + keystr))
return True return True
# FIXME use a common function for this self._run_or_fill(cmdstr, ignore_exc=False)
try:
self.commandparser.run(cmdstr, ignore_exc=False)
except NoSuchCommandError:
pass
except ArgumentCountError:
logging.debug('Filling statusbar with partial command {}'.format(
cmdstr))
self.set_cmd_text.emit(':{} '.format(cmdstr))
return True return True
def _handle_single_key(self, e): def _handle_single_key(self, e):
@ -152,15 +144,7 @@ class KeyParser(QObject):
self.keystring = '' self.keystring = ''
count = int(countstr) if countstr else None count = int(countstr) if countstr else None
self._run_or_fill(cmdstr_hay, count=count, ignore_exc=False)
try:
self.commandparser.run(cmdstr_hay, count=count, ignore_exc=False)
except NoSuchCommandError:
pass
except ArgumentCountError:
logging.debug('Filling statusbar with partial command {}'.format(
cmdstr_hay))
self.set_cmd_text.emit(':{} '.format(cmdstr_hay))
return return
def _match_key(self, cmdstr_needle): def _match_key(self, cmdstr_needle):
@ -201,3 +185,20 @@ class KeyParser(QObject):
keystr = keystr.replace(mod + '-', mod + '+') keystr = keystr.replace(mod + '-', mod + '+')
keystr = QKeySequence(keystr).toString() keystr = QKeySequence(keystr).toString()
return keystr return keystr
def _run_or_fill(self, cmdstr, count=None, ignore_exc=True):
"""Runs the command in cmdstr or fills the statusbar if args missing.
cmdstr -- The command string.
count -- Optional command count.
ignore_exc -- Ignore exceptions.
"""
try:
self.commandparser.run(cmdstr, count=count, ignore_exc=ignore_exc)
except NoSuchCommandError:
pass
except ArgumentCountError:
logging.debug('Filling statusbar with partial command {}'.format(
cmdstr))
self.set_cmd_text.emit(':{} '.format(cmdstr))
return