From 2aa7e5bb358a226e5c7ed3cb9f6c34fc7a6d8a9a Mon Sep 17 00:00:00 2001 From: Antoni Boucher Date: Sat, 12 Sep 2015 17:48:36 -0400 Subject: [PATCH 1/2] Fixed issue #934. --- qutebrowser/completion/models/urlmodel.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/qutebrowser/completion/models/urlmodel.py b/qutebrowser/completion/models/urlmodel.py index 9a2ffdfd2..3280b94b3 100644 --- a/qutebrowser/completion/models/urlmodel.py +++ b/qutebrowser/completion/models/urlmodel.py @@ -69,8 +69,8 @@ class UrlCompletionModel(base.BaseCompletionModel): bookmark_manager.removed.connect(self.on_bookmark_removed) self._history = objreg.get('web-history') - max_history = config.get('completion', 'web-history-max-items') - history = utils.newest_slice(self._history, max_history) + self._max_history = config.get('completion', 'web-history-max-items') + history = utils.newest_slice(self._history, self._max_history) for entry in history: self._add_history_entry(entry) self._history.add_completion_item.connect( @@ -92,12 +92,20 @@ class UrlCompletionModel(base.BaseCompletionModel): else: return dt.strftime(fmt) + def _remove_oldest_history(self): + """Remove the oldest history entry.""" + + self._history_cat.removeRow(0) + def _add_history_entry(self, entry): """Add a new history entry to the completion.""" self.new_item(self._history_cat, entry.url.toDisplayString(), "", self._fmt_atime(entry.atime), sort=int(entry.atime), userdata=entry.url) + if self._history_cat.rowCount() > self._max_history: + self._remove_oldest_history() + @config.change_filter('completion', 'timestamp-format') def reformat_timestamps(self): """Reformat the timestamps if the config option was changed.""" From f0a212849947fee4dc4c995dedafc7069429d3b3 Mon Sep 17 00:00:00 2001 From: Antoni Boucher Date: Sat, 12 Sep 2015 18:01:04 -0400 Subject: [PATCH 2/2] Fixed style. --- qutebrowser/completion/models/urlmodel.py | 1 - 1 file changed, 1 deletion(-) diff --git a/qutebrowser/completion/models/urlmodel.py b/qutebrowser/completion/models/urlmodel.py index 3280b94b3..d3d5122c2 100644 --- a/qutebrowser/completion/models/urlmodel.py +++ b/qutebrowser/completion/models/urlmodel.py @@ -94,7 +94,6 @@ class UrlCompletionModel(base.BaseCompletionModel): def _remove_oldest_history(self): """Remove the oldest history entry.""" - self._history_cat.removeRow(0) def _add_history_entry(self, entry):