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

Don't use 'current' win_id for adblock update

Browse Source
This commit is contained in:
Florian Bruhin 2016-09-07 16:24:51 +02:00
parent 8cef35517f
commit 3a55dbf712
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/browser/adblock.py
View File

@ -206,7 +206,7 @@ class HostBlocker:
continue continue
download = FakeDownload(fileobj) download = FakeDownload(fileobj)
self._in_progress.append(download) self._in_progress.append(download)
self.on_download_finished(download) self.on_download_finished(download, win_id)
else: else:
fobj = io.BytesIO() fobj = io.BytesIO()
fobj.name = 'adblock: ' + url.host() fobj.name = 'adblock: ' + url.host()
@ -215,7 +215,7 @@ class HostBlocker:
auto_remove=True) auto_remove=True)
self._in_progress.append(download) self._in_progress.append(download)
download.finished.connect( download.finished.connect(
functools.partial(self.on_download_finished, download)) functools.partial(self.on_download_finished, download, win_id))
def _merge_file(self, byte_io): def _merge_file(self, byte_io):
"""Read and merge host files. """Read and merge host files.
@ -264,12 +264,12 @@ class HostBlocker:
message.error('current', "adblock: {} read errors for {}".format( message.error('current', "adblock: {} read errors for {}".format(
error_count, byte_io.name)) error_count, byte_io.name))
def on_lists_downloaded(self): def on_lists_downloaded(self, win_id):
"""Install block lists after files have been downloaded.""" """Install block lists after files have been downloaded."""
with open(self._local_hosts_file, 'w', encoding='utf-8') as f: with open(self._local_hosts_file, 'w', encoding='utf-8') as f:
for host in sorted(self._blocked_hosts): for host in sorted(self._blocked_hosts):
f.write(host + '\n') f.write(host + '\n')
message.info('current', "adblock: Read {} hosts from {} sources." message.info(win_id, "adblock: Read {} hosts from {} sources."
.format(len(self._blocked_hosts), self._done_count)) .format(len(self._blocked_hosts), self._done_count))
@config.change_filter('content', 'host-block-lists') @config.change_filter('content', 'host-block-lists')
@ -284,11 +284,12 @@ class HostBlocker:
except OSError as e: except OSError as e:
log.misc.exception("Failed to delete hosts file: {}".format(e)) log.misc.exception("Failed to delete hosts file: {}".format(e))
def on_download_finished(self, download): def on_download_finished(self, download, win_id):
"""Check if all downloads are finished and if so, trigger reading. """Check if all downloads are finished and if so, trigger reading.
Arguments: Arguments:
download: The finished DownloadItem. download: The finished DownloadItem.
win_id: The window ID in which :adblock-update was called
""" """
self._in_progress.remove(download) self._in_progress.remove(download)
if download.successful: if download.successful:
@ -299,6 +300,6 @@ class HostBlocker:
download.fileobj.close() download.fileobj.close()
if not self._in_progress: if not self._in_progress:
try: try:
self.on_lists_downloaded() self.on_lists_downloaded(win_id)
except OSError: except OSError:
log.misc.exception("Failed to write host block list!") log.misc.exception("Failed to write host block list!")