From c8ae405bfe7dd3a0b583013ed1b894c71186e4c7 Mon Sep 17 00:00:00 2001 From: seebye Date: Wed, 20 Dec 2017 00:10:21 +0100 Subject: fix #3396 --- qutebrowser/browser/history.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py index ecab730ae..e82e6970d 100644 --- a/qutebrowser/browser/history.py +++ b/qutebrowser/browser/history.py @@ -171,7 +171,9 @@ class WebHistory(sql.SqlTable): @pyqtSlot(QUrl, QUrl, str) def add_from_tab(self, url, requested_url, title): """Add a new history entry as slot, called from a BrowserTab.""" - if url.scheme() == 'data' or requested_url.scheme() == 'data': + if any(url.scheme() == 'data' or + ('qute', 'back') == (url.scheme(), url.host()) + for url in (url, requested_url)): return if url.isEmpty(): # things set via setHtml -- cgit v1.2.3-54-g00ecf From 801b6b90ce43b78d0a202f018833621b486cc7f7 Mon Sep 17 00:00:00 2001 From: seebye Date: Wed, 20 Dec 2017 01:15:12 +0100 Subject: pylint adjustments --- qutebrowser/browser/history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py index e82e6970d..e800ac0b2 100644 --- a/qutebrowser/browser/history.py +++ b/qutebrowser/browser/history.py @@ -173,7 +173,7 @@ class WebHistory(sql.SqlTable): """Add a new history entry as slot, called from a BrowserTab.""" if any(url.scheme() == 'data' or ('qute', 'back') == (url.scheme(), url.host()) - for url in (url, requested_url)): + for url in (url, requested_url)): return if url.isEmpty(): # things set via setHtml -- cgit v1.2.3-54-g00ecf From 125af531cb8519916a29ff79733dd4fb5a660826 Mon Sep 17 00:00:00 2001 From: seebye Date: Fri, 22 Dec 2017 15:44:42 +0100 Subject: database qute://back --- qutebrowser/browser/history.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py index e800ac0b2..04bc1be15 100644 --- a/qutebrowser/browser/history.py +++ b/qutebrowser/browser/history.py @@ -32,7 +32,7 @@ from qutebrowser.misc import objects, sql # increment to indicate that HistoryCompletion must be regenerated -_USER_VERSION = 1 +_USER_VERSION = 2 class CompletionHistory(sql.SqlTable): @@ -102,7 +102,8 @@ class WebHistory(sql.SqlTable): data = {'url': [], 'title': [], 'last_atime': []} # select the latest entry for each url q = sql.Query('SELECT url, title, max(atime) AS atime FROM History ' - 'WHERE NOT redirect GROUP BY url ORDER BY atime asc') + 'WHERE NOT redirect and url NOT LIKE "qute://back%" ' + 'GROUP BY url ORDER BY atime asc') for entry in q.run(): data['url'].append(self._format_completion_url(QUrl(entry.url))) data['title'].append(entry.title) @@ -172,7 +173,7 @@ class WebHistory(sql.SqlTable): def add_from_tab(self, url, requested_url, title): """Add a new history entry as slot, called from a BrowserTab.""" if any(url.scheme() == 'data' or - ('qute', 'back') == (url.scheme(), url.host()) + (url.scheme(), url.host()) == ('qute', 'back') for url in (url, requested_url)): return if url.isEmpty(): -- cgit v1.2.3-54-g00ecf