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

mhtml: Don't attempt to download hostblocked urls

Browse Source
This commit is contained in:
Daniel 2015-10-24 11:32:25 +02:00
parent c2218f51cd
commit 252dc9a8bd
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/browser/mhtml.py
View File

@ -297,6 +297,15 @@ class _Downloader():
log.downloads.debug("loading asset at %s", url) log.downloads.debug("loading asset at %s", url)
host_blocker = objreg.get('host-blocker')
if host_blocker.is_blocked(url):
log.downloads.debug("Skipping %s, host-blocked", url)
# We still need an empty file in the output, QWebView can be pretty
# picky about displaying a file correctly when not all assets are
# at least referenced in the mhtml file.
self.writer.add_file(urlutils.encoded_url(url), b'')
return
download_manager = objreg.get('download-manager', scope='window', download_manager = objreg.get('download-manager', scope='window',
window='current') window='current')
item = download_manager.get(url, fileobj=_NoCloseBytesIO(), item = download_manager.get(url, fileobj=_NoCloseBytesIO(),
@ -374,6 +383,7 @@ class _Downloader():
log.downloads.debug("Oops! Download already gone: %s", item) log.downloads.debug("Oops! Download already gone: %s", item)
return return
item.fileobj.actual_close() item.fileobj.actual_close()
# Add a stub file, see comment in .fetch_url() for more information
self.writer.add_file(urlutils.encoded_url(url), b'') self.writer.add_file(urlutils.encoded_url(url), b'')
if self.pending_downloads: if self.pending_downloads:
return return