Get rid of bookmark_by_title completion.

This commit is contained in:
Florian Bruhin 2015-07-29 12:36:45 +02:00
parent 69ade32cb9
commit 08fe1d59e6
2 changed files with 4 additions and 11 deletions

View File

@ -112,7 +112,7 @@ def init_bookmark_completions():
_instances[usertypes.Completion.bookmark_by_url].deleteLater()
except KeyError:
pass
model = _init_model(miscmodels.BookmarkCompletionModel, 'url')
model = _init_model(miscmodels.BookmarkCompletionModel)
_instances[usertypes.Completion.bookmark_by_url] = model

View File

@ -110,19 +110,12 @@ class BookmarkCompletionModel(base.BaseCompletionModel):
# pylint: disable=abstract-method
def __init__(self, match_field='url', parent=None):
def __init__(self, parent=None):
super().__init__(parent)
cat = self.new_category("Bookmarks")
bookmarks = objreg.get('bookmark-manager').marks.items()
if match_field == 'url':
for bm_url, bm_title in bookmarks:
self.new_item(cat, bm_url, bm_title)
elif match_field == 'title':
for bm_url, bm_title in bookmarks:
self.new_item(cat, bm_title, bm_url)
else:
raise ValueError("Invalid value '{}' for match_field!".format(
match_field))
for bm_url, bm_title in bookmarks:
self.new_item(cat, bm_url, bm_title)
class SessionCompletionModel(base.BaseCompletionModel):