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

Merge pull request #4412 from rcorre/url-title-completion

Browse Source 
Don't complete url and title from same search word.
This commit is contained in:
Florian Bruhin 2018-11-14 11:51:59 +01:00 committed by GitHub
commit 0786af0f28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/completion/models/histcategory.py
View File

@ -74,9 +74,10 @@ class HistoryCategory(QSqlQueryModel):
# build a where clause to match all of the words in any order # build a where clause to match all of the words in any order
# given the search term "a b", the WHERE clause would be: # given the search term "a b", the WHERE clause would be:
# ((url || title) LIKE '%a%') AND ((url || title) LIKE '%b%') # ((url || ' ' || title) LIKE '%a%') AND
# ((url || ' ' || title) LIKE '%b%')
where_clause = ' AND '.join( where_clause = ' AND '.join(
"(url || title) LIKE :{} escape '\\'".format(i) "(url || ' ' || title) LIKE :{} escape '\\'".format(i)
for i in range(len(words))) for i in range(len(words)))
# replace ' in timestamp-format to avoid breaking the query # replace ' in timestamp-format to avoid breaking the query

8
tests/unit/completion/test_histcategory.py
View File

@ -82,6 +82,14 @@ def hist(init_sql, config_stub):
("ample itle", ("ample itle",
[('example.com', 'title'), ('example.com', 'nope')], [('example.com', 'title'), ('example.com', 'nope')],
[('example.com', 'title')]), [('example.com', 'title')]),
# https://github.com/qutebrowser/qutebrowser/issues/4411
("mlfreq",
[('https://qutebrowser.org/FAQ.html', 'Frequently Asked Questions')],
[]),
("ml freq",
[('https://qutebrowser.org/FAQ.html', 'Frequently Asked Questions')],
[('https://qutebrowser.org/FAQ.html', 'Frequently Asked Questions')]),
]) ])
def test_set_pattern(pattern, before, after, model_validator, hist): def test_set_pattern(pattern, before, after, model_validator, hist):
"""Validate the filtering and sorting results of set_pattern.""" """Validate the filtering and sorting results of set_pattern."""