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

Factor out GUI stuff to a HistoryProgress object

Browse Source
This commit is contained in:
Florian Bruhin 2018-09-06 17:04:26 +02:00
parent 2109b2276e
commit e4b7786bcc
2 changed files with 70 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
qutebrowser/browser/history.py
View File

@ -37,6 +37,38 @@ from qutebrowser.misc import objects, sql
_USER_VERSION = 2
class HistoryProgress:
"""Progress dialog for history imports/conversions.
This makes WebHistory simpler as it can call methods of this class even
when we don't want to show a progress dialog (for very small imports). This
means tick() and finish() can be called even when start() wasn't.
"""
def __init__(self):
self._progress = None
self._value = 0
def start(self, text, maximum):
self._progress = QProgressDialog()
self._progress.setLabelText(text)
self._progress.setMaximum(maximum)
self._progress.setCancelButton(None)
self._progress.show()
QApplication.processEvents()
def tick(self):
self._value += 1
if self._progress is not None:
self._progress.setValue(self._value)
QApplication.processEvents()
def finish(self):
if self._progress is not None:
self._progress.hide()
class CompletionMetaInfo(sql.SqlTable):
"""Table containing meta-information for the completion."""
@ -87,20 +119,28 @@ class CompletionHistory(sql.SqlTable):
class WebHistory(sql.SqlTable):
"""The global history of visited pages."""
"""The global history of visited pages.
Attributes:
completion: A CompletionHistory instance.
metainfo: A CompletionMetaInfo instance.
_progress: A HistoryProgress instance.
"""
# All web history cleared
history_cleared = pyqtSignal()
# one url cleared
url_cleared = pyqtSignal(QUrl)
def __init__(self, parent=None):
def __init__(self, progress, parent=None):
super().__init__("History", ['url', 'title', 'atime', 'redirect'],
constraints={'url': 'NOT NULL',
'title': 'NOT NULL',
'atime': 'NOT NULL',
'redirect': 'NOT NULL'},
parent=parent)
self._progress = progress
self.completion = CompletionHistory(parent=self)
self.metainfo = CompletionMetaInfo(parent=self)
@ -164,19 +204,10 @@ class WebHistory(sql.SqlTable):
entries = list(q.run())
if len(entries) > 1000:
progress = QProgressDialog()
progress.setLabelText("Rebuilding completion...")
progress.show()
progress.setMaximum(len(entries))
progress.setCancelButton(None)
QApplication.processEvents()
else:
progress = None
self._progress.start("Rebuilding completion...", len(entries))
for i, entry in enumerate(entries):
if progress is not None:
progress.setValue(i)
QApplication.processEvents()
for entry in entries:
self._progress.tick()
url = QUrl(entry.url)
if self._is_excluded(url):
@ -185,8 +216,7 @@ class WebHistory(sql.SqlTable):
data['title'].append(entry.title)
data['last_atime'].append(entry.atime)
if progress is not None:
progress.hide()
self._progress.finish()
self.completion.insert_batch(data, replace=True)
sql.Query('pragma user_version = {}'.format(_USER_VERSION)).run()
@ -438,7 +468,8 @@ def init(parent=None):
Args:
parent: The parent to use for WebHistory.
"""
history = WebHistory(parent=parent)
progress = HistoryProgress()
history = WebHistory(progress=progress, parent=parent)
objreg.register('web-history', history)
if objects.backend == usertypes.Backend.QtWebKit: # pragma: no cover

30
tests/unit/browser/test_history.py
View File

@ -37,9 +37,23 @@ def prerequisites(config_stub, fake_save_manager, init_sql, fake_args):
config_stub.data = {'general': {'private-browsing': False}}
class FakeHistoryProgress:
"""Fake for a WebHistoryProgress object."""
def start(self, _text, _maximum):
pass
def tick(self):
pass
def finish(self):
pass
@pytest.fixture()
def hist(tmpdir):
return history.WebHistory()
return history.WebHistory(progress=FakeHistoryProgress())
class TestSpecialMethods:
@ -434,7 +448,7 @@ class TestRebuild:
'redirect': False, 'atime': 5})
hist.completion.delete_all()
hist2 = history.WebHistory()
hist2 = history.WebHistory(progress=FakeHistoryProgress())
assert list(hist2.completion) == [
('example.com/1', 'example1', 2),
('example.com/2 3', 'example2', 5),
@ -446,7 +460,7 @@ class TestRebuild:
hist.add_url(QUrl('example.com/2'), redirect=False, atime=2)
hist.completion.delete('url', 'example.com/2')
hist2 = history.WebHistory()
hist2 = history.WebHistory(progress=FakeHistoryProgress())
assert list(hist2.completion) == [('example.com/1', '', 1)]
def test_user_version(self, hist, monkeypatch):
@ -455,12 +469,12 @@ class TestRebuild:
hist.add_url(QUrl('example.com/2'), redirect=False, atime=2)
hist.completion.delete('url', 'example.com/2')
hist2 = history.WebHistory()
hist2 = history.WebHistory(progress=FakeHistoryProgress())
assert list(hist2.completion) == [('example.com/1', '', 1)]
monkeypatch.setattr(history, '_USER_VERSION',
history._USER_VERSION + 1)
hist3 = history.WebHistory()
hist3 = history.WebHistory(progress=FakeHistoryProgress())
assert list(hist3.completion) == [
('example.com/1', '', 1),
('example.com/2', '', 2),
@ -472,11 +486,11 @@ class TestRebuild:
hist.add_url(QUrl('example.com/2'), redirect=False, atime=2)
hist.completion.delete('url', 'example.com/2')
hist2 = history.WebHistory()
hist2 = history.WebHistory(progress=FakeHistoryProgress())
assert list(hist2.completion) == [('example.com/1', '', 1)]
hist2.metainfo['force_rebuild'] = True
hist3 = history.WebHistory()
hist3 = history.WebHistory(progress=FakeHistoryProgress())
assert list(hist3.completion) == [
('example.com/1', '', 1),
('example.com/2', '', 2),
@ -494,7 +508,7 @@ class TestRebuild:
hist.add_url(QUrl('http://example.com'), redirect=False, atime=1)
hist.add_url(QUrl('http://example.org'), redirect=False, atime=2)
hist2 = history.WebHistory()
hist2 = history.WebHistory(progress=FakeHistoryProgress())
assert list(hist2.completion) == [('http://example.com', '', 1)]
def test_unrelated_config_change(self, config_stub, hist):