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

Reduce logging for completions

Browse Source
This commit is contained in:
Florian Bruhin 2014-06-25 15:42:16 +02:00
parent 36d032c330
commit b72306ffe6
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qutebrowser/utils/completer.py
View File

@ -90,7 +90,6 @@ class Completer(QObject):
parts: The command chunks to get a completion for.
cursor_part: The part the cursor is over currently.
"""
logger.debug("cursor part: {}".format(cursor_part))
if cursor_part == 0:
# '|' or 'set|'
return self._models['command']
@ -100,17 +99,19 @@ class Completer(QObject):
except KeyError:
# entering an unknown command
return None
logger.debug("completions: {}".format(completions))
if completions is None:
# command without any available completions
return None
dbg_completions = completions[:]
try:
idx = cursor_part - 1
completion_name = completions[idx]
logger.debug('modelname {}'.format(completion_name))
except IndexError:
# More arguments than completions
logger.debug("completions: {}".format(', '.join(dbg_completions)))
return None
dbg_completions[idx] = '*' + dbg_completions[idx] + '*'
logger.debug("completions: {}".format(', '.join(dbg_completions)))
if completion_name == 'option':
section = parts[cursor_part - 1]
model = self._models['option'].get(section)
@ -169,9 +170,6 @@ class Completer(QObject):
logger.debug("Ignoring completion update")
return
logger.debug("Updating completion, parts: {}, cursor_part {}".format(
parts, cursor_part))
if prefix != ':':
# This is a search or gibberish, so we don't need to complete
# anything (yet)
@ -182,24 +180,19 @@ class Completer(QObject):
model = self._get_new_completion(parts, cursor_part)
if model is None:
logger.debug("No completion model for {}.".format(parts))
else:
logger.debug("New completion: {}".format(
model.srcmodel.__class__.__name__))
if model != self.view.model():
if model is None:
if model != self.view.model():
self.view.hide()
return
logger.debug("Setting model to {}".format(
model.__class__.__name__))
if model != self.view.model():
self.view.set_model(model)
if model is None:
return
pattern = parts[cursor_part] if parts else ''
logger.debug("pattern: {}".format(pattern))
self.view.model().pattern = pattern
logger.debug("New completion for {}: {}, with pattern '{}'".format(
parts, model.srcmodel.__class__.__name__, pattern))
if self.view.model().item_count == 0:
self.view.hide()
return

15
qutebrowser/widgets/statusbar/command.py
View File

@ -117,7 +117,7 @@ class Command(MinimalLineEdit):
logger.debug("Empty element queued at {}, inserting.".format(
self._empty_item_idx))
parts.insert(self._empty_item_idx, '')
logger.debug("Splitting '{}' -> {}".format(text, parts))
#logger.debug("Splitting '{}' -> {}".format(text, parts))
return parts
@pyqtSlot()
@ -126,28 +126,23 @@ class Command(MinimalLineEdit):
cursor_pos = self.cursorPosition()
snippet = slice(cursor_pos - 1, cursor_pos + 1)
if self.text()[snippet] == ' ':
logger.debug("Cursor between spaces")
spaces = True
else:
logger.debug("Cursor not between spaces")
spaces = False
cursor_pos -= len(self.prefix)
for i, part in enumerate(self.parts):
logger.debug("part {}, len {}, pos {}".format(i, len(part),
cursor_pos))
if cursor_pos <= len(part):
# foo| bar
self.cursor_part = i
logger.debug("Cursor part: {}".format(i))
if spaces:
logger.debug("Cursor between spaces -> queueing empty "
"element at {}.".format(i))
self._empty_item_idx = i
else:
self._empty_item_idx = None
return
break
cursor_pos -= (len(part) + 1) # FIXME are spaces always 1 char?
return None
logger.debug("cursor_part {}, spaces {}".format(self.cursor_part,
spaces))
return
@pyqtSlot()
def on_cursor_position_changed(self):