From fbe5386e5698805c6583724b39fe0b62036aaa00 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sat, 19 Sep 2015 20:06:15 +0200
Subject: [PATCH 001/104] Initial version of website downloader

Saving websites as MHTML via :download-whole

Still needs some cleanup and a "ask for save path".
---
 qutebrowser/browser/commands.py  |  12 +-
 qutebrowser/browser/downloads.py |  14 ++
 qutebrowser/misc/mhtml.py        | 211 +++++++++++++++++++++++++++++++
 3 files changed, 236 insertions(+), 1 deletion(-)
 create mode 100644 qutebrowser/misc/mhtml.py

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index ae4b1da39..10f1d0233 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -42,7 +42,7 @@ from qutebrowser.keyinput import modeman
 from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
                                objreg, utils)
 from qutebrowser.utils.usertypes import KeyMode
-from qutebrowser.misc import editor, guiprocess
+from qutebrowser.misc import editor, guiprocess, mhtml
 
 
 class CommandDispatcher:
@@ -1157,6 +1157,16 @@ class CommandDispatcher:
             page = self._current_widget().page()
             download_manager.get(self._current_url(), page=page)
 
+    @cmdutils.register(instance='command-dispatcher', scope='window')
+    def download_whole(self, dest):
+        """Download the current page as a MHTML file, including all assets
+        (e.g. images)
+
+        Args:
+            dest: The file path to write the download to.
+        """
+        mhtml.start_download(dest)
+
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        deprecated="Use :download instead.")
     def download_page(self):
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 70760acb5..568e7bf67 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -201,6 +201,7 @@ class DownloadItem(QObject):
         fileobj: The file object to download the file to.
         reply: The QNetworkReply associated with this download.
         retry_info: A RetryInfo instance.
+        raw_headers: The headers sent by the server.
         _filename: The filename of the download.
         _redirects: How many time we were redirected already.
         _buffer: A BytesIO object to buffer incoming data until we know the
@@ -255,6 +256,7 @@ class DownloadItem(QObject):
         self._filename = None
         self.init_reply(reply)
         self._win_id = win_id
+        self.raw_headers = {}
 
     def __repr__(self):
         return utils.get_repr(self, basename=self.basename)
@@ -354,6 +356,7 @@ class DownloadItem(QObject):
         reply.finished.connect(self.on_reply_finished)
         reply.error.connect(self.on_reply_error)
         reply.readyRead.connect(self.on_ready_read)
+        reply.metaDataChanged.connect(self.on_meta_data_change)
         self.retry_info = RetryInfo(request=reply.request(),
                                     manager=reply.manager())
         if not self.fileobj:
@@ -582,6 +585,9 @@ class DownloadItem(QObject):
         if code == QNetworkReply.OperationCanceledError:
             return
         else:
+            if self.reply is None:
+                log.downloads.debug("QNetworkReply disappeared %s", self)
+                return
             self._die(self.reply.errorString())
 
     @pyqtSlot()
@@ -593,6 +599,14 @@ class DownloadItem(QObject):
         if data is not None:
             self._buffer.write(data)
 
+    @pyqtSlot()
+    def on_meta_data_change(self):
+        if self.reply is None:
+            return
+        self.raw_headers = {}
+        for key, value in self.reply.rawHeaderPairs():
+            self.raw_headers[bytes(key)] = bytes(value)
+
     def _handle_redirect(self):
         """Handle a HTTP redirect.
 
diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
new file mode 100644
index 000000000..3afc32c02
--- /dev/null
+++ b/qutebrowser/misc/mhtml.py
@@ -0,0 +1,211 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015 Daniel Schadt
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Utils for writing a MHTML file."""
+
+import functools
+import io
+
+from collections import namedtuple
+from base64 import b64encode
+from urllib.parse import urljoin
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
+
+from qutebrowser.utils import log, objreg
+
+
+_File = namedtuple("_File",
+                   "content content_type content_location transfer_encoding")
+
+
+E_NONE = (None, lambda x: x)
+"""No transfer encoding, copy the bytes from input to output"""
+
+E_BASE64 = ("BASE64", b64encode)
+"""Encode the file using base64 encoding"""
+
+
+class MHTMLWriter(object):
+    """A class for aggregating multiple files and outputting them to a MHTML
+    file."""
+
+    BOUNDARY = b"qute-mhtml"
+
+    def __init__(self, root_content=None, content_location=None,
+                 content_type=None):
+        self.root_content = root_content
+        self.content_location = content_location
+        self.content_type = None
+
+        self._files = {}
+
+    def add_file(self, location, content, content_type=None,
+                 transfer_encoding=E_BASE64):
+        """Add a file to the given MHTML collection.
+
+        Args:
+            location: The original location (URL) of the file.
+            content: The binary content of the file.
+            content_type: The MIME-type of the content (if available)
+            transfer_encoding: The transfer encoding to use for this file.
+        """
+        self._files[location] = _File(
+            content=content, content_type=content_type,
+            content_location=location, transfer_encoding=transfer_encoding,
+        )
+
+    def remove_file(self, location):
+        """Remove a file.
+
+        Args:
+            location: The URL that identifies the file.
+        """
+        del self._files[location]
+
+    def write_to(self, fp):
+        """Output the MHTML file to the given file-like object
+
+        Args:
+            fp: The file-object, openend in "wb" mode.
+        """
+        self._output_header(fp)
+        self._output_root_file(fp)
+        for file_data in self._files.values():
+            self._output_file(fp, file_data)
+
+    def _output_header(self, fp):
+        if self.content_location is None:
+            raise ValueError("content_location must be set")
+        if self.content_type is None:
+            raise ValueError("content_type must be set for the root document")
+
+        fp.write(b"Content-Location: ")
+        fp.write(self.content_location.encode("utf-8"))
+        fp.write(b'\nContent-Type: multipart/related;boundary="')
+        fp.write(self.BOUNDARY)
+        fp.write(b'";type="')
+        fp.write(self.content_type.encode("utf-8"))
+        fp.write(b'"\n\n')
+
+    def _output_root_file(self, fp):
+        root_file = _File(
+            content=self.root_content, content_type=self.content_type,
+            content_location=self.content_location, transfer_encoding=E_BASE64
+        )
+        self._output_file(fp, root_file)
+
+    def _output_file(self, fp, file_struct):
+        fp.write(b"--")
+        fp.write(self.BOUNDARY)
+        fp.write(b"\nContent-Location: ")
+        fp.write(file_struct.content_location.encode("utf-8"))
+        if file_struct.content_type is not None:
+            fp.write(b"\nContent-Type: ")
+            fp.write(file_struct.content_type.encode("utf-8"))
+        encoding_name, encoding_func = file_struct.transfer_encoding
+        if encoding_name:
+            fp.write(b"\nContent-Transfer-Encoding: ")
+            fp.write(encoding_name.encode("utf-8"))
+        fp.write(b"\n\n")
+        fp.write(encoding_func(file_struct.content))
+        fp.write(b"\n\n")
+
+
+def start_download(dest):
+    """Start downloading the current page and all assets to a MHTML file.
+
+    Args:
+        dest: The filename where the resulting file should be saved.
+    """
+    download_manager = objreg.get("download-manager", scope="window",
+                                  window="current")
+    web_view = objreg.get("webview", scope="tab", tab="current")
+    web_url_str = web_view.url().toString()
+    web_frame = web_view.page().mainFrame()
+
+    writer = MHTMLWriter()
+    writer.root_content = web_frame.toHtml().encode("utf-8")
+    writer.content_location = web_url_str
+    # I've found no way of getting the content type of a QWebView, but since
+    # we're using .toHtml, it's probably safe to say that the content-type is
+    # HTML
+    writer.content_type = "text/html"
+    # Currently only downloading <link> (stylesheets), <script> (javascript) and
+    # <img> (image) elements.
+    elements = (web_frame.findAllElements("link") +
+                web_frame.findAllElements("script") +
+                web_frame.findAllElements("img"))
+
+    loaded_urls = set()
+    pending_downloads = set()
+
+    # Callback for when a single asset is downloaded
+    # closes over the local variables
+    def finished(name, item):
+        pending_downloads.remove(item)
+        mime = item.raw_headers.get(b"Content-Type", b"")
+        mime = mime.decode("ascii", "ignore")
+        writer.add_file(name, item.fileobj.getvalue(), mime)
+        if pending_downloads:
+            return
+        finish_file()
+
+    def error(item, *args):
+        pending_downloads.remove(item)
+        if pending_downloads:
+            return
+        finish_file()
+
+    def finish_file():
+        # If we get here, all assets are downloaded and we're ready to finis
+        # the file
+        log.misc.debug("All assets downloaded, ready to finish off!")
+        with open(dest, "wb") as file_output:
+            writer.write_to(file_output)
+
+
+    for element in elements:
+        element_url = element.attribute("src")
+        if not element_url:
+            element_url = element.attribute("href")
+        if not element_url:
+            # Might be a local <script> tag or something else
+            continue
+        absolute_url_str = urljoin(web_url_str, element_url)
+        name = absolute_url_str if element_url.startswith("//") else element_url
+        # Prevent loading an asset twice
+        if absolute_url_str in loaded_urls:
+            continue
+        loaded_urls.add(absolute_url_str)
+
+        log.misc.debug("asset at %s", absolute_url_str)
+        absolute_url = QUrl(absolute_url_str)
+
+        fileobj = io.BytesIO()
+        item = download_manager.get(absolute_url, fileobj=fileobj,
+                                    auto_remove=True)
+        pending_downloads.add(item)
+        item.finished.connect(
+            functools.partial(finished, name, item))
+        item.error.connect(
+            functools.partial(error, item))
+        item.cancelled.connect(
+            functools.partial(error, item))

From 930871be01d4893be94a1002782c9931a2be5e60 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 20 Sep 2015 14:30:12 +0200
Subject: [PATCH 002/104] First working version

The files can be opened with qutebrowser

Problems still with Umlauts in the encoded file.
---
 qutebrowser/misc/mhtml.py | 64 +++++++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 3afc32c02..795b102e6 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -20,11 +20,13 @@
 """Utils for writing a MHTML file."""
 
 import functools
+import quopri
 import io
 
 from collections import namedtuple
 from base64 import b64encode
 from urllib.parse import urljoin
+from uuid import uuid4
 
 from PyQt5.QtCore import QUrl
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
@@ -36,18 +38,44 @@ _File = namedtuple("_File",
                    "content content_type content_location transfer_encoding")
 
 
+def _chunked_base64(data, maxlen=76, linesep=b"\r\n"):
+    """Just like b64encode, except that it breaks long lines.
+
+    Args:
+        maxlen: Maximum length of a line, not including the line separator.
+        linesep: Line separator to use as bytes.
+    """
+    encoded = b64encode(data)
+    result = []
+    for i in range(0, len(encoded), maxlen):
+        result.append(encoded[i:i+maxlen])
+    return linesep.join(result)
+
+def _rn_quopri(data):
+    """Return a quoted-printable representation of data."""
+    orig_funcs = (quopri.b2a_qp, quopri.a2b_qp)
+    # Workaround for quopri mixing \n and \r\n
+    quopri.b2a_qp = quopri.a2b_qp = None
+    encoded = quopri.encodestring(data)
+    quopri.b2a_qp, quopri.a2b_qp = orig_funcs
+    return encoded.replace(b"\n", b"\r\n")
+
+
 E_NONE = (None, lambda x: x)
 """No transfer encoding, copy the bytes from input to output"""
 
-E_BASE64 = ("BASE64", b64encode)
+E_BASE64 = ("base64", _chunked_base64)
 """Encode the file using base64 encoding"""
 
+E_QUOPRI = ("quoted-printable", _rn_quopri)
+"""Encode the file using MIME quoted-printable encoding."""
+
 
 class MHTMLWriter(object):
     """A class for aggregating multiple files and outputting them to a MHTML
     file."""
 
-    BOUNDARY = b"qute-mhtml"
+    BOUNDARY = b"---qute-mhtml-" + str(uuid4()).encode("ascii")
 
     def __init__(self, root_content=None, content_location=None,
                  content_type=None):
@@ -90,6 +118,9 @@ class MHTMLWriter(object):
         self._output_root_file(fp)
         for file_data in self._files.values():
             self._output_file(fp, file_data)
+        fp.write(b"\r\n--")
+        fp.write(self.BOUNDARY)
+        fp.write(b"--")
 
     def _output_header(self, fp):
         if self.content_location is None:
@@ -99,34 +130,34 @@ class MHTMLWriter(object):
 
         fp.write(b"Content-Location: ")
         fp.write(self.content_location.encode("utf-8"))
-        fp.write(b'\nContent-Type: multipart/related;boundary="')
+        fp.write(b'\r\nContent-Type: multipart/related;boundary="')
         fp.write(self.BOUNDARY)
         fp.write(b'";type="')
         fp.write(self.content_type.encode("utf-8"))
-        fp.write(b'"\n\n')
+        fp.write(b'"\r\n\r\n')
 
     def _output_root_file(self, fp):
         root_file = _File(
             content=self.root_content, content_type=self.content_type,
-            content_location=self.content_location, transfer_encoding=E_BASE64
+            content_location=self.content_location, transfer_encoding=E_QUOPRI,
         )
         self._output_file(fp, root_file)
 
     def _output_file(self, fp, file_struct):
         fp.write(b"--")
         fp.write(self.BOUNDARY)
-        fp.write(b"\nContent-Location: ")
+        fp.write(b"\r\nContent-Location: ")
         fp.write(file_struct.content_location.encode("utf-8"))
         if file_struct.content_type is not None:
-            fp.write(b"\nContent-Type: ")
+            fp.write(b"\r\nContent-Type: ")
             fp.write(file_struct.content_type.encode("utf-8"))
         encoding_name, encoding_func = file_struct.transfer_encoding
         if encoding_name:
-            fp.write(b"\nContent-Transfer-Encoding: ")
+            fp.write(b"\r\nContent-Transfer-Encoding: ")
             fp.write(encoding_name.encode("utf-8"))
-        fp.write(b"\n\n")
+        fp.write(b"\r\n\r\n")
         fp.write(encoding_func(file_struct.content))
-        fp.write(b"\n\n")
+        fp.write(b"\r\n\r\n")
 
 
 def start_download(dest):
@@ -163,13 +194,15 @@ def start_download(dest):
         pending_downloads.remove(item)
         mime = item.raw_headers.get(b"Content-Type", b"")
         mime = mime.decode("ascii", "ignore")
-        writer.add_file(name, item.fileobj.getvalue(), mime)
+        encode = E_QUOPRI if mime.startswith("text/") else E_BASE64
+        writer.add_file(name, item.fileobj.getvalue(), mime, encode)
         if pending_downloads:
             return
         finish_file()
 
-    def error(item, *args):
+    def error(name, item, *args):
         pending_downloads.remove(item)
+        writer.add_file(name, b"")
         if pending_downloads:
             return
         finish_file()
@@ -190,7 +223,6 @@ def start_download(dest):
             # Might be a local <script> tag or something else
             continue
         absolute_url_str = urljoin(web_url_str, element_url)
-        name = absolute_url_str if element_url.startswith("//") else element_url
         # Prevent loading an asset twice
         if absolute_url_str in loaded_urls:
             continue
@@ -204,8 +236,8 @@ def start_download(dest):
                                     auto_remove=True)
         pending_downloads.add(item)
         item.finished.connect(
-            functools.partial(finished, name, item))
+            functools.partial(finished, absolute_url_str, item))
         item.error.connect(
-            functools.partial(error, item))
+            functools.partial(error, absolute_url_str, item))
         item.cancelled.connect(
-            functools.partial(error, item))
+            functools.partial(error, absolute_url_str, item))

From 024ae52366cbbbdcbf88d4ab03bbc99e15e562ea Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 20 Sep 2015 16:05:36 +0200
Subject: [PATCH 003/104] Replaced quote-printable with own function

The original one had some inconsistencies that lead to bugs.

The content-type of the root document now also contains the charset.
---
 qutebrowser/misc/mhtml.py | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 795b102e6..6ac43a8c1 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -53,12 +53,33 @@ def _chunked_base64(data, maxlen=76, linesep=b"\r\n"):
 
 def _rn_quopri(data):
     """Return a quoted-printable representation of data."""
-    orig_funcs = (quopri.b2a_qp, quopri.a2b_qp)
-    # Workaround for quopri mixing \n and \r\n
-    quopri.b2a_qp = quopri.a2b_qp = None
-    encoded = quopri.encodestring(data)
-    quopri.b2a_qp, quopri.a2b_qp = orig_funcs
-    return encoded.replace(b"\n", b"\r\n")
+    # See RFC 2045 https://tools.ietf.org/html/rfc2045#section-6.7
+    # The stdlib version in the quopri module has inconsistencies with line
+    # endings and breaks up character escapes over multiple lines, which isn't
+    # understood by qute and leads to jumbled text
+    MAXLEN = 76
+    WHITESPACE = {ord(b"\t"), ord(b" ")}
+    output = []
+    current_line = b""
+    for byte in data:
+        # Literal representation according to (2) and (3)
+        if (ord(b"!") <= byte <= ord(b"<") or
+            ord(b">") <= byte <= ord(b"~") or
+            byte in WHITESPACE):
+            current_line += bytes([byte])
+        else:
+            current_line += b"=" + "{:02X}".format(byte).encode("ascii")
+        if len(current_line) >= MAXLEN:
+            # We need to account for the = character
+            split = [current_line[:MAXLEN-1], current_line[MAXLEN-1:]]
+            quoted_pos = split[0].rfind(b"=")
+            if quoted_pos + 2 >= MAXLEN - 1:
+                split[0], token = split[0][:quoted_pos], split[0][quoted_pos:]
+                split[1] = token + split[1]
+            current_line = split[1]
+            output.append(split[0] + b"=")
+    output.append(current_line)
+    return b"\r\n".join(output)
 
 
 E_NONE = (None, lambda x: x)
@@ -86,7 +107,7 @@ class MHTMLWriter(object):
         self._files = {}
 
     def add_file(self, location, content, content_type=None,
-                 transfer_encoding=E_BASE64):
+                 transfer_encoding=E_QUOPRI):
         """Add a file to the given MHTML collection.
 
         Args:
@@ -178,7 +199,7 @@ def start_download(dest):
     # I've found no way of getting the content type of a QWebView, but since
     # we're using .toHtml, it's probably safe to say that the content-type is
     # HTML
-    writer.content_type = "text/html"
+    writer.content_type = 'text/html; charset="UTF-8"'
     # Currently only downloading <link> (stylesheets), <script> (javascript) and
     # <img> (image) elements.
     elements = (web_frame.findAllElements("link") +

From 49a32f004112fedbe5d8a8ed4b3e2d6bf1e8c33d Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 20 Sep 2015 17:11:28 +0200
Subject: [PATCH 004/104] First round of lint fixes

---
 qutebrowser/browser/commands.py  |  3 +--
 qutebrowser/browser/downloads.py |  1 +
 qutebrowser/misc/mhtml.py        | 38 ++++++++++++++++----------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 10f1d0233..641e4aaee 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1159,8 +1159,7 @@ class CommandDispatcher:
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def download_whole(self, dest):
-        """Download the current page as a MHTML file, including all assets
-        (e.g. images)
+        """Download the current page as a MHTML file, including all assets.
 
         Args:
             dest: The file path to write the download to.
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 568e7bf67..c446b6c55 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -601,6 +601,7 @@ class DownloadItem(QObject):
 
     @pyqtSlot()
     def on_meta_data_change(self):
+        """Update the download's metadata."""
         if self.reply is None:
             return
         self.raw_headers = {}
diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 6ac43a8c1..1266fb6a3 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -20,7 +20,6 @@
 """Utils for writing a MHTML file."""
 
 import functools
-import quopri
 import io
 
 from collections import namedtuple
@@ -29,7 +28,6 @@ from urllib.parse import urljoin
 from uuid import uuid4
 
 from PyQt5.QtCore import QUrl
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
 
 from qutebrowser.utils import log, objreg
 
@@ -48,32 +46,32 @@ def _chunked_base64(data, maxlen=76, linesep=b"\r\n"):
     encoded = b64encode(data)
     result = []
     for i in range(0, len(encoded), maxlen):
-        result.append(encoded[i:i+maxlen])
+        result.append(encoded[i:i + maxlen])
     return linesep.join(result)
 
+
 def _rn_quopri(data):
     """Return a quoted-printable representation of data."""
     # See RFC 2045 https://tools.ietf.org/html/rfc2045#section-6.7
     # The stdlib version in the quopri module has inconsistencies with line
     # endings and breaks up character escapes over multiple lines, which isn't
     # understood by qute and leads to jumbled text
-    MAXLEN = 76
-    WHITESPACE = {ord(b"\t"), ord(b" ")}
+    maxlen = 76
+    whitespace = {ord(b"\t"), ord(b" ")}
     output = []
     current_line = b""
     for byte in data:
         # Literal representation according to (2) and (3)
-        if (ord(b"!") <= byte <= ord(b"<") or
-            ord(b">") <= byte <= ord(b"~") or
-            byte in WHITESPACE):
+        if (ord(b"!") <= byte <= ord(b"<") or ord(b">") <= byte <= ord(b"~")
+                or byte in whitespace):
             current_line += bytes([byte])
         else:
             current_line += b"=" + "{:02X}".format(byte).encode("ascii")
-        if len(current_line) >= MAXLEN:
+        if len(current_line) >= maxlen:
             # We need to account for the = character
-            split = [current_line[:MAXLEN-1], current_line[MAXLEN-1:]]
+            split = [current_line[:maxlen - 1], current_line[maxlen - 1:]]
             quoted_pos = split[0].rfind(b"=")
-            if quoted_pos + 2 >= MAXLEN - 1:
+            if quoted_pos + 2 >= maxlen - 1:
                 split[0], token = split[0][:quoted_pos], split[0][quoted_pos:]
                 split[1] = token + split[1]
             current_line = split[1]
@@ -93,8 +91,8 @@ E_QUOPRI = ("quoted-printable", _rn_quopri)
 
 
 class MHTMLWriter(object):
-    """A class for aggregating multiple files and outputting them to a MHTML
-    file."""
+
+    """A class for outputting multiple files to a MHTML document."""
 
     BOUNDARY = b"---qute-mhtml-" + str(uuid4()).encode("ascii")
 
@@ -102,7 +100,7 @@ class MHTMLWriter(object):
                  content_type=None):
         self.root_content = root_content
         self.content_location = content_location
-        self.content_type = None
+        self.content_type = content_type
 
         self._files = {}
 
@@ -130,7 +128,7 @@ class MHTMLWriter(object):
         del self._files[location]
 
     def write_to(self, fp):
-        """Output the MHTML file to the given file-like object
+        """Output the MHTML file to the given file-like object.
 
         Args:
             fp: The file-object, openend in "wb" mode.
@@ -144,6 +142,7 @@ class MHTMLWriter(object):
         fp.write(b"--")
 
     def _output_header(self, fp):
+        """Output only the header to the given fileobject."""
         if self.content_location is None:
             raise ValueError("content_location must be set")
         if self.content_type is None:
@@ -158,6 +157,7 @@ class MHTMLWriter(object):
         fp.write(b'"\r\n\r\n')
 
     def _output_root_file(self, fp):
+        """Output the root document to the fileobject."""
         root_file = _File(
             content=self.root_content, content_type=self.content_type,
             content_location=self.content_location, transfer_encoding=E_QUOPRI,
@@ -165,6 +165,7 @@ class MHTMLWriter(object):
         self._output_file(fp, root_file)
 
     def _output_file(self, fp, file_struct):
+        """Output the single given file to the fileobject."""
         fp.write(b"--")
         fp.write(self.BOUNDARY)
         fp.write(b"\r\nContent-Location: ")
@@ -200,8 +201,8 @@ def start_download(dest):
     # we're using .toHtml, it's probably safe to say that the content-type is
     # HTML
     writer.content_type = 'text/html; charset="UTF-8"'
-    # Currently only downloading <link> (stylesheets), <script> (javascript) and
-    # <img> (image) elements.
+    # Currently only downloading <link> (stylesheets), <script> (javascript)
+    # and <img> (image) elements.
     elements = (web_frame.findAllElements("link") +
                 web_frame.findAllElements("script") +
                 web_frame.findAllElements("img"))
@@ -221,7 +222,7 @@ def start_download(dest):
             return
         finish_file()
 
-    def error(name, item, *args):
+    def error(name, item, *_args):
         pending_downloads.remove(item)
         writer.add_file(name, b"")
         if pending_downloads:
@@ -235,7 +236,6 @@ def start_download(dest):
         with open(dest, "wb") as file_output:
             writer.write_to(file_output)
 
-
     for element in elements:
         element_url = element.attribute("src")
         if not element_url:

From 111feebf89606df39d5e990aa0c0760bbae5e896 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 20 Sep 2015 17:57:32 +0200
Subject: [PATCH 005/104] Refactor start_download to a class

---
 qutebrowser/misc/mhtml.py | 171 ++++++++++++++++++++++----------------
 1 file changed, 98 insertions(+), 73 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 1266fb6a3..2d8a5e069 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -182,83 +182,108 @@ class MHTMLWriter(object):
         fp.write(b"\r\n\r\n")
 
 
+class _Downloader(object):
+
+    """A class to download whole websites."""
+
+    def __init__(self, web_view, dest):
+        self.web_view = web_view
+        self.dest = dest
+        self.writer = MHTMLWriter()
+        self.loaded_urls = set()
+        self.pending_downloads = set()
+
+    def run(self):
+        """Download and save the page.
+
+        The object must not be reused, you should create a new one if
+        you want to download another page.
+        """
+        download_manager = objreg.get("download-manager", scope="window",
+                                      window="current")
+        web_url_str = self.web_view.url().toString()
+        web_frame = self.web_view.page().mainFrame()
+
+        self.writer.root_content = web_frame.toHtml().encode("utf-8")
+        self.writer.content_location = web_url_str
+        # I've found no way of getting the content type of a QWebView, but
+        # since we're using .toHtml, it's probably safe to say that the
+        # content-type is HTML
+        self.writer.content_type = 'text/html; charset="UTF-8"'
+        # Currently only downloading <link> (stylesheets), <script>
+        # (javascript) and <img> (image) elements.
+        elements = (web_frame.findAllElements("link") +
+                    web_frame.findAllElements("script") +
+                    web_frame.findAllElements("img"))
+
+        for element in elements:
+            element_url = element.attribute("src")
+            if not element_url:
+                element_url = element.attribute("href")
+            if not element_url:
+                # Might be a local <script> tag or something else
+                continue
+            absolute_url = QUrl(urljoin(web_url_str, element_url))
+            # Prevent loading an asset twice
+            if absolute_url in self.loaded_urls:
+                continue
+            self.loaded_urls.add(absolute_url)
+
+            log.misc.debug("asset at %s", absolute_url)
+
+            item = download_manager.get(absolute_url, fileobj=io.BytesIO(),
+                                        auto_remove=True)
+            self.pending_downloads.add(item)
+            item.finished.connect(
+                functools.partial(self.finished, absolute_url, item))
+            item.error.connect(
+                functools.partial(self.error, absolute_url, item))
+            item.cancelled.connect(
+                functools.partial(self.error, absolute_url, item))
+
+    def finished(self, url, item):
+        """Callback when a single asset is downloaded.
+
+        Args:
+            url: The original url of the asset as QUrl.
+            item: The DownloadItem given by the DownloadManager
+        """
+        self.pending_downloads.remove(item)
+        mime = item.raw_headers.get(b"Content-Type", b"")
+        mime = mime.decode("ascii", "ignore")
+        encode = E_QUOPRI if mime.startswith("text/") else E_BASE64
+        self.writer.add_file(url.toString(), item.fileobj.getvalue(), mime,
+                             encode)
+        if self.pending_downloads:
+            return
+        self.finish_file()
+
+    def error(self, url, item, *_args):
+        """Callback when a download error occurs.
+
+        Args:
+            url: The orignal url of the asset as QUrl.
+            item: The DownloadItem given by the DownloadManager.
+        """
+        self.pending_downloads.remove(item)
+        self.writer.add_file(url.toString(), b"")
+        if self.pending_downloads:
+            return
+        self.finish_file()
+
+    def finish_file(self):
+        """Save the file to the filename given in __init__."""
+        log.misc.debug("All assets downloaded, ready to finish off!")
+        with open(self.dest, "wb") as file_output:
+            self.writer.write_to(file_output)
+
+
 def start_download(dest):
     """Start downloading the current page and all assets to a MHTML file.
 
     Args:
         dest: The filename where the resulting file should be saved.
     """
-    download_manager = objreg.get("download-manager", scope="window",
-                                  window="current")
     web_view = objreg.get("webview", scope="tab", tab="current")
-    web_url_str = web_view.url().toString()
-    web_frame = web_view.page().mainFrame()
-
-    writer = MHTMLWriter()
-    writer.root_content = web_frame.toHtml().encode("utf-8")
-    writer.content_location = web_url_str
-    # I've found no way of getting the content type of a QWebView, but since
-    # we're using .toHtml, it's probably safe to say that the content-type is
-    # HTML
-    writer.content_type = 'text/html; charset="UTF-8"'
-    # Currently only downloading <link> (stylesheets), <script> (javascript)
-    # and <img> (image) elements.
-    elements = (web_frame.findAllElements("link") +
-                web_frame.findAllElements("script") +
-                web_frame.findAllElements("img"))
-
-    loaded_urls = set()
-    pending_downloads = set()
-
-    # Callback for when a single asset is downloaded
-    # closes over the local variables
-    def finished(name, item):
-        pending_downloads.remove(item)
-        mime = item.raw_headers.get(b"Content-Type", b"")
-        mime = mime.decode("ascii", "ignore")
-        encode = E_QUOPRI if mime.startswith("text/") else E_BASE64
-        writer.add_file(name, item.fileobj.getvalue(), mime, encode)
-        if pending_downloads:
-            return
-        finish_file()
-
-    def error(name, item, *_args):
-        pending_downloads.remove(item)
-        writer.add_file(name, b"")
-        if pending_downloads:
-            return
-        finish_file()
-
-    def finish_file():
-        # If we get here, all assets are downloaded and we're ready to finis
-        # the file
-        log.misc.debug("All assets downloaded, ready to finish off!")
-        with open(dest, "wb") as file_output:
-            writer.write_to(file_output)
-
-    for element in elements:
-        element_url = element.attribute("src")
-        if not element_url:
-            element_url = element.attribute("href")
-        if not element_url:
-            # Might be a local <script> tag or something else
-            continue
-        absolute_url_str = urljoin(web_url_str, element_url)
-        # Prevent loading an asset twice
-        if absolute_url_str in loaded_urls:
-            continue
-        loaded_urls.add(absolute_url_str)
-
-        log.misc.debug("asset at %s", absolute_url_str)
-        absolute_url = QUrl(absolute_url_str)
-
-        fileobj = io.BytesIO()
-        item = download_manager.get(absolute_url, fileobj=fileobj,
-                                    auto_remove=True)
-        pending_downloads.add(item)
-        item.finished.connect(
-            functools.partial(finished, absolute_url_str, item))
-        item.error.connect(
-            functools.partial(error, absolute_url_str, item))
-        item.cancelled.connect(
-            functools.partial(error, absolute_url_str, item))
+    loader = _Downloader(web_view, dest)
+    loader.run()

From fd7820ea16c78d3b9ba31c4ac5e21e64dd18137a Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 20 Sep 2015 18:34:45 +0200
Subject: [PATCH 006/104] occurs -> occurred

---
 qutebrowser/misc/mhtml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 2d8a5e069..7a36011a3 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -259,7 +259,7 @@ class _Downloader(object):
         self.finish_file()
 
     def error(self, url, item, *_args):
-        """Callback when a download error occurs.
+        """Callback when a download error occurred.
 
         Args:
             url: The orignal url of the asset as QUrl.

From 679ab65b5ff407034951f2e3c854a86839a3c407 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 20 Sep 2015 20:44:32 +0200
Subject: [PATCH 007/104] Message on finished download

---
 qutebrowser/misc/mhtml.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 7a36011a3..424d405bc 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -29,7 +29,7 @@ from uuid import uuid4
 
 from PyQt5.QtCore import QUrl
 
-from qutebrowser.utils import log, objreg
+from qutebrowser.utils import log, objreg, message
 
 
 _File = namedtuple("_File",
@@ -276,6 +276,7 @@ class _Downloader(object):
         log.misc.debug("All assets downloaded, ready to finish off!")
         with open(self.dest, "wb") as file_output:
             self.writer.write_to(file_output)
+        message.info("current", "Page saved as {}".format(self.dest), True)
 
 
 def start_download(dest):

From 6b086d159d337451d5d2a9363211aa662d0c4733 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Tue, 22 Sep 2015 13:37:03 +0200
Subject: [PATCH 008/104] Ask for filename when none is given

---
 qutebrowser/browser/commands.py | 18 ++++++++++++++++--
 qutebrowser/misc/mhtml.py       |  2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 641e4aaee..6477bf3f4 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -43,6 +43,8 @@ from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
                                objreg, utils)
 from qutebrowser.utils.usertypes import KeyMode
 from qutebrowser.misc import editor, guiprocess, mhtml
+from qutebrowser.browser.downloads import (_path_suggestion as
+                                           download_path_suggestion)
 
 
 class CommandDispatcher:
@@ -1158,13 +1160,25 @@ class CommandDispatcher:
             download_manager.get(self._current_url(), page=page)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def download_whole(self, dest):
+    def download_whole(self, dest=None):
         """Download the current page as a MHTML file, including all assets.
 
         Args:
             dest: The file path to write the download to.
         """
-        mhtml.start_download(dest)
+        if dest is None:
+            suggested_fn = self._current_title() + ".mht"
+            q = usertypes.Question()
+            q.text = "Save page to: "
+            q.mode = usertypes.PromptMode.text
+            q.completed.connect(q.deleteLater)
+            q.default = download_path_suggestion(suggested_fn)
+            q.answered.connect(mhtml.start_download)
+            message_bridge = objreg.get("message-bridge", scope="window",
+                                        window=self._win_id)
+            message_bridge.ask(q, blocking=False)
+        else:
+            mhtml.start_download(dest)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        deprecated="Use :download instead.")
diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 424d405bc..2353602fc 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -21,6 +21,7 @@
 
 import functools
 import io
+import os
 
 from collections import namedtuple
 from base64 import b64encode
@@ -285,6 +286,7 @@ def start_download(dest):
     Args:
         dest: The filename where the resulting file should be saved.
     """
+    dest = os.path.expanduser(dest)
     web_view = objreg.get("webview", scope="tab", tab="current")
     loader = _Downloader(web_view, dest)
     loader.run()

From 11ed60620ae2630a4654e47e718f622797e8e175 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Tue, 22 Sep 2015 18:48:52 +0200
Subject: [PATCH 009/104] Also load assets referenced in css files

Things like "@import stylesheet.css" and "url(...)".
---
 qutebrowser/misc/mhtml.py | 77 ++++++++++++++++++++++++++++++---------
 1 file changed, 60 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 2353602fc..b45f0f6a9 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -22,6 +22,7 @@
 import functools
 import io
 import os
+import re
 
 from collections import namedtuple
 from base64 import b64encode
@@ -37,6 +38,32 @@ _File = namedtuple("_File",
                    "content content_type content_location transfer_encoding")
 
 
+_CSS_URL_PATTERNS = [re.compile(x) for x in [
+    rb"@import '(?P<url>[^']+)'",
+    rb'@import "(?P<url>[^"]+)"',
+    rb'''url\((?P<url>[^'"][^)]*)\)''',
+    rb'url\("(?P<url>[^"]+)"\)',
+    rb"url\('(?P<url>[^']+)'\)",
+]]
+
+
+def _get_css_imports(data):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as bytes.
+    """
+    urls = []
+    for pattern in _CSS_URL_PATTERNS:
+        for match in pattern.finditer(data):
+            url = match.group("url")
+            if url:
+                urls.append(url)
+    return urls
+
+
 def _chunked_base64(data, maxlen=76, linesep=b"\r\n"):
     """Just like b64encode, except that it breaks long lines.
 
@@ -191,7 +218,7 @@ class _Downloader(object):
         self.web_view = web_view
         self.dest = dest
         self.writer = MHTMLWriter()
-        self.loaded_urls = set()
+        self.loaded_urls = {web_view.url()}
         self.pending_downloads = set()
 
     def run(self):
@@ -200,8 +227,6 @@ class _Downloader(object):
         The object must not be reused, you should create a new one if
         you want to download another page.
         """
-        download_manager = objreg.get("download-manager", scope="window",
-                                      window="current")
         web_url_str = self.web_view.url().toString()
         web_frame = self.web_view.page().mainFrame()
 
@@ -225,22 +250,32 @@ class _Downloader(object):
                 # Might be a local <script> tag or something else
                 continue
             absolute_url = QUrl(urljoin(web_url_str, element_url))
-            # Prevent loading an asset twice
-            if absolute_url in self.loaded_urls:
-                continue
-            self.loaded_urls.add(absolute_url)
+            self.fetch_url(absolute_url)
 
-            log.misc.debug("asset at %s", absolute_url)
+    def fetch_url(self, url):
+        """Download the given url and add the file to the collection.
 
-            item = download_manager.get(absolute_url, fileobj=io.BytesIO(),
-                                        auto_remove=True)
-            self.pending_downloads.add(item)
-            item.finished.connect(
-                functools.partial(self.finished, absolute_url, item))
-            item.error.connect(
-                functools.partial(self.error, absolute_url, item))
-            item.cancelled.connect(
-                functools.partial(self.error, absolute_url, item))
+        Args:
+            url: The file to download as QUrl.
+        """
+        # Prevent loading an asset twice
+        if url in self.loaded_urls:
+            return
+        self.loaded_urls.add(url)
+
+        log.misc.debug("loading asset at %s", url)
+
+        download_manager = objreg.get("download-manager", scope="window",
+                                      window="current")
+        item = download_manager.get(url, fileobj=io.BytesIO(),
+                                    auto_remove=True)
+        self.pending_downloads.add(item)
+        item.finished.connect(
+            functools.partial(self.finished, url, item))
+        item.error.connect(
+            functools.partial(self.error, url, item))
+        item.cancelled.connect(
+            functools.partial(self.error, url, item))
 
     def finished(self, url, item):
         """Callback when a single asset is downloaded.
@@ -252,6 +287,14 @@ class _Downloader(object):
         self.pending_downloads.remove(item)
         mime = item.raw_headers.get(b"Content-Type", b"")
         mime = mime.decode("ascii", "ignore")
+
+        if mime.lower() == "text/css":
+            import_urls = _get_css_imports(item.fileobj.getvalue())
+            for import_url in import_urls:
+                import_url = import_url.decode("ascii")
+                absolute_url = QUrl(urljoin(url.toString(), import_url))
+                self.fetch_url(absolute_url)
+
         encode = E_QUOPRI if mime.startswith("text/") else E_BASE64
         self.writer.add_file(url.toString(), item.fileobj.getvalue(), mime,
                              encode)

From 5c6b7157204d5bc7c0a43b178471865f38cd06f4 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Tue, 22 Sep 2015 18:52:44 +0200
Subject: [PATCH 010/104] Use QUrl.resolved instead of urlparse.urljoin

---
 qutebrowser/misc/mhtml.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index b45f0f6a9..9c8e66662 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -227,11 +227,11 @@ class _Downloader(object):
         The object must not be reused, you should create a new one if
         you want to download another page.
         """
-        web_url_str = self.web_view.url().toString()
+        web_url = self.web_view.url()
         web_frame = self.web_view.page().mainFrame()
 
         self.writer.root_content = web_frame.toHtml().encode("utf-8")
-        self.writer.content_location = web_url_str
+        self.writer.content_location = web_url.toString()
         # I've found no way of getting the content type of a QWebView, but
         # since we're using .toHtml, it's probably safe to say that the
         # content-type is HTML
@@ -249,7 +249,7 @@ class _Downloader(object):
             if not element_url:
                 # Might be a local <script> tag or something else
                 continue
-            absolute_url = QUrl(urljoin(web_url_str, element_url))
+            absolute_url = web_url.resolved(QUrl(element_url))
             self.fetch_url(absolute_url)
 
     def fetch_url(self, url):
@@ -292,7 +292,7 @@ class _Downloader(object):
             import_urls = _get_css_imports(item.fileobj.getvalue())
             for import_url in import_urls:
                 import_url = import_url.decode("ascii")
-                absolute_url = QUrl(urljoin(url.toString(), import_url))
+                absolute_url = url.resolved(QUrl(import_url))
                 self.fetch_url(absolute_url)
 
         encode = E_QUOPRI if mime.startswith("text/") else E_BASE64

From 991b6d4fc95aa3ebff37ea995533172a351d0031 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Tue, 22 Sep 2015 19:14:16 +0200
Subject: [PATCH 011/104] Remove urljoin import

---
 qutebrowser/misc/mhtml.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 9c8e66662..f2b04f128 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -26,7 +26,6 @@ import re
 
 from collections import namedtuple
 from base64 import b64encode
-from urllib.parse import urljoin
 from uuid import uuid4
 
 from PyQt5.QtCore import QUrl

From 02c1fa123218aba766d60bb6f4a2337df5d3445a Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 23 Sep 2015 14:30:20 +0200
Subject: [PATCH 012/104] Save mhtml if no assets need to be downloaded

---
 qutebrowser/misc/mhtml.py | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index f2b04f128..e2bb0a4a5 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -119,7 +119,14 @@ E_QUOPRI = ("quoted-printable", _rn_quopri)
 
 class MHTMLWriter(object):
 
-    """A class for outputting multiple files to a MHTML document."""
+    """A class for outputting multiple files to a MHTML document.
+
+    Attributes:
+        root_content: The root content as bytes.
+        content_location: The url of the page as str.
+        content_type: The MIME-type of the root content as str.
+        _files: Mapping of location->_File struct.
+    """
 
     BOUNDARY = b"---qute-mhtml-" + str(uuid4()).encode("ascii")
 
@@ -211,7 +218,16 @@ class MHTMLWriter(object):
 
 class _Downloader(object):
 
-    """A class to download whole websites."""
+    """A class to download whole websites.
+
+    Attributes:
+        web_view: The QWebView which contains the website that will be saved.
+        dest: Destination filename.
+        writer: The MHTMLWriter object which is used to save the page.
+        loaded_urls: A set of QUrls of finished asset downloads.
+        pending_downloads: A set of unfinished DownloadItems.
+        _finished: A flag indicating if the file has already been written.
+    """
 
     def __init__(self, web_view, dest):
         self.web_view = web_view
@@ -219,6 +235,7 @@ class _Downloader(object):
         self.writer = MHTMLWriter()
         self.loaded_urls = {web_view.url()}
         self.pending_downloads = set()
+        self._finished = False
 
     def run(self):
         """Download and save the page.
@@ -251,6 +268,11 @@ class _Downloader(object):
             absolute_url = web_url.resolved(QUrl(element_url))
             self.fetch_url(absolute_url)
 
+        # Shortcut if no assets need to be downloaded, otherwise the file would
+        # never be saved
+        if not elements and not self.pending_downloads:
+            self.finish_file()
+
     def fetch_url(self, url):
         """Download the given url and add the file to the collection.
 
@@ -316,6 +338,9 @@ class _Downloader(object):
 
     def finish_file(self):
         """Save the file to the filename given in __init__."""
+        if self._finished:
+            return
+        self._finished = True
         log.misc.debug("All assets downloaded, ready to finish off!")
         with open(self.dest, "wb") as file_output:
             self.writer.write_to(file_output)

From 8eafa1a105ea6f6e8658bb7c337c703c4b25d833 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 23 Sep 2015 16:18:41 +0200
Subject: [PATCH 013/104] Also scan CSS in <style> tags and inline CSS

As both may contain external links too (@import, url(...))
---
 qutebrowser/misc/mhtml.py | 77 +++++++++++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index e2bb0a4a5..4eece95c4 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -52,8 +52,10 @@ def _get_css_imports(data):
     The returned URLs are relative to the stylesheet's URL.
 
     Args:
-        data: The content of the stylesheet to scan as bytes.
+        data: The content of the stylesheet to scan.
     """
+    if isinstance(data, str):
+        data = data.encode("utf-8")
     urls = []
     for pattern in _CSS_URL_PATTERNS:
         for match in pattern.finditer(data):
@@ -225,7 +227,7 @@ class _Downloader(object):
         dest: Destination filename.
         writer: The MHTMLWriter object which is used to save the page.
         loaded_urls: A set of QUrls of finished asset downloads.
-        pending_downloads: A set of unfinished DownloadItems.
+        pending_downloads: A set of unfinished (url, DownloadItem) tuples.
         _finished: A flag indicating if the file has already been written.
     """
 
@@ -268,9 +270,28 @@ class _Downloader(object):
             absolute_url = web_url.resolved(QUrl(element_url))
             self.fetch_url(absolute_url)
 
+        styles = web_frame.findAllElements("style")
+        for style in styles:
+            if style.attribute("type", "text/css") != "text/css":
+                continue
+            for element_url in _get_css_imports(style.toPlainText()):
+                element_url = element_url.decode("ascii")
+                self.fetch_url(web_url.resolved(QUrl(element_url)))
+
+        # Search for references in inline styles
+        for element in web_frame.findAllElements("*"):
+            style = element.attribute("style")
+            if not style:
+                continue
+            for element_url in _get_css_imports(style):
+                element_url = element_url.decode("ascii")
+                self.fetch_url(web_url.resolved(QUrl(element_url)))
+
         # Shortcut if no assets need to be downloaded, otherwise the file would
-        # never be saved
-        if not elements and not self.pending_downloads:
+        # never be saved. Also might happen if the downloads are fast enough to
+        # complete before connecting their finished signal.
+        self.collect_zombies()
+        if not self.pending_downloads and not self._finished:
             self.finish_file()
 
     def fetch_url(self, url):
@@ -279,6 +300,8 @@ class _Downloader(object):
         Args:
             url: The file to download as QUrl.
         """
+        if url.scheme() == "data":
+            return
         # Prevent loading an asset twice
         if url in self.loaded_urls:
             return
@@ -288,9 +311,9 @@ class _Downloader(object):
 
         download_manager = objreg.get("download-manager", scope="window",
                                       window="current")
-        item = download_manager.get(url, fileobj=io.BytesIO(),
+        item = download_manager.get(url, fileobj=_NoCloseBytesIO(),
                                     auto_remove=True)
-        self.pending_downloads.add(item)
+        self.pending_downloads.add((url, item))
         item.finished.connect(
             functools.partial(self.finished, url, item))
         item.error.connect(
@@ -305,7 +328,7 @@ class _Downloader(object):
             url: The original url of the asset as QUrl.
             item: The DownloadItem given by the DownloadManager
         """
-        self.pending_downloads.remove(item)
+        self.pending_downloads.remove((url, item))
         mime = item.raw_headers.get(b"Content-Type", b"")
         mime = mime.decode("ascii", "ignore")
 
@@ -319,6 +342,7 @@ class _Downloader(object):
         encode = E_QUOPRI if mime.startswith("text/") else E_BASE64
         self.writer.add_file(url.toString(), item.fileobj.getvalue(), mime,
                              encode)
+        item.fileobj.actual_close()
         if self.pending_downloads:
             return
         self.finish_file()
@@ -330,7 +354,14 @@ class _Downloader(object):
             url: The orignal url of the asset as QUrl.
             item: The DownloadItem given by the DownloadManager.
         """
-        self.pending_downloads.remove(item)
+        try:
+            self.pending_downloads.remove((url, item))
+        except KeyError:
+            # This might happen if .collect_zombies() calls .finished() and the
+            # error handler will be called after .collect_zombies
+            log.misc.debug("Oops! Download already gone: %s", item)
+            return
+        item.fileobj.actual_close()
         self.writer.add_file(url.toString(), b"")
         if self.pending_downloads:
             return
@@ -339,6 +370,7 @@ class _Downloader(object):
     def finish_file(self):
         """Save the file to the filename given in __init__."""
         if self._finished:
+            log.misc.debug("finish_file called twice, ignored!")
             return
         self._finished = True
         log.misc.debug("All assets downloaded, ready to finish off!")
@@ -346,6 +378,35 @@ class _Downloader(object):
             self.writer.write_to(file_output)
         message.info("current", "Page saved as {}".format(self.dest), True)
 
+    def collect_zombies(self):
+        """Collect done downloads and add their data to the MHTML file.
+
+        This is needed if a download finishes before attaching its
+        finished signal.
+        """
+        items = set((url, item) for url, item in self.pending_downloads
+                    if item.done)
+        log.misc.debug("Zombie downloads: %s", items)
+        for url, item in items:
+            self.finished(url, item)
+
+
+class _NoCloseBytesIO(io.BytesIO):
+
+    """BytesIO that can't be .closed()
+
+    This is needed to prevent the downloadmanager from closing the stream, thus
+    discarding the data.
+    """
+
+    def close(self):
+        """Do nothing."""
+        pass
+
+    def actual_close(self):
+        """Close the stream."""
+        super().close()
+
 
 def start_download(dest):
     """Start downloading the current page and all assets to a MHTML file.

From 05cc4b9650d767d6d2be0e01d0f4b1e8fda07866 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 23 Sep 2015 16:25:21 +0200
Subject: [PATCH 014/104] Change boundary

This version contains a sequence that is illegal in quoted-printable
and thus safe from accidentally appearing in a website.
---
 qutebrowser/misc/mhtml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 4eece95c4..01f8f5cc9 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -130,7 +130,7 @@ class MHTMLWriter(object):
         _files: Mapping of location->_File struct.
     """
 
-    BOUNDARY = b"---qute-mhtml-" + str(uuid4()).encode("ascii")
+    BOUNDARY = b"---=_qute-" + str(uuid4()).encode("ascii")
 
     def __init__(self, root_content=None, content_location=None,
                  content_type=None):

From 64c74bde904a1e1ba39aaf4108d62e1a3a06ee5d Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 23 Sep 2015 17:18:26 +0200
Subject: [PATCH 015/104] Fix pylint for _NoCloseBytesIO

---
 qutebrowser/misc/mhtml.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 01f8f5cc9..6661fb1ad 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -391,11 +391,11 @@ class _Downloader(object):
             self.finished(url, item)
 
 
-class _NoCloseBytesIO(io.BytesIO):
+class _NoCloseBytesIO(io.BytesIO):  # pylint: disable=no-init
 
-    """BytesIO that can't be .closed()
+    """BytesIO that can't be .closed().
 
-    This is needed to prevent the downloadmanager from closing the stream, thus
+    This is needed to prevent the DownloadManager from closing the stream, thus
     discarding the data.
     """
 

From f58f6f24ee5c996c66c3077e53397a997fef0f8c Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 23 Sep 2015 18:10:14 +0200
Subject: [PATCH 016/104] Use email.mime instead of manually writing the msg

---
 qutebrowser/misc/mhtml.py | 69 +++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 6661fb1ad..e35a012e8 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -27,6 +27,9 @@ import re
 from collections import namedtuple
 from base64 import b64encode
 from uuid import uuid4
+from email import policy
+from email.mime.multipart import MIMEMultipart
+from email.generator import BytesGenerator
 
 from PyQt5.QtCore import QUrl
 
@@ -65,6 +68,9 @@ def _get_css_imports(data):
     return urls
 
 
+MHTMLPolicy = policy.default.clone(linesep="\r\n", max_line_length=0)
+
+
 def _chunked_base64(data, maxlen=76, linesep=b"\r\n"):
     """Just like b64encode, except that it breaks long lines.
 
@@ -130,7 +136,7 @@ class MHTMLWriter(object):
         _files: Mapping of location->_File struct.
     """
 
-    BOUNDARY = b"---=_qute-" + str(uuid4()).encode("ascii")
+    BOUNDARY = "---=_qute-" + str(uuid4())
 
     def __init__(self, root_content=None, content_location=None,
                  content_type=None):
@@ -169,53 +175,38 @@ class MHTMLWriter(object):
         Args:
             fp: The file-object, openend in "wb" mode.
         """
-        self._output_header(fp)
-        self._output_root_file(fp)
+        msg = MIMEMultipart("related", self.BOUNDARY)
+
+        root = self._create_root_file()
+        msg.attach(root)
+
         for file_data in self._files.values():
-            self._output_file(fp, file_data)
-        fp.write(b"\r\n--")
-        fp.write(self.BOUNDARY)
-        fp.write(b"--")
+            msg.attach(self._create_file(file_data))
 
-    def _output_header(self, fp):
-        """Output only the header to the given fileobject."""
-        if self.content_location is None:
-            raise ValueError("content_location must be set")
-        if self.content_type is None:
-            raise ValueError("content_type must be set for the root document")
+        gen = BytesGenerator(fp, policy=MHTMLPolicy)
+        gen.flatten(msg)
 
-        fp.write(b"Content-Location: ")
-        fp.write(self.content_location.encode("utf-8"))
-        fp.write(b'\r\nContent-Type: multipart/related;boundary="')
-        fp.write(self.BOUNDARY)
-        fp.write(b'";type="')
-        fp.write(self.content_type.encode("utf-8"))
-        fp.write(b'"\r\n\r\n')
-
-    def _output_root_file(self, fp):
-        """Output the root document to the fileobject."""
+    def _create_root_file(self):
+        """Return the root document as MIMEMultipart."""
         root_file = _File(
             content=self.root_content, content_type=self.content_type,
             content_location=self.content_location, transfer_encoding=E_QUOPRI,
         )
-        self._output_file(fp, root_file)
+        return self._create_file(root_file)
 
-    def _output_file(self, fp, file_struct):
-        """Output the single given file to the fileobject."""
-        fp.write(b"--")
-        fp.write(self.BOUNDARY)
-        fp.write(b"\r\nContent-Location: ")
-        fp.write(file_struct.content_location.encode("utf-8"))
-        if file_struct.content_type is not None:
-            fp.write(b"\r\nContent-Type: ")
-            fp.write(file_struct.content_type.encode("utf-8"))
-        encoding_name, encoding_func = file_struct.transfer_encoding
+    def _create_file(self, f):
+        """Return the single given file as MIMEMultipart."""
+        msg = MIMEMultipart()
+        msg["Content-Location"] = f.content_location
+        # Get rid of the default type multipart/mixed
+        del msg["Content-Type"]
+        if f.content_type:
+            msg.set_type(f.content_type)
+        encoding_name, encoding_func = f.transfer_encoding
         if encoding_name:
-            fp.write(b"\r\nContent-Transfer-Encoding: ")
-            fp.write(encoding_name.encode("utf-8"))
-        fp.write(b"\r\n\r\n")
-        fp.write(encoding_func(file_struct.content))
-        fp.write(b"\r\n\r\n")
+            msg["Content-Transfer-Encoding"] = encoding_name
+        msg.set_payload(encoding_func(f.content).decode("ascii"))
+        return msg
 
 
 class _Downloader(object):

From 8593144fa78ca950d6acae23732fed70184f4769 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 12:38:52 +0200
Subject: [PATCH 017/104] Make _path_suggestion public

---
 qutebrowser/browser/commands.py  | 6 ++----
 qutebrowser/browser/downloads.py | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6477bf3f4..f1b3f4661 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -37,14 +37,12 @@ import pygments.formatters
 
 from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners
 from qutebrowser.config import config, configexc
-from qutebrowser.browser import webelem, inspector, urlmarks
+from qutebrowser.browser import webelem, inspector, urlmarks, downloads
 from qutebrowser.keyinput import modeman
 from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
                                objreg, utils)
 from qutebrowser.utils.usertypes import KeyMode
 from qutebrowser.misc import editor, guiprocess, mhtml
-from qutebrowser.browser.downloads import (_path_suggestion as
-                                           download_path_suggestion)
 
 
 class CommandDispatcher:
@@ -1172,7 +1170,7 @@ class CommandDispatcher:
             q.text = "Save page to: "
             q.mode = usertypes.PromptMode.text
             q.completed.connect(q.deleteLater)
-            q.default = download_path_suggestion(suggested_fn)
+            q.default = downloads.path_suggestion(suggested_fn)
             q.answered.connect(mhtml.start_download)
             message_bridge = objreg.get("message-bridge", scope="window",
                                         window=self._win_id)
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index c446b6c55..a620970ed 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -70,7 +70,7 @@ def _download_dir():
         return directory
 
 
-def _path_suggestion(filename):
+def path_suggestion(filename):
     """Get the suggested file path.
 
     Args:
@@ -750,7 +750,7 @@ class DownloadManager(QAbstractListModel):
             suggested_fn = utils.force_encoding(suggested_fn, encoding)
 
         q = self._prepare_question()
-        q.default = _path_suggestion(suggested_fn)
+        q.default = path_suggestion(suggested_fn)
         message_bridge = objreg.get('message-bridge', scope='window',
                                     window=self._win_id)
         q.answered.connect(
@@ -839,7 +839,7 @@ class DownloadManager(QAbstractListModel):
             download.autoclose = False
         else:
             q = self._prepare_question()
-            q.default = _path_suggestion(suggested_filename)
+            q.default = path_suggestion(suggested_filename)
             q.answered.connect(download.set_filename)
             q.cancelled.connect(download.cancel)
             download.cancelled.connect(q.abort)

From 83aee4fad5a2c116394a8c5ac1b2943187e9038e Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 12:40:40 +0200
Subject: [PATCH 018/104] Rename on_meta_data_change to on_meta_data_changed

---
 qutebrowser/browser/downloads.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index a620970ed..3478b0a87 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -356,7 +356,7 @@ class DownloadItem(QObject):
         reply.finished.connect(self.on_reply_finished)
         reply.error.connect(self.on_reply_error)
         reply.readyRead.connect(self.on_ready_read)
-        reply.metaDataChanged.connect(self.on_meta_data_change)
+        reply.metaDataChanged.connect(self.on_meta_data_changed)
         self.retry_info = RetryInfo(request=reply.request(),
                                     manager=reply.manager())
         if not self.fileobj:
@@ -600,7 +600,7 @@ class DownloadItem(QObject):
             self._buffer.write(data)
 
     @pyqtSlot()
-    def on_meta_data_change(self):
+    def on_meta_data_changed(self):
         """Update the download's metadata."""
         if self.reply is None:
             return

From a3cc71e317c985464e45c7f9fe2b369b1ac32061 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 12:52:10 +0200
Subject: [PATCH 019/104] Don't from-import functions/classes

---
 qutebrowser/misc/mhtml.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index e35a012e8..4f7aee788 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -24,20 +24,20 @@ import io
 import os
 import re
 
-from collections import namedtuple
-from base64 import b64encode
-from uuid import uuid4
-from email import policy
-from email.mime.multipart import MIMEMultipart
-from email.generator import BytesGenerator
+import collections
+import base64
+import uuid
+from email import policy, generator
+from email.mime import multipart
 
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import log, objreg, message
 
 
-_File = namedtuple("_File",
-                   "content content_type content_location transfer_encoding")
+_File = collections.namedtuple("_File",
+                               ["content", "content_type", "content_location",
+                                "transfer_encoding"])
 
 
 _CSS_URL_PATTERNS = [re.compile(x) for x in [
@@ -78,7 +78,7 @@ def _chunked_base64(data, maxlen=76, linesep=b"\r\n"):
         maxlen: Maximum length of a line, not including the line separator.
         linesep: Line separator to use as bytes.
     """
-    encoded = b64encode(data)
+    encoded = base64.b64encode(data)
     result = []
     for i in range(0, len(encoded), maxlen):
         result.append(encoded[i:i + maxlen])
@@ -136,7 +136,7 @@ class MHTMLWriter(object):
         _files: Mapping of location->_File struct.
     """
 
-    BOUNDARY = "---=_qute-" + str(uuid4())
+    BOUNDARY = "---=_qute-" + str(uuid.uuid4())
 
     def __init__(self, root_content=None, content_location=None,
                  content_type=None):
@@ -175,7 +175,7 @@ class MHTMLWriter(object):
         Args:
             fp: The file-object, openend in "wb" mode.
         """
-        msg = MIMEMultipart("related", self.BOUNDARY)
+        msg = multipart.MIMEMultipart("related", self.BOUNDARY)
 
         root = self._create_root_file()
         msg.attach(root)
@@ -183,7 +183,7 @@ class MHTMLWriter(object):
         for file_data in self._files.values():
             msg.attach(self._create_file(file_data))
 
-        gen = BytesGenerator(fp, policy=MHTMLPolicy)
+        gen = generator.BytesGenerator(fp, policy=MHTMLPolicy)
         gen.flatten(msg)
 
     def _create_root_file(self):
@@ -196,7 +196,7 @@ class MHTMLWriter(object):
 
     def _create_file(self, f):
         """Return the single given file as MIMEMultipart."""
-        msg = MIMEMultipart()
+        msg = multipart.MIMEMultipart()
         msg["Content-Location"] = f.content_location
         # Get rid of the default type multipart/mixed
         del msg["Content-Type"]

From e5bfb9884b701b1a69459a1ba73dcc75348765a9 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 13:22:53 +0200
Subject: [PATCH 020/104] Use WebElementWrapper instead of QWebElement

* also don't derive from object
* also set the _used flag on _Downloader
---
 qutebrowser/misc/mhtml.py | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 4f7aee788..c69b73fa4 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -32,6 +32,7 @@ from email.mime import multipart
 
 from PyQt5.QtCore import QUrl
 
+from qutebrowser.browser import webelem
 from qutebrowser.utils import log, objreg, message
 
 
@@ -125,7 +126,7 @@ E_QUOPRI = ("quoted-printable", _rn_quopri)
 """Encode the file using MIME quoted-printable encoding."""
 
 
-class MHTMLWriter(object):
+class MHTMLWriter():
 
     """A class for outputting multiple files to a MHTML document.
 
@@ -209,7 +210,7 @@ class MHTMLWriter(object):
         return msg
 
 
-class _Downloader(object):
+class _Downloader():
 
     """A class to download whole websites.
 
@@ -220,6 +221,7 @@ class _Downloader(object):
         loaded_urls: A set of QUrls of finished asset downloads.
         pending_downloads: A set of unfinished (url, DownloadItem) tuples.
         _finished: A flag indicating if the file has already been written.
+        _used: A flag indicating if the downloader has already been used.
     """
 
     def __init__(self, web_view, dest):
@@ -229,6 +231,7 @@ class _Downloader(object):
         self.loaded_urls = {web_view.url()}
         self.pending_downloads = set()
         self._finished = False
+        self._used = False
 
     def run(self):
         """Download and save the page.
@@ -236,6 +239,9 @@ class _Downloader(object):
         The object must not be reused, you should create a new one if
         you want to download another page.
         """
+        if self._used:
+            raise ValueError("Downloader already used")
+        self._used = True
         web_url = self.web_view.url()
         web_frame = self.web_view.page().mainFrame()
 
@@ -252,10 +258,12 @@ class _Downloader(object):
                     web_frame.findAllElements("img"))
 
         for element in elements:
-            element_url = element.attribute("src")
-            if not element_url:
-                element_url = element.attribute("href")
-            if not element_url:
+            element = webelem.WebElementWrapper(element)
+            if "src" in element:
+                element_url = element["src"]
+            elif "href" in element:
+                element_url = element["href"]
+            else:
                 # Might be a local <script> tag or something else
                 continue
             absolute_url = web_url.resolved(QUrl(element_url))
@@ -263,17 +271,19 @@ class _Downloader(object):
 
         styles = web_frame.findAllElements("style")
         for style in styles:
-            if style.attribute("type", "text/css") != "text/css":
+            style = webelem.WebElementWrapper(style)
+            if "type" in style and style["type"] != "text/css":
                 continue
-            for element_url in _get_css_imports(style.toPlainText()):
+            for element_url in _get_css_imports(str(style)):
                 element_url = element_url.decode("ascii")
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Search for references in inline styles
         for element in web_frame.findAllElements("*"):
-            style = element.attribute("style")
-            if not style:
+            element = webelem.WebElementWrapper(element)
+            if "style" not in element:
                 continue
+            style = element["style"]
             for element_url in _get_css_imports(style):
                 element_url = element_url.decode("ascii")
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
@@ -367,7 +377,7 @@ class _Downloader(object):
         log.misc.debug("All assets downloaded, ready to finish off!")
         with open(self.dest, "wb") as file_output:
             self.writer.write_to(file_output)
-        message.info("current", "Page saved as {}".format(self.dest), True)
+        message.info("current", "Page saved as {}".format(self.dest))
 
     def collect_zombies(self):
         """Collect done downloads and add their data to the MHTML file.

From d3a21927f27bc4c097afc6f5d154e685ebca3a2b Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 13:30:47 +0200
Subject: [PATCH 021/104] Remove default values in MHTMLWriter.__init__

---
 qutebrowser/misc/mhtml.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index c69b73fa4..25972d127 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -139,8 +139,7 @@ class MHTMLWriter():
 
     BOUNDARY = "---=_qute-" + str(uuid.uuid4())
 
-    def __init__(self, root_content=None, content_location=None,
-                 content_type=None):
+    def __init__(self, root_content, content_location, content_type):
         self.root_content = root_content
         self.content_location = content_location
         self.content_type = content_type
@@ -227,7 +226,7 @@ class _Downloader():
     def __init__(self, web_view, dest):
         self.web_view = web_view
         self.dest = dest
-        self.writer = MHTMLWriter()
+        self.writer = None
         self.loaded_urls = {web_view.url()}
         self.pending_downloads = set()
         self._finished = False
@@ -245,12 +244,14 @@ class _Downloader():
         web_url = self.web_view.url()
         web_frame = self.web_view.page().mainFrame()
 
-        self.writer.root_content = web_frame.toHtml().encode("utf-8")
-        self.writer.content_location = web_url.toString()
-        # I've found no way of getting the content type of a QWebView, but
-        # since we're using .toHtml, it's probably safe to say that the
-        # content-type is HTML
-        self.writer.content_type = 'text/html; charset="UTF-8"'
+        self.writer = MHTMLWriter(
+            web_frame.toHtml().encode("utf-8"),
+            content_location = web_url.toString(),
+            # I've found no way of getting the content type of a QWebView, but
+            # since we're using .toHtml, it's probably safe to say that the
+            # content-type is HTML
+            content_type = 'text/html; charset="UTF-8"',
+        )
         # Currently only downloading <link> (stylesheets), <script>
         # (javascript) and <img> (image) elements.
         elements = (web_frame.findAllElements("link") +

From ba81332d45c934d4b988c4e1408c7a5b4e1e4d46 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 13:48:58 +0200
Subject: [PATCH 022/104] _get_css_imports now works on strings only

This also means that it returns strings, making the calls to .decode
unneeded.
---
 qutebrowser/misc/mhtml.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 25972d127..4c77a9829 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -42,11 +42,11 @@ _File = collections.namedtuple("_File",
 
 
 _CSS_URL_PATTERNS = [re.compile(x) for x in [
-    rb"@import '(?P<url>[^']+)'",
-    rb'@import "(?P<url>[^"]+)"',
-    rb'''url\((?P<url>[^'"][^)]*)\)''',
-    rb'url\("(?P<url>[^"]+)"\)',
-    rb"url\('(?P<url>[^']+)'\)",
+    r"@import '(?P<url>[^']+)'",
+    r'@import "(?P<url>[^"]+)"',
+    r'''url\((?P<url>[^'"][^)]*)\)''',
+    r'url\("(?P<url>[^"]+)"\)',
+    r"url\('(?P<url>[^']+)'\)",
 ]]
 
 
@@ -56,10 +56,8 @@ def _get_css_imports(data):
     The returned URLs are relative to the stylesheet's URL.
 
     Args:
-        data: The content of the stylesheet to scan.
+        data: The content of the stylesheet to scan as string.
     """
-    if isinstance(data, str):
-        data = data.encode("utf-8")
     urls = []
     for pattern in _CSS_URL_PATTERNS:
         for match in pattern.finditer(data):
@@ -246,11 +244,11 @@ class _Downloader():
 
         self.writer = MHTMLWriter(
             web_frame.toHtml().encode("utf-8"),
-            content_location = web_url.toString(),
+            content_location=web_url.toString(),
             # I've found no way of getting the content type of a QWebView, but
             # since we're using .toHtml, it's probably safe to say that the
             # content-type is HTML
-            content_type = 'text/html; charset="UTF-8"',
+            content_type='text/html; charset="UTF-8"',
         )
         # Currently only downloading <link> (stylesheets), <script>
         # (javascript) and <img> (image) elements.
@@ -276,7 +274,6 @@ class _Downloader():
             if "type" in style and style["type"] != "text/css":
                 continue
             for element_url in _get_css_imports(str(style)):
-                element_url = element_url.decode("ascii")
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Search for references in inline styles
@@ -286,7 +283,6 @@ class _Downloader():
                 continue
             style = element["style"]
             for element_url in _get_css_imports(style):
-                element_url = element_url.decode("ascii")
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Shortcut if no assets need to be downloaded, otherwise the file would
@@ -335,9 +331,19 @@ class _Downloader():
         mime = mime.decode("ascii", "ignore")
 
         if mime.lower() == "text/css":
-            import_urls = _get_css_imports(item.fileobj.getvalue())
+            # We can't always assume that CSS files are UTF-8, but CSS files
+            # shouldn't contain many non-ASCII characters anyway (in most
+            # cases). Using "ignore" lets us decode the file even if it's
+            # invalid UTF-8 data.
+            # The file written to the MHTML file won't be modified by this
+            # decoding, since there we're taking the original bytestream.
+            try:
+                css_string = item.fileobj.getvalue().decode("utf-8")
+            except UnicodeDecodeError:
+                log.misc.warning("Invalid UTF-8 data in %s", url)
+                css_string = item.fileobj.getvalue().decode("utf-8", "ignore")
+            import_urls = _get_css_imports(css_string)
             for import_url in import_urls:
-                import_url = import_url.decode("ascii")
                 absolute_url = url.resolved(QUrl(import_url))
                 self.fetch_url(absolute_url)
 

From a63aed5965a0987d29517d4b715a32bfffc92c1f Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 14:07:12 +0200
Subject: [PATCH 023/104] Use email.encoders instead of own encoder function

---
 qutebrowser/misc/mhtml.py | 60 ++++-----------------------------------
 1 file changed, 5 insertions(+), 55 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 4c77a9829..c4d6d6ebc 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -25,9 +25,8 @@ import os
 import re
 
 import collections
-import base64
 import uuid
-from email import policy, generator
+from email import policy, generator, encoders
 from email.mime import multipart
 
 from PyQt5.QtCore import QUrl
@@ -70,57 +69,10 @@ def _get_css_imports(data):
 MHTMLPolicy = policy.default.clone(linesep="\r\n", max_line_length=0)
 
 
-def _chunked_base64(data, maxlen=76, linesep=b"\r\n"):
-    """Just like b64encode, except that it breaks long lines.
-
-    Args:
-        maxlen: Maximum length of a line, not including the line separator.
-        linesep: Line separator to use as bytes.
-    """
-    encoded = base64.b64encode(data)
-    result = []
-    for i in range(0, len(encoded), maxlen):
-        result.append(encoded[i:i + maxlen])
-    return linesep.join(result)
-
-
-def _rn_quopri(data):
-    """Return a quoted-printable representation of data."""
-    # See RFC 2045 https://tools.ietf.org/html/rfc2045#section-6.7
-    # The stdlib version in the quopri module has inconsistencies with line
-    # endings and breaks up character escapes over multiple lines, which isn't
-    # understood by qute and leads to jumbled text
-    maxlen = 76
-    whitespace = {ord(b"\t"), ord(b" ")}
-    output = []
-    current_line = b""
-    for byte in data:
-        # Literal representation according to (2) and (3)
-        if (ord(b"!") <= byte <= ord(b"<") or ord(b">") <= byte <= ord(b"~")
-                or byte in whitespace):
-            current_line += bytes([byte])
-        else:
-            current_line += b"=" + "{:02X}".format(byte).encode("ascii")
-        if len(current_line) >= maxlen:
-            # We need to account for the = character
-            split = [current_line[:maxlen - 1], current_line[maxlen - 1:]]
-            quoted_pos = split[0].rfind(b"=")
-            if quoted_pos + 2 >= maxlen - 1:
-                split[0], token = split[0][:quoted_pos], split[0][quoted_pos:]
-                split[1] = token + split[1]
-            current_line = split[1]
-            output.append(split[0] + b"=")
-    output.append(current_line)
-    return b"\r\n".join(output)
-
-
-E_NONE = (None, lambda x: x)
-"""No transfer encoding, copy the bytes from input to output"""
-
-E_BASE64 = ("base64", _chunked_base64)
+E_BASE64 = encoders.encode_base64
 """Encode the file using base64 encoding"""
 
-E_QUOPRI = ("quoted-printable", _rn_quopri)
+E_QUOPRI = encoders.encode_quopri
 """Encode the file using MIME quoted-printable encoding."""
 
 
@@ -200,10 +152,8 @@ class MHTMLWriter():
         del msg["Content-Type"]
         if f.content_type:
             msg.set_type(f.content_type)
-        encoding_name, encoding_func = f.transfer_encoding
-        if encoding_name:
-            msg["Content-Transfer-Encoding"] = encoding_name
-        msg.set_payload(encoding_func(f.content).decode("ascii"))
+        msg.set_payload(f.content)
+        f.transfer_encoding(msg)
         return msg
 
 

From cb477a26235fe6f60a434f7bf6e29d27f4579703 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 14:27:17 +0200
Subject: [PATCH 024/104] Decode headers with ISO-8859-1 instead of ASCII

---
 qutebrowser/misc/mhtml.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index c4d6d6ebc..cc7e7186e 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -278,7 +278,17 @@ class _Downloader():
         """
         self.pending_downloads.remove((url, item))
         mime = item.raw_headers.get(b"Content-Type", b"")
-        mime = mime.decode("ascii", "ignore")
+
+        # Note that this decoding always works and doesn't produce errors
+        # RFC 7230 (https://tools.ietf.org/html/rfc7230) states:
+        # Historically, HTTP has allowed field content with text in the
+        # ISO-8859-1 charset [ISO-8859-1], supporting other charsets only
+        # through use of [RFC2047] encoding.  In practice, most HTTP header
+        # field values use only a subset of the US-ASCII charset [USASCII].
+        # Newly defined header fields SHOULD limit their field values to
+        # US-ASCII octets.  A recipient SHOULD treat other octets in field
+        # content (obs-text) as opaque data.
+        mime = mime.decode("iso-8859-1")
 
         if mime.lower() == "text/css":
             # We can't always assume that CSS files are UTF-8, but CSS files

From afa2f339e66c0bdd55bb5d8b01005031a9acb609 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 14:37:50 +0200
Subject: [PATCH 025/104] mhtm: use downloads logger instead of misc

---
 qutebrowser/misc/mhtml.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index cc7e7186e..228b31648 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -255,7 +255,7 @@ class _Downloader():
             return
         self.loaded_urls.add(url)
 
-        log.misc.debug("loading asset at %s", url)
+        log.downloads.debug("loading asset at %s", url)
 
         download_manager = objreg.get("download-manager", scope="window",
                                       window="current")
@@ -300,7 +300,7 @@ class _Downloader():
             try:
                 css_string = item.fileobj.getvalue().decode("utf-8")
             except UnicodeDecodeError:
-                log.misc.warning("Invalid UTF-8 data in %s", url)
+                log.downloads.warning("Invalid UTF-8 data in %s", url)
                 css_string = item.fileobj.getvalue().decode("utf-8", "ignore")
             import_urls = _get_css_imports(css_string)
             for import_url in import_urls:
@@ -327,7 +327,7 @@ class _Downloader():
         except KeyError:
             # This might happen if .collect_zombies() calls .finished() and the
             # error handler will be called after .collect_zombies
-            log.misc.debug("Oops! Download already gone: %s", item)
+            log.downloads.debug("Oops! Download already gone: %s", item)
             return
         item.fileobj.actual_close()
         self.writer.add_file(url.toString(), b"")
@@ -338,10 +338,10 @@ class _Downloader():
     def finish_file(self):
         """Save the file to the filename given in __init__."""
         if self._finished:
-            log.misc.debug("finish_file called twice, ignored!")
+            log.downloads.debug("finish_file called twice, ignored!")
             return
         self._finished = True
-        log.misc.debug("All assets downloaded, ready to finish off!")
+        log.downloads.debug("All assets downloaded, ready to finish off!")
         with open(self.dest, "wb") as file_output:
             self.writer.write_to(file_output)
         message.info("current", "Page saved as {}".format(self.dest))
@@ -354,7 +354,7 @@ class _Downloader():
         """
         items = set((url, item) for url, item in self.pending_downloads
                     if item.done)
-        log.misc.debug("Zombie downloads: %s", items)
+        log.downloads.debug("Zombie downloads: %s", items)
         for url, item in items:
             self.finished(url, item)
 

From 5fcbc839bbfcaecadffdcf71836d8685d11793b0 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 17:55:18 +0200
Subject: [PATCH 026/104] Allow many spaces and tabs after @import in CSS

---
 qutebrowser/misc/mhtml.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 228b31648..681a563c8 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -41,8 +41,8 @@ _File = collections.namedtuple("_File",
 
 
 _CSS_URL_PATTERNS = [re.compile(x) for x in [
-    r"@import '(?P<url>[^']+)'",
-    r'@import "(?P<url>[^"]+)"',
+    r"@import\s+'(?P<url>[^']+)'",
+    r'@import\s+"(?P<url>[^"]+)"',
     r'''url\((?P<url>[^'"][^)]*)\)''',
     r'url\("(?P<url>[^"]+)"\)',
     r"url\('(?P<url>[^']+)'\)",

From bf90c8c06b6ff21b8f19ddb739b033f37b70d529 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 17:56:33 +0200
Subject: [PATCH 027/104] Add tests for mhtml

This also makes the output of MHTMLWriter deterministic, by

1) Setting the boundary at object creation, allowing uuid.uuid4 to be
   monkey patched

2) Outputting the files in sorted order (sorted by location), as python
   dicts are unordered by default.
---
 qutebrowser/misc/mhtml.py     |   7 +-
 tests/unit/misc/test_mhtml.py | 268 ++++++++++++++++++++++++++++++++++
 2 files changed, 271 insertions(+), 4 deletions(-)
 create mode 100644 tests/unit/misc/test_mhtml.py

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 681a563c8..56cb974a7 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -87,8 +87,6 @@ class MHTMLWriter():
         _files: Mapping of location->_File struct.
     """
 
-    BOUNDARY = "---=_qute-" + str(uuid.uuid4())
-
     def __init__(self, root_content, content_location, content_type):
         self.root_content = root_content
         self.content_location = content_location
@@ -125,12 +123,13 @@ class MHTMLWriter():
         Args:
             fp: The file-object, openend in "wb" mode.
         """
-        msg = multipart.MIMEMultipart("related", self.BOUNDARY)
+        msg = multipart.MIMEMultipart("related",
+                                      "---=_qute-{}".format(uuid.uuid4()))
 
         root = self._create_root_file()
         msg.attach(root)
 
-        for file_data in self._files.values():
+        for _, file_data in sorted(self._files.items()):
             msg.attach(self._create_file(file_data))
 
         gen = generator.BytesGenerator(fp, policy=MHTMLPolicy)
diff --git a/tests/unit/misc/test_mhtml.py b/tests/unit/misc/test_mhtml.py
new file mode 100644
index 000000000..8f0a59379
--- /dev/null
+++ b/tests/unit/misc/test_mhtml.py
@@ -0,0 +1,268 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+import io
+import textwrap
+import re
+
+import pytest
+
+from qutebrowser.misc import mhtml
+
+@pytest.fixture(autouse=True)
+def patch_uuid(monkeypatch):
+    monkeypatch.setattr("uuid.uuid4", lambda: "UUID")
+
+
+class Checker:
+
+    """A helper to check mhtml output.
+
+    Attrs:
+        fp: A BytesIO object for passing to MHTMLWriter.write_to.
+    """
+
+    def __init__(self):
+        self.fp = io.BytesIO()
+
+    @property
+    def value(self):
+        return self.fp.getvalue()
+
+    def expect(self, expected):
+        actual = self.value.decode("ascii")
+        # Make sure there are no stray \r or \n
+        assert re.search(r"\r[^\n]", actual) is None
+        assert re.search(r"[^\r]\n", actual) is None
+        actual = actual.replace("\r\n", "\n")
+        expected = textwrap.dedent(expected).lstrip("\n")
+        assert expected == actual
+
+
+@pytest.fixture
+def checker():
+    return Checker()
+
+
+def test_quoted_printable_umlauts(checker):
+    content = "Die süße Hündin läuft in die Höhle des Bären"
+    content = content.encode("iso-8859-1")
+    writer = mhtml.MHTMLWriter(root_content=content,
+                               content_location="localhost",
+                               content_type="text/plain")
+    writer.write_to(checker.fp)
+    checker.expect("""
+    Content-Type: multipart/related; boundary="---=_qute-UUID"
+    MIME-Version: 1.0
+
+    -----=_qute-UUID
+    Content-Location: localhost
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    Die=20s=FC=DFe=20H=FCndin=20l=E4uft=20in=20die=20H=F6hle=20des=20B=E4ren
+    -----=_qute-UUID--
+    """)
+
+
+@pytest.mark.parametrize("header, value", [
+    ("content_location", "http://brötli.com"),
+    ("content_type", "text/pläin"),
+])
+def test_refuses_non_ascii_header_value(checker, header, value):
+    defaults = {
+        "root_content": b"",
+        "content_location": "http://example.com",
+        "content_type": "text/plain",
+    }
+    defaults[header] = value
+    writer = mhtml.MHTMLWriter(**defaults)
+    with pytest.raises(UnicodeEncodeError) as e:
+        writer.write_to(checker.fp)
+        assert "'ascii' codec can't encode" in str(e)
+
+
+def test_file_encoded_as_base64(checker):
+    content = b"Image file attached"
+    writer = mhtml.MHTMLWriter(root_content=content, content_type="text/plain",
+                               content_location="http://example.com")
+    writer.add_file(location="http://a.example.com/image.png",
+                    content="\U0001F601 image data".encode("utf-8"),
+                    content_type="image/png",
+                    transfer_encoding=mhtml.E_BASE64)
+    writer.write_to(checker.fp)
+    checker.expect("""
+    Content-Type: multipart/related; boundary="---=_qute-UUID"
+    MIME-Version: 1.0
+
+    -----=_qute-UUID
+    Content-Location: http://example.com
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    Image=20file=20attached
+    -----=_qute-UUID
+    Content-Location: http://a.example.com/image.png
+    MIME-Version: 1.0
+    Content-Type: image/png
+    Content-Transfer-Encoding: base64
+
+    8J+YgSBpbWFnZSBkYXRh
+
+    -----=_qute-UUID--
+    """)
+
+
+@pytest.mark.parametrize("transfer_encoding", [mhtml.E_BASE64, mhtml.E_QUOPRI],
+                         ids=["base64", "quoted-printable"])
+def test_payload_lines_wrap(checker, transfer_encoding):
+    payload = b"1234567890" * 10
+    writer = mhtml.MHTMLWriter(root_content=b"", content_type="text/plain",
+                               content_location="http://example.com")
+    writer.add_file(location="http://example.com/payload", content=payload,
+                    content_type="text/plain",
+                    transfer_encoding=transfer_encoding)
+    writer.write_to(checker.fp)
+    for line in checker.value.split(b"\r\n"):
+        assert len(line) < 77
+
+
+def test_files_appear_sorted(checker):
+    writer = mhtml.MHTMLWriter(root_content=b"root file",
+                               content_type="text/plain",
+                               content_location="http://www.example.com/")
+    for subdomain in "ahgbizt":
+        writer.add_file(location="http://{}.example.com/".format(subdomain),
+                        content="file {}".format(subdomain).encode("utf-8"),
+                        content_type="text/plain",
+                        transfer_encoding=mhtml.E_QUOPRI)
+    writer.write_to(checker.fp)
+    checker.expect("""
+    Content-Type: multipart/related; boundary="---=_qute-UUID"
+    MIME-Version: 1.0
+
+    -----=_qute-UUID
+    Content-Location: http://www.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    root=20file
+    -----=_qute-UUID
+    Content-Location: http://a.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20a
+    -----=_qute-UUID
+    Content-Location: http://b.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20b
+    -----=_qute-UUID
+    Content-Location: http://g.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20g
+    -----=_qute-UUID
+    Content-Location: http://h.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20h
+    -----=_qute-UUID
+    Content-Location: http://i.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20i
+    -----=_qute-UUID
+    Content-Location: http://t.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20t
+    -----=_qute-UUID
+    Content-Location: http://z.example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20z
+    -----=_qute-UUID--
+    """)
+
+
+def test_empty_content_type(checker):
+    writer = mhtml.MHTMLWriter(root_content=b"",
+                               content_location="http://example.com/",
+                               content_type="text/plain")
+    writer.add_file("http://example.com/file", b"file content")
+    writer.write_to(checker.fp)
+    checker.expect("""
+    Content-Type: multipart/related; boundary="---=_qute-UUID"
+    MIME-Version: 1.0
+
+    -----=_qute-UUID
+    Content-Location: http://example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+
+    -----=_qute-UUID
+    MIME-Version: 1.0
+    Content-Location: http://example.com/file
+    Content-Transfer-Encoding: quoted-printable
+
+    file=20content
+    -----=_qute-UUID--
+    """)
+
+
+def test_removing_file_from_mhtml(checker):
+    writer = mhtml.MHTMLWriter(root_content=b"root",
+                               content_location="http://example.com/",
+                               content_type="text/plain")
+    writer.add_file("http://evil.com/", b"file content")
+    writer.remove_file("http://evil.com/")
+    writer.write_to(checker.fp)
+    checker.expect("""
+    Content-Type: multipart/related; boundary="---=_qute-UUID"
+    MIME-Version: 1.0
+
+    -----=_qute-UUID
+    Content-Location: http://example.com/
+    MIME-Version: 1.0
+    Content-Type: text/plain
+    Content-Transfer-Encoding: quoted-printable
+
+    root
+    -----=_qute-UUID--
+    """)
+
+
+@pytest.mark.parametrize("style, expected_urls", [
+    ("@import 'default.css'", ["default.css"]),
+    ('@import "default.css"', ["default.css"]),
+    ("@import \t 'tabbed.css'", ["tabbed.css"]),
+    ("@import url('default.css')", ["default.css"]),
+    ("""body {
+    background: url("/bg-img.png")
+    }""", ["/bg-img.png"]),
+    ("background: url(folder/file.png)", ["folder/file.png"]),
+    ("content: url()", []),
+])
+def test_css_url_scanner(style, expected_urls):
+    expected_urls.sort()
+    urls = mhtml._get_css_imports(style)
+    urls.sort()
+    assert urls == expected_urls

From 366916a8bf602675c5e58c824cc19c323a3d749f Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 20:36:02 +0200
Subject: [PATCH 028/104] Use more specific selectors to filter webelements

---
 qutebrowser/misc/mhtml.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 56cb974a7..9a5d19850 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -201,9 +201,7 @@ class _Downloader():
         )
         # Currently only downloading <link> (stylesheets), <script>
         # (javascript) and <img> (image) elements.
-        elements = (web_frame.findAllElements("link") +
-                    web_frame.findAllElements("script") +
-                    web_frame.findAllElements("img"))
+        elements = web_frame.findAllElements("link, script, img")
 
         for element in elements:
             element = webelem.WebElementWrapper(element)
@@ -226,10 +224,8 @@ class _Downloader():
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Search for references in inline styles
-        for element in web_frame.findAllElements("*"):
+        for element in web_frame.findAllElements("[style]"):
             element = webelem.WebElementWrapper(element)
-            if "style" not in element:
-                continue
             style = element["style"]
             for element_url in _get_css_imports(style):
                 self.fetch_url(web_url.resolved(QUrl(element_url)))

From 9bf9124324b2b1e7c2e9c958bcd1106de9dfdc01 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 20:43:30 +0200
Subject: [PATCH 029/104] Fix mhtml tests, add test for _NoCloseBytesIO

---
 tests/unit/misc/test_mhtml.py | 229 +++++++++++++++++++---------------
 1 file changed, 125 insertions(+), 104 deletions(-)

diff --git a/tests/unit/misc/test_mhtml.py b/tests/unit/misc/test_mhtml.py
index 8f0a59379..271d1fc1b 100644
--- a/tests/unit/misc/test_mhtml.py
+++ b/tests/unit/misc/test_mhtml.py
@@ -50,18 +50,18 @@ def test_quoted_printable_umlauts(checker):
                                content_type="text/plain")
     writer.write_to(checker.fp)
     checker.expect("""
-    Content-Type: multipart/related; boundary="---=_qute-UUID"
-    MIME-Version: 1.0
+        Content-Type: multipart/related; boundary="---=_qute-UUID"
+        MIME-Version: 1.0
 
-    -----=_qute-UUID
-    Content-Location: localhost
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        -----=_qute-UUID
+        Content-Location: localhost
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    Die=20s=FC=DFe=20H=FCndin=20l=E4uft=20in=20die=20H=F6hle=20des=20B=E4ren
-    -----=_qute-UUID--
-    """)
+        Die=20s=FC=DFe=20H=FCndin=20l=E4uft=20in=20die=20H=F6hle=20des=20B=E4ren
+        -----=_qute-UUID--
+        """)
 
 
 @pytest.mark.parametrize("header, value", [
@@ -76,9 +76,9 @@ def test_refuses_non_ascii_header_value(checker, header, value):
     }
     defaults[header] = value
     writer = mhtml.MHTMLWriter(**defaults)
-    with pytest.raises(UnicodeEncodeError) as e:
+    with pytest.raises(UnicodeEncodeError) as excinfo:
         writer.write_to(checker.fp)
-        assert "'ascii' codec can't encode" in str(e)
+        assert "'ascii' codec can't encode" in str(excinfo.value)
 
 
 def test_file_encoded_as_base64(checker):
@@ -91,26 +91,26 @@ def test_file_encoded_as_base64(checker):
                     transfer_encoding=mhtml.E_BASE64)
     writer.write_to(checker.fp)
     checker.expect("""
-    Content-Type: multipart/related; boundary="---=_qute-UUID"
-    MIME-Version: 1.0
+        Content-Type: multipart/related; boundary="---=_qute-UUID"
+        MIME-Version: 1.0
 
-    -----=_qute-UUID
-    Content-Location: http://example.com
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        -----=_qute-UUID
+        Content-Location: http://example.com
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    Image=20file=20attached
-    -----=_qute-UUID
-    Content-Location: http://a.example.com/image.png
-    MIME-Version: 1.0
-    Content-Type: image/png
-    Content-Transfer-Encoding: base64
+        Image=20file=20attached
+        -----=_qute-UUID
+        Content-Location: http://a.example.com/image.png
+        MIME-Version: 1.0
+        Content-Type: image/png
+        Content-Transfer-Encoding: base64
 
-    8J+YgSBpbWFnZSBkYXRh
+        8J+YgSBpbWFnZSBkYXRh
 
-    -----=_qute-UUID--
-    """)
+        -----=_qute-UUID--
+        """)
 
 
 @pytest.mark.parametrize("transfer_encoding", [mhtml.E_BASE64, mhtml.E_QUOPRI],
@@ -138,67 +138,67 @@ def test_files_appear_sorted(checker):
                         transfer_encoding=mhtml.E_QUOPRI)
     writer.write_to(checker.fp)
     checker.expect("""
-    Content-Type: multipart/related; boundary="---=_qute-UUID"
-    MIME-Version: 1.0
+        Content-Type: multipart/related; boundary="---=_qute-UUID"
+        MIME-Version: 1.0
 
-    -----=_qute-UUID
-    Content-Location: http://www.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        -----=_qute-UUID
+        Content-Location: http://www.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    root=20file
-    -----=_qute-UUID
-    Content-Location: http://a.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        root=20file
+        -----=_qute-UUID
+        Content-Location: http://a.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20a
-    -----=_qute-UUID
-    Content-Location: http://b.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        file=20a
+        -----=_qute-UUID
+        Content-Location: http://b.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20b
-    -----=_qute-UUID
-    Content-Location: http://g.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        file=20b
+        -----=_qute-UUID
+        Content-Location: http://g.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20g
-    -----=_qute-UUID
-    Content-Location: http://h.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        file=20g
+        -----=_qute-UUID
+        Content-Location: http://h.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20h
-    -----=_qute-UUID
-    Content-Location: http://i.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        file=20h
+        -----=_qute-UUID
+        Content-Location: http://i.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20i
-    -----=_qute-UUID
-    Content-Location: http://t.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        file=20i
+        -----=_qute-UUID
+        Content-Location: http://t.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20t
-    -----=_qute-UUID
-    Content-Location: http://z.example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        file=20t
+        -----=_qute-UUID
+        Content-Location: http://z.example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20z
-    -----=_qute-UUID--
-    """)
+        file=20z
+        -----=_qute-UUID--
+        """)
 
 
 def test_empty_content_type(checker):
@@ -208,24 +208,24 @@ def test_empty_content_type(checker):
     writer.add_file("http://example.com/file", b"file content")
     writer.write_to(checker.fp)
     checker.expect("""
-    Content-Type: multipart/related; boundary="---=_qute-UUID"
-    MIME-Version: 1.0
+        Content-Type: multipart/related; boundary="---=_qute-UUID"
+        MIME-Version: 1.0
 
-    -----=_qute-UUID
-    Content-Location: http://example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        -----=_qute-UUID
+        Content-Location: http://example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
 
-    -----=_qute-UUID
-    MIME-Version: 1.0
-    Content-Location: http://example.com/file
-    Content-Transfer-Encoding: quoted-printable
+        -----=_qute-UUID
+        MIME-Version: 1.0
+        Content-Location: http://example.com/file
+        Content-Transfer-Encoding: quoted-printable
 
-    file=20content
-    -----=_qute-UUID--
-    """)
+        file=20content
+        -----=_qute-UUID--
+        """)
 
 
 def test_removing_file_from_mhtml(checker):
@@ -236,18 +236,18 @@ def test_removing_file_from_mhtml(checker):
     writer.remove_file("http://evil.com/")
     writer.write_to(checker.fp)
     checker.expect("""
-    Content-Type: multipart/related; boundary="---=_qute-UUID"
-    MIME-Version: 1.0
+        Content-Type: multipart/related; boundary="---=_qute-UUID"
+        MIME-Version: 1.0
 
-    -----=_qute-UUID
-    Content-Location: http://example.com/
-    MIME-Version: 1.0
-    Content-Type: text/plain
-    Content-Transfer-Encoding: quoted-printable
+        -----=_qute-UUID
+        Content-Location: http://example.com/
+        MIME-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: quoted-printable
 
-    root
-    -----=_qute-UUID--
-    """)
+        root
+        -----=_qute-UUID--
+        """)
 
 
 @pytest.mark.parametrize("style, expected_urls", [
@@ -266,3 +266,24 @@ def test_css_url_scanner(style, expected_urls):
     urls = mhtml._get_css_imports(style)
     urls.sort()
     assert urls == expected_urls
+
+
+def test_noclose_bytesio_fake_close():
+    fp = mhtml._NoCloseBytesIO()
+    fp.write(b'Value')
+    fp.close()
+    assert fp.getvalue() == b'Value'
+    fp.write(b'Eulav')
+    assert fp.getvalue() == b'ValueEulav'
+
+
+def test_noclose_bytesio_actual_close():
+    fp = mhtml._NoCloseBytesIO()
+    fp.write(b'Value')
+    fp.actual_close()
+    with pytest.raises(ValueError) as excinfo:
+        fp.getvalue()
+        assert 'I/O operation on closed file.' == str(excinfo.value)
+    with pytest.raises(ValueError) as excinfo:
+        fp.write(b'Closed')
+        assert 'I/O operation on closed file.' == str(excinfo.value)

From a092ef1fe649399f946d024c08e81653e0a42903 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 21:56:02 +0200
Subject: [PATCH 030/104] String quote style changes

"" for user facing strings
'' for internal strings
except when quotes appear inside a string, to avoid escaping them
---
 qutebrowser/misc/mhtml.py     |  64 ++++++++++----------
 tests/unit/misc/test_mhtml.py | 106 +++++++++++++++++-----------------
 2 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/misc/mhtml.py
index 9a5d19850..ce909f683 100644
--- a/qutebrowser/misc/mhtml.py
+++ b/qutebrowser/misc/mhtml.py
@@ -35,9 +35,9 @@ from qutebrowser.browser import webelem
 from qutebrowser.utils import log, objreg, message
 
 
-_File = collections.namedtuple("_File",
-                               ["content", "content_type", "content_location",
-                                "transfer_encoding"])
+_File = collections.namedtuple('_File',
+                               ['content', 'content_type', 'content_location',
+                                'transfer_encoding'])
 
 
 _CSS_URL_PATTERNS = [re.compile(x) for x in [
@@ -51,9 +51,7 @@ _CSS_URL_PATTERNS = [re.compile(x) for x in [
 
 def _get_css_imports(data):
     """Return all assets that are referenced in the given CSS document.
-
     The returned URLs are relative to the stylesheet's URL.
-
     Args:
         data: The content of the stylesheet to scan as string.
     """
@@ -66,7 +64,7 @@ def _get_css_imports(data):
     return urls
 
 
-MHTMLPolicy = policy.default.clone(linesep="\r\n", max_line_length=0)
+MHTMLPolicy = policy.default.clone(linesep='\r\n', max_line_length=0)
 
 
 E_BASE64 = encoders.encode_base64
@@ -123,8 +121,8 @@ class MHTMLWriter():
         Args:
             fp: The file-object, openend in "wb" mode.
         """
-        msg = multipart.MIMEMultipart("related",
-                                      "---=_qute-{}".format(uuid.uuid4()))
+        msg = multipart.MIMEMultipart('related',
+                                      '---=_qute-{}'.format(uuid.uuid4()))
 
         root = self._create_root_file()
         msg.attach(root)
@@ -146,9 +144,9 @@ class MHTMLWriter():
     def _create_file(self, f):
         """Return the single given file as MIMEMultipart."""
         msg = multipart.MIMEMultipart()
-        msg["Content-Location"] = f.content_location
+        msg['Content-Location'] = f.content_location
         # Get rid of the default type multipart/mixed
-        del msg["Content-Type"]
+        del msg['Content-Type']
         if f.content_type:
             msg.set_type(f.content_type)
         msg.set_payload(f.content)
@@ -192,7 +190,7 @@ class _Downloader():
         web_frame = self.web_view.page().mainFrame()
 
         self.writer = MHTMLWriter(
-            web_frame.toHtml().encode("utf-8"),
+            web_frame.toHtml().encode('utf-8'),
             content_location=web_url.toString(),
             # I've found no way of getting the content type of a QWebView, but
             # since we're using .toHtml, it's probably safe to say that the
@@ -201,32 +199,32 @@ class _Downloader():
         )
         # Currently only downloading <link> (stylesheets), <script>
         # (javascript) and <img> (image) elements.
-        elements = web_frame.findAllElements("link, script, img")
+        elements = web_frame.findAllElements('link, script, img')
 
         for element in elements:
             element = webelem.WebElementWrapper(element)
-            if "src" in element:
-                element_url = element["src"]
-            elif "href" in element:
-                element_url = element["href"]
+            if 'src' in element:
+                element_url = element['src']
+            elif 'href' in element:
+                element_url = element['href']
             else:
                 # Might be a local <script> tag or something else
                 continue
             absolute_url = web_url.resolved(QUrl(element_url))
             self.fetch_url(absolute_url)
 
-        styles = web_frame.findAllElements("style")
+        styles = web_frame.findAllElements('style')
         for style in styles:
             style = webelem.WebElementWrapper(style)
-            if "type" in style and style["type"] != "text/css":
+            if 'type' in style and style['type'] != 'text/css':
                 continue
             for element_url in _get_css_imports(str(style)):
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Search for references in inline styles
-        for element in web_frame.findAllElements("[style]"):
+        for element in web_frame.findAllElements('[style]'):
             element = webelem.WebElementWrapper(element)
-            style = element["style"]
+            style = element['style']
             for element_url in _get_css_imports(style):
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
 
@@ -243,7 +241,7 @@ class _Downloader():
         Args:
             url: The file to download as QUrl.
         """
-        if url.scheme() == "data":
+        if url.scheme() == 'data':
             return
         # Prevent loading an asset twice
         if url in self.loaded_urls:
@@ -252,8 +250,8 @@ class _Downloader():
 
         log.downloads.debug("loading asset at %s", url)
 
-        download_manager = objreg.get("download-manager", scope="window",
-                                      window="current")
+        download_manager = objreg.get('download-manager', scope='window',
+                                      window='current')
         item = download_manager.get(url, fileobj=_NoCloseBytesIO(),
                                     auto_remove=True)
         self.pending_downloads.add((url, item))
@@ -272,7 +270,7 @@ class _Downloader():
             item: The DownloadItem given by the DownloadManager
         """
         self.pending_downloads.remove((url, item))
-        mime = item.raw_headers.get(b"Content-Type", b"")
+        mime = item.raw_headers.get(b'Content-Type', b'')
 
         # Note that this decoding always works and doesn't produce errors
         # RFC 7230 (https://tools.ietf.org/html/rfc7230) states:
@@ -283,9 +281,9 @@ class _Downloader():
         # Newly defined header fields SHOULD limit their field values to
         # US-ASCII octets.  A recipient SHOULD treat other octets in field
         # content (obs-text) as opaque data.
-        mime = mime.decode("iso-8859-1")
+        mime = mime.decode('iso-8859-1')
 
-        if mime.lower() == "text/css":
+        if mime.lower() == 'text/css':
             # We can't always assume that CSS files are UTF-8, but CSS files
             # shouldn't contain many non-ASCII characters anyway (in most
             # cases). Using "ignore" lets us decode the file even if it's
@@ -293,16 +291,16 @@ class _Downloader():
             # The file written to the MHTML file won't be modified by this
             # decoding, since there we're taking the original bytestream.
             try:
-                css_string = item.fileobj.getvalue().decode("utf-8")
+                css_string = item.fileobj.getvalue().decode('utf-8')
             except UnicodeDecodeError:
                 log.downloads.warning("Invalid UTF-8 data in %s", url)
-                css_string = item.fileobj.getvalue().decode("utf-8", "ignore")
+                css_string = item.fileobj.getvalue().decode('utf-8', 'ignore')
             import_urls = _get_css_imports(css_string)
             for import_url in import_urls:
                 absolute_url = url.resolved(QUrl(import_url))
                 self.fetch_url(absolute_url)
 
-        encode = E_QUOPRI if mime.startswith("text/") else E_BASE64
+        encode = E_QUOPRI if mime.startswith('text/') else E_BASE64
         self.writer.add_file(url.toString(), item.fileobj.getvalue(), mime,
                              encode)
         item.fileobj.actual_close()
@@ -325,7 +323,7 @@ class _Downloader():
             log.downloads.debug("Oops! Download already gone: %s", item)
             return
         item.fileobj.actual_close()
-        self.writer.add_file(url.toString(), b"")
+        self.writer.add_file(url.toString(), b'')
         if self.pending_downloads:
             return
         self.finish_file()
@@ -337,9 +335,9 @@ class _Downloader():
             return
         self._finished = True
         log.downloads.debug("All assets downloaded, ready to finish off!")
-        with open(self.dest, "wb") as file_output:
+        with open(self.dest, 'wb') as file_output:
             self.writer.write_to(file_output)
-        message.info("current", "Page saved as {}".format(self.dest))
+        message.info('current', "Page saved as {}".format(self.dest))
 
     def collect_zombies(self):
         """Collect done downloads and add their data to the MHTML file.
@@ -378,6 +376,6 @@ def start_download(dest):
         dest: The filename where the resulting file should be saved.
     """
     dest = os.path.expanduser(dest)
-    web_view = objreg.get("webview", scope="tab", tab="current")
+    web_view = objreg.get('webview', scope='tab', tab='current')
     loader = _Downloader(web_view, dest)
     loader.run()
diff --git a/tests/unit/misc/test_mhtml.py b/tests/unit/misc/test_mhtml.py
index 271d1fc1b..c3a859488 100644
--- a/tests/unit/misc/test_mhtml.py
+++ b/tests/unit/misc/test_mhtml.py
@@ -28,12 +28,12 @@ class Checker:
         return self.fp.getvalue()
 
     def expect(self, expected):
-        actual = self.value.decode("ascii")
+        actual = self.value.decode('ascii')
         # Make sure there are no stray \r or \n
-        assert re.search(r"\r[^\n]", actual) is None
-        assert re.search(r"[^\r]\n", actual) is None
-        actual = actual.replace("\r\n", "\n")
-        expected = textwrap.dedent(expected).lstrip("\n")
+        assert re.search(r'\r[^\n]', actual) is None
+        assert re.search(r'[^\r]\n', actual) is None
+        actual = actual.replace('\r\n', '\n')
+        expected = textwrap.dedent(expected).lstrip('\n')
         assert expected == actual
 
 
@@ -43,11 +43,11 @@ def checker():
 
 
 def test_quoted_printable_umlauts(checker):
-    content = "Die süße Hündin läuft in die Höhle des Bären"
-    content = content.encode("iso-8859-1")
+    content = 'Die süße Hündin läuft in die Höhle des Bären'
+    content = content.encode('iso-8859-1')
     writer = mhtml.MHTMLWriter(root_content=content,
-                               content_location="localhost",
-                               content_type="text/plain")
+                               content_location='localhost',
+                               content_type='text/plain')
     writer.write_to(checker.fp)
     checker.expect("""
         Content-Type: multipart/related; boundary="---=_qute-UUID"
@@ -64,15 +64,15 @@ def test_quoted_printable_umlauts(checker):
         """)
 
 
-@pytest.mark.parametrize("header, value", [
-    ("content_location", "http://brötli.com"),
-    ("content_type", "text/pläin"),
+@pytest.mark.parametrize('header, value', [
+    ('content_location', 'http://brötli.com'),
+    ('content_type', 'text/pläin'),
 ])
 def test_refuses_non_ascii_header_value(checker, header, value):
     defaults = {
-        "root_content": b"",
-        "content_location": "http://example.com",
-        "content_type": "text/plain",
+        'root_content': b'',
+        'content_location': 'http://example.com',
+        'content_type': 'text/plain',
     }
     defaults[header] = value
     writer = mhtml.MHTMLWriter(**defaults)
@@ -82,12 +82,12 @@ def test_refuses_non_ascii_header_value(checker, header, value):
 
 
 def test_file_encoded_as_base64(checker):
-    content = b"Image file attached"
-    writer = mhtml.MHTMLWriter(root_content=content, content_type="text/plain",
-                               content_location="http://example.com")
-    writer.add_file(location="http://a.example.com/image.png",
-                    content="\U0001F601 image data".encode("utf-8"),
-                    content_type="image/png",
+    content = b'Image file attached'
+    writer = mhtml.MHTMLWriter(root_content=content, content_type='text/plain',
+                               content_location='http://example.com')
+    writer.add_file(location='http://a.example.com/image.png',
+                    content='\U0001F601 image data'.encode('utf-8'),
+                    content_type='image/png',
                     transfer_encoding=mhtml.E_BASE64)
     writer.write_to(checker.fp)
     checker.expect("""
@@ -113,28 +113,28 @@ def test_file_encoded_as_base64(checker):
         """)
 
 
-@pytest.mark.parametrize("transfer_encoding", [mhtml.E_BASE64, mhtml.E_QUOPRI],
-                         ids=["base64", "quoted-printable"])
+@pytest.mark.parametrize('transfer_encoding', [mhtml.E_BASE64, mhtml.E_QUOPRI],
+                         ids=['base64', 'quoted-printable'])
 def test_payload_lines_wrap(checker, transfer_encoding):
-    payload = b"1234567890" * 10
-    writer = mhtml.MHTMLWriter(root_content=b"", content_type="text/plain",
-                               content_location="http://example.com")
-    writer.add_file(location="http://example.com/payload", content=payload,
-                    content_type="text/plain",
+    payload = b'1234567890' * 10
+    writer = mhtml.MHTMLWriter(root_content=b'', content_type='text/plain',
+                               content_location='http://example.com')
+    writer.add_file(location='http://example.com/payload', content=payload,
+                    content_type='text/plain',
                     transfer_encoding=transfer_encoding)
     writer.write_to(checker.fp)
-    for line in checker.value.split(b"\r\n"):
+    for line in checker.value.split(b'\r\n'):
         assert len(line) < 77
 
 
 def test_files_appear_sorted(checker):
-    writer = mhtml.MHTMLWriter(root_content=b"root file",
-                               content_type="text/plain",
-                               content_location="http://www.example.com/")
-    for subdomain in "ahgbizt":
-        writer.add_file(location="http://{}.example.com/".format(subdomain),
-                        content="file {}".format(subdomain).encode("utf-8"),
-                        content_type="text/plain",
+    writer = mhtml.MHTMLWriter(root_content=b'root file',
+                               content_type='text/plain',
+                               content_location='http://www.example.com/')
+    for subdomain in 'ahgbizt':
+        writer.add_file(location='http://{}.example.com/'.format(subdomain),
+                        content='file {}'.format(subdomain).encode('utf-8'),
+                        content_type='text/plain',
                         transfer_encoding=mhtml.E_QUOPRI)
     writer.write_to(checker.fp)
     checker.expect("""
@@ -202,10 +202,10 @@ def test_files_appear_sorted(checker):
 
 
 def test_empty_content_type(checker):
-    writer = mhtml.MHTMLWriter(root_content=b"",
-                               content_location="http://example.com/",
-                               content_type="text/plain")
-    writer.add_file("http://example.com/file", b"file content")
+    writer = mhtml.MHTMLWriter(root_content=b'',
+                               content_location='http://example.com/',
+                               content_type='text/plain')
+    writer.add_file('http://example.com/file', b'file content')
     writer.write_to(checker.fp)
     checker.expect("""
         Content-Type: multipart/related; boundary="---=_qute-UUID"
@@ -229,11 +229,11 @@ def test_empty_content_type(checker):
 
 
 def test_removing_file_from_mhtml(checker):
-    writer = mhtml.MHTMLWriter(root_content=b"root",
-                               content_location="http://example.com/",
-                               content_type="text/plain")
-    writer.add_file("http://evil.com/", b"file content")
-    writer.remove_file("http://evil.com/")
+    writer = mhtml.MHTMLWriter(root_content=b'root',
+                               content_location='http://example.com/',
+                               content_type='text/plain')
+    writer.add_file('http://evil.com/', b'file content')
+    writer.remove_file('http://evil.com/')
     writer.write_to(checker.fp)
     checker.expect("""
         Content-Type: multipart/related; boundary="---=_qute-UUID"
@@ -250,16 +250,16 @@ def test_removing_file_from_mhtml(checker):
         """)
 
 
-@pytest.mark.parametrize("style, expected_urls", [
-    ("@import 'default.css'", ["default.css"]),
-    ('@import "default.css"', ["default.css"]),
-    ("@import \t 'tabbed.css'", ["tabbed.css"]),
-    ("@import url('default.css')", ["default.css"]),
+@pytest.mark.parametrize('style, expected_urls', [
+    ("@import 'default.css'", ['default.css']),
+    ('@import "default.css"', ['default.css']),
+    ("@import \t 'tabbed.css'", ['tabbed.css']),
+    ("@import url('default.css')", ['default.css']),
     ("""body {
     background: url("/bg-img.png")
-    }""", ["/bg-img.png"]),
-    ("background: url(folder/file.png)", ["folder/file.png"]),
-    ("content: url()", []),
+    }""", ['/bg-img.png']),
+    ('background: url(folder/file.png)', ['folder/file.png']),
+    ('content: url()', []),
 ])
 def test_css_url_scanner(style, expected_urls):
     expected_urls.sort()

From 2eeace1c2c5037547862b1eb0d6d9a9878957037 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 22:06:34 +0200
Subject: [PATCH 031/104] Move misc.mhtml to browser.mhtml

---
 qutebrowser/browser/commands.py            | 4 ++--
 qutebrowser/{misc => browser}/mhtml.py     | 0
 tests/unit/{misc => browser}/test_mhtml.py | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename qutebrowser/{misc => browser}/mhtml.py (100%)
 rename tests/unit/{misc => browser}/test_mhtml.py (100%)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index f1b3f4661..11b4f9050 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -37,12 +37,12 @@ import pygments.formatters
 
 from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners
 from qutebrowser.config import config, configexc
-from qutebrowser.browser import webelem, inspector, urlmarks, downloads
+from qutebrowser.browser import webelem, inspector, urlmarks, downloads, mhtml
 from qutebrowser.keyinput import modeman
 from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
                                objreg, utils)
 from qutebrowser.utils.usertypes import KeyMode
-from qutebrowser.misc import editor, guiprocess, mhtml
+from qutebrowser.misc import editor, guiprocess
 
 
 class CommandDispatcher:
diff --git a/qutebrowser/misc/mhtml.py b/qutebrowser/browser/mhtml.py
similarity index 100%
rename from qutebrowser/misc/mhtml.py
rename to qutebrowser/browser/mhtml.py
diff --git a/tests/unit/misc/test_mhtml.py b/tests/unit/browser/test_mhtml.py
similarity index 100%
rename from tests/unit/misc/test_mhtml.py
rename to tests/unit/browser/test_mhtml.py

From b05a0d191de7021c30e1061bdceb1aa95d3d9432 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 24 Sep 2015 22:17:47 +0200
Subject: [PATCH 032/104] Fix module path in test_mhtml

Also fix docstring for _get_css_imports
---
 qutebrowser/browser/mhtml.py     | 2 ++
 tests/unit/browser/test_mhtml.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index ce909f683..0fac55003 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -51,7 +51,9 @@ _CSS_URL_PATTERNS = [re.compile(x) for x in [
 
 def _get_css_imports(data):
     """Return all assets that are referenced in the given CSS document.
+
     The returned URLs are relative to the stylesheet's URL.
+
     Args:
         data: The content of the stylesheet to scan as string.
     """
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index c3a859488..106cb3fd7 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -5,7 +5,7 @@ import re
 
 import pytest
 
-from qutebrowser.misc import mhtml
+from qutebrowser.browser import mhtml
 
 @pytest.fixture(autouse=True)
 def patch_uuid(monkeypatch):

From 749b1c02ccdaacc4416cd267eb6a0375cdbb3d41 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 25 Sep 2015 11:48:43 +0200
Subject: [PATCH 033/104] Style changes for mhtml and test_mhtml

---
 qutebrowser/browser/mhtml.py     | 21 +++++++++--------
 tests/unit/browser/test_mhtml.py | 39 +++++++++++++++++---------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 0fac55003..cc394b21b 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -23,11 +23,12 @@ import functools
 import io
 import os
 import re
-
 import collections
 import uuid
-from email import policy, generator, encoders
-from email.mime import multipart
+import email.policy
+import email.generator
+import email.encoders
+import email.mime.multipart
 
 from PyQt5.QtCore import QUrl
 
@@ -66,13 +67,13 @@ def _get_css_imports(data):
     return urls
 
 
-MHTMLPolicy = policy.default.clone(linesep='\r\n', max_line_length=0)
+MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
 
 
-E_BASE64 = encoders.encode_base64
+E_BASE64 = email.encoders.encode_base64
 """Encode the file using base64 encoding"""
 
-E_QUOPRI = encoders.encode_quopri
+E_QUOPRI = email.encoders.encode_quopri
 """Encode the file using MIME quoted-printable encoding."""
 
 
@@ -123,8 +124,8 @@ class MHTMLWriter():
         Args:
             fp: The file-object, openend in "wb" mode.
         """
-        msg = multipart.MIMEMultipart('related',
-                                      '---=_qute-{}'.format(uuid.uuid4()))
+        msg = email.mime.multipart.MIMEMultipart(
+            'related', '---=_qute-{}'.format(uuid.uuid4()))
 
         root = self._create_root_file()
         msg.attach(root)
@@ -132,7 +133,7 @@ class MHTMLWriter():
         for _, file_data in sorted(self._files.items()):
             msg.attach(self._create_file(file_data))
 
-        gen = generator.BytesGenerator(fp, policy=MHTMLPolicy)
+        gen = email.generator.BytesGenerator(fp, policy=MHTMLPolicy)
         gen.flatten(msg)
 
     def _create_root_file(self):
@@ -145,7 +146,7 @@ class MHTMLWriter():
 
     def _create_file(self, f):
         """Return the single given file as MIMEMultipart."""
-        msg = multipart.MIMEMultipart()
+        msg = email.mime.multipart.MIMEMultipart()
         msg['Content-Location'] = f.content_location
         # Get rid of the default type multipart/mixed
         del msg['Content-Type']
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 106cb3fd7..37d1131b3 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -78,7 +78,7 @@ def test_refuses_non_ascii_header_value(checker, header, value):
     writer = mhtml.MHTMLWriter(**defaults)
     with pytest.raises(UnicodeEncodeError) as excinfo:
         writer.write_to(checker.fp)
-        assert "'ascii' codec can't encode" in str(excinfo.value)
+    assert "'ascii' codec can't encode" in str(excinfo.value)
 
 
 def test_file_encoded_as_base64(checker):
@@ -268,22 +268,25 @@ def test_css_url_scanner(style, expected_urls):
     assert urls == expected_urls
 
 
-def test_noclose_bytesio_fake_close():
-    fp = mhtml._NoCloseBytesIO()
-    fp.write(b'Value')
-    fp.close()
-    assert fp.getvalue() == b'Value'
-    fp.write(b'Eulav')
-    assert fp.getvalue() == b'ValueEulav'
+class TestNoCloseBytesIO:
+    # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/540/
+    # pylint: disable=no-member
 
+    def test_fake_close(self):
+        fp = mhtml._NoCloseBytesIO()
+        fp.write(b'Value')
+        fp.close()
+        assert fp.getvalue() == b'Value'
+        fp.write(b'Eulav')
+        assert fp.getvalue() == b'ValueEulav'
 
-def test_noclose_bytesio_actual_close():
-    fp = mhtml._NoCloseBytesIO()
-    fp.write(b'Value')
-    fp.actual_close()
-    with pytest.raises(ValueError) as excinfo:
-        fp.getvalue()
-        assert 'I/O operation on closed file.' == str(excinfo.value)
-    with pytest.raises(ValueError) as excinfo:
-        fp.write(b'Closed')
-        assert 'I/O operation on closed file.' == str(excinfo.value)
+    def test_actual_close(self):
+        fp = mhtml._NoCloseBytesIO()
+        fp.write(b'Value')
+        fp.actual_close()
+        with pytest.raises(ValueError) as excinfo:
+            fp.getvalue()
+        assert str(excinfo.value) == 'I/O operation on closed file.'
+        with pytest.raises(ValueError) as excinfo:
+            fp.write(b'Closed')
+        assert str(excinfo.value) == 'I/O operation on closed file.'

From 420c0873734dce3594553b62917e2b7c0b439a7f Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 25 Sep 2015 13:09:39 +0200
Subject: [PATCH 034/104] use cssutils

---
 qutebrowser/browser/mhtml.py     | 49 ++++++++++++++++++++++++++++++--
 requirements.txt                 |  1 +
 tests/unit/browser/test_mhtml.py | 26 ++++++++++-------
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index cc394b21b..7e0422eaf 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -35,6 +35,10 @@ from PyQt5.QtCore import QUrl
 from qutebrowser.browser import webelem
 from qutebrowser.utils import log, objreg, message
 
+try:
+    import cssutils
+except ImportError:
+    cssutils = None
 
 _File = collections.namedtuple('_File',
                                ['content', 'content_type', 'content_location',
@@ -50,7 +54,7 @@ _CSS_URL_PATTERNS = [re.compile(x) for x in [
 ]]
 
 
-def _get_css_imports(data):
+def _get_css_imports_regex(data):
     """Return all assets that are referenced in the given CSS document.
 
     The returned URLs are relative to the stylesheet's URL.
@@ -67,6 +71,47 @@ def _get_css_imports(data):
     return urls
 
 
+def _get_css_imports_cssutils(data, inline=False):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as string.
+        inline: True if the argument is a inline HTML style attribute.
+    """
+    parser = cssutils.CSSParser(fetcher=lambda url: (None, ""), validate=False)
+    if not inline:
+        sheet = parser.parseString(data)
+        return list(cssutils.getUrls(sheet))
+    else:
+        urls = []
+        declaration = parser.parseStyle(data)
+        # prop = background, color, margin, ...
+        for prop in declaration:
+            # value = red, 10px, url(foobar), ...
+            for value in prop.propertyValue:
+                if isinstance(value, cssutils.css.URIValue):
+                    if value.uri:
+                        urls.append(value.uri)
+        return urls
+
+
+def _get_css_imports(data, inline=False):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as string.
+        inline: True if the argument is a inline HTML style attribute.
+    """
+    if cssutils is None:
+        return _get_css_imports_regex(data)
+    else:
+        return _get_css_imports_cssutils(data, inline)
+
+
 MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
 
 
@@ -228,7 +273,7 @@ class _Downloader():
         for element in web_frame.findAllElements('[style]'):
             element = webelem.WebElementWrapper(element)
             style = element['style']
-            for element_url in _get_css_imports(style):
+            for element_url in _get_css_imports(style, inline=True):
                 self.fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Shortcut if no assets need to be downloaded, otherwise the file would
diff --git a/requirements.txt b/requirements.txt
index fd5f81a0b..9e07256bd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ pyPEG2==2.15.2
 PyYAML==3.11
 colorama==0.3.3
 colorlog==2.6.0
+cssutils==1.0
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 37d1131b3..71c6ca2d6 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -250,20 +250,26 @@ def test_removing_file_from_mhtml(checker):
         """)
 
 
-@pytest.mark.parametrize('style, expected_urls', [
-    ("@import 'default.css'", ['default.css']),
-    ('@import "default.css"', ['default.css']),
-    ("@import \t 'tabbed.css'", ['tabbed.css']),
-    ("@import url('default.css')", ['default.css']),
-    ("""body {
+@pytest.mark.parametrize('has_cssutils', [True, False])
+@pytest.mark.parametrize('inline, style, expected_urls', [
+    (False, "@import 'default.css'", ['default.css']),
+    (False, '@import "default.css"', ['default.css']),
+    (False, "@import \t 'tabbed.css'", ['tabbed.css']),
+    (False, "@import url('default.css')", ['default.css']),
+    (False, """body {
     background: url("/bg-img.png")
     }""", ['/bg-img.png']),
-    ('background: url(folder/file.png)', ['folder/file.png']),
-    ('content: url()', []),
+    (True, 'background: url(folder/file.png) no-repeat', ['folder/file.png']),
+    (True, 'content: url()', []),
 ])
-def test_css_url_scanner(style, expected_urls):
+def test_css_url_scanner(monkeypatch, has_cssutils, inline, style,
+                         expected_urls):
+    if has_cssutils:
+        assert mhtml.cssutils is not None
+    else:
+        monkeypatch.setattr('qutebrowser.browser.mhtml.cssutils', None)
     expected_urls.sort()
-    urls = mhtml._get_css_imports(style)
+    urls = mhtml._get_css_imports(style, inline=inline)
     urls.sort()
     assert urls == expected_urls
 

From 6601df14a36ec5d05f20684c8eff8de282ea8bdd Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 2 Oct 2015 13:50:19 +0200
Subject: [PATCH 035/104] mhtml: ask before overwriting dest

---
 qutebrowser/browser/commands.py |  4 ++--
 qutebrowser/browser/mhtml.py    | 28 ++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 11b4f9050..a2cfff718 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1171,12 +1171,12 @@ class CommandDispatcher:
             q.mode = usertypes.PromptMode.text
             q.completed.connect(q.deleteLater)
             q.default = downloads.path_suggestion(suggested_fn)
-            q.answered.connect(mhtml.start_download)
+            q.answered.connect(mhtml.start_download_checked)
             message_bridge = objreg.get("message-bridge", scope="window",
                                         window=self._win_id)
             message_bridge.ask(q, blocking=False)
         else:
-            mhtml.start_download(dest)
+            mhtml.start_download_checked(dest)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        deprecated="Use :download instead.")
diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 7e0422eaf..50c207487 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -33,7 +33,7 @@ import email.mime.multipart
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.browser import webelem
-from qutebrowser.utils import log, objreg, message
+from qutebrowser.utils import log, objreg, message, usertypes
 
 try:
     import cssutils
@@ -80,7 +80,10 @@ def _get_css_imports_cssutils(data, inline=False):
         data: The content of the stylesheet to scan as string.
         inline: True if the argument is a inline HTML style attribute.
     """
-    parser = cssutils.CSSParser(fetcher=lambda url: (None, ""), validate=False)
+    # We don't care about invalid CSS data, this will only litter the log
+    # output with CSS errors
+    parser = cssutils.CSSParser(loglevel=100,
+                                fetcher=lambda url: (None, ""), validate=False)
     if not inline:
         sheet = parser.parseString(data)
         return list(cssutils.getUrls(sheet))
@@ -420,6 +423,8 @@ class _NoCloseBytesIO(io.BytesIO):  # pylint: disable=no-init
 def start_download(dest):
     """Start downloading the current page and all assets to a MHTML file.
 
+    This will overwrite dest if it already exists.
+
     Args:
         dest: The filename where the resulting file should be saved.
     """
@@ -427,3 +432,22 @@ def start_download(dest):
     web_view = objreg.get('webview', scope='tab', tab='current')
     loader = _Downloader(web_view, dest)
     loader.run()
+
+
+def start_download_checked(dest):
+    """First check if dest is already a file, then start the download.
+
+    Args:
+        dest: The filename where the resulting file should be saved.
+    """
+    if not os.path.isfile(dest):
+        start_download(dest)
+        return
+
+    q = usertypes.Question()
+    q.mode = usertypes.PromptMode.yesno
+    q.text = "{} exists. Overwrite?".format(dest)
+    q.completed.connect(q.deleteLater)
+    q.answered_yes.connect(functools.partial(start_download, dest))
+    message_bridge = objreg.get('message-bridge', scope='window', window='current')
+    message_bridge.ask(q, blocking=False)

From 706b8c660077c240ca4ab67070b5641c4d0346d0 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 2 Oct 2015 19:12:30 +0200
Subject: [PATCH 036/104] Shorten line

---
 qutebrowser/browser/mhtml.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 50c207487..184465b89 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -449,5 +449,6 @@ def start_download_checked(dest):
     q.text = "{} exists. Overwrite?".format(dest)
     q.completed.connect(q.deleteLater)
     q.answered_yes.connect(functools.partial(start_download, dest))
-    message_bridge = objreg.get('message-bridge', scope='window', window='current')
+    message_bridge = objreg.get('message-bridge', scope='window',
+                                window='current')
     message_bridge.ask(q, blocking=False)

From ce1a99cc7cfa9f1fc39804848d97f18c039d175d Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 5 Oct 2015 11:52:04 +0200
Subject: [PATCH 037/104] Remove cssutils from mhtml.py

---
 qutebrowser/browser/mhtml.py     | 66 ++++++--------------------------
 requirements.txt                 |  1 -
 tests/unit/browser/test_mhtml.py |  8 +---
 3 files changed, 12 insertions(+), 63 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 184465b89..54eaaa4f0 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -35,10 +35,6 @@ from PyQt5.QtCore import QUrl
 from qutebrowser.browser import webelem
 from qutebrowser.utils import log, objreg, message, usertypes
 
-try:
-    import cssutils
-except ImportError:
-    cssutils = None
 
 _File = collections.namedtuple('_File',
                                ['content', 'content_type', 'content_location',
@@ -54,52 +50,6 @@ _CSS_URL_PATTERNS = [re.compile(x) for x in [
 ]]
 
 
-def _get_css_imports_regex(data):
-    """Return all assets that are referenced in the given CSS document.
-
-    The returned URLs are relative to the stylesheet's URL.
-
-    Args:
-        data: The content of the stylesheet to scan as string.
-    """
-    urls = []
-    for pattern in _CSS_URL_PATTERNS:
-        for match in pattern.finditer(data):
-            url = match.group("url")
-            if url:
-                urls.append(url)
-    return urls
-
-
-def _get_css_imports_cssutils(data, inline=False):
-    """Return all assets that are referenced in the given CSS document.
-
-    The returned URLs are relative to the stylesheet's URL.
-
-    Args:
-        data: The content of the stylesheet to scan as string.
-        inline: True if the argument is a inline HTML style attribute.
-    """
-    # We don't care about invalid CSS data, this will only litter the log
-    # output with CSS errors
-    parser = cssutils.CSSParser(loglevel=100,
-                                fetcher=lambda url: (None, ""), validate=False)
-    if not inline:
-        sheet = parser.parseString(data)
-        return list(cssutils.getUrls(sheet))
-    else:
-        urls = []
-        declaration = parser.parseStyle(data)
-        # prop = background, color, margin, ...
-        for prop in declaration:
-            # value = red, 10px, url(foobar), ...
-            for value in prop.propertyValue:
-                if isinstance(value, cssutils.css.URIValue):
-                    if value.uri:
-                        urls.append(value.uri)
-        return urls
-
-
 def _get_css_imports(data, inline=False):
     """Return all assets that are referenced in the given CSS document.
 
@@ -107,12 +57,18 @@ def _get_css_imports(data, inline=False):
 
     Args:
         data: The content of the stylesheet to scan as string.
-        inline: True if the argument is a inline HTML style attribute.
+        inline: True if data is a HTML inline style (style="...").
     """
-    if cssutils is None:
-        return _get_css_imports_regex(data)
-    else:
-        return _get_css_imports_cssutils(data, inline)
+    # We keep the inline argument to stay consistent with the cssutils
+    # interface, in case we reintroduce cssutils.
+    # pylint: disable=unused-argument
+    urls = []
+    for pattern in _CSS_URL_PATTERNS:
+        for match in pattern.finditer(data):
+            url = match.group("url")
+            if url:
+                urls.append(url)
+    return urls
 
 
 MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
diff --git a/requirements.txt b/requirements.txt
index 9e07256bd..fd5f81a0b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,3 @@ pyPEG2==2.15.2
 PyYAML==3.11
 colorama==0.3.3
 colorlog==2.6.0
-cssutils==1.0
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 71c6ca2d6..06276ae6a 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -250,7 +250,6 @@ def test_removing_file_from_mhtml(checker):
         """)
 
 
-@pytest.mark.parametrize('has_cssutils', [True, False])
 @pytest.mark.parametrize('inline, style, expected_urls', [
     (False, "@import 'default.css'", ['default.css']),
     (False, '@import "default.css"', ['default.css']),
@@ -262,12 +261,7 @@ def test_removing_file_from_mhtml(checker):
     (True, 'background: url(folder/file.png) no-repeat', ['folder/file.png']),
     (True, 'content: url()', []),
 ])
-def test_css_url_scanner(monkeypatch, has_cssutils, inline, style,
-                         expected_urls):
-    if has_cssutils:
-        assert mhtml.cssutils is not None
-    else:
-        monkeypatch.setattr('qutebrowser.browser.mhtml.cssutils', None)
+def test_css_url_scanner(monkeypatch, inline, style, expected_urls):
     expected_urls.sort()
     urls = mhtml._get_css_imports(style, inline=inline)
     urls.sort()

From 957d68c477c65e3422219d785aee35613876d365 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 11:21:47 +0200
Subject: [PATCH 038/104] Revert "Remove cssutils from mhtml.py"

This reverts commit 22a0f0952704d284846ab2572790d99a85515c57.
---
 qutebrowser/browser/mhtml.py     | 54 +++++++++++++++++++++++++++++---
 requirements.txt                 |  1 +
 tests/unit/browser/test_mhtml.py |  8 ++++-
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 54eaaa4f0..184465b89 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -35,6 +35,10 @@ from PyQt5.QtCore import QUrl
 from qutebrowser.browser import webelem
 from qutebrowser.utils import log, objreg, message, usertypes
 
+try:
+    import cssutils
+except ImportError:
+    cssutils = None
 
 _File = collections.namedtuple('_File',
                                ['content', 'content_type', 'content_location',
@@ -50,18 +54,14 @@ _CSS_URL_PATTERNS = [re.compile(x) for x in [
 ]]
 
 
-def _get_css_imports(data, inline=False):
+def _get_css_imports_regex(data):
     """Return all assets that are referenced in the given CSS document.
 
     The returned URLs are relative to the stylesheet's URL.
 
     Args:
         data: The content of the stylesheet to scan as string.
-        inline: True if data is a HTML inline style (style="...").
     """
-    # We keep the inline argument to stay consistent with the cssutils
-    # interface, in case we reintroduce cssutils.
-    # pylint: disable=unused-argument
     urls = []
     for pattern in _CSS_URL_PATTERNS:
         for match in pattern.finditer(data):
@@ -71,6 +71,50 @@ def _get_css_imports(data, inline=False):
     return urls
 
 
+def _get_css_imports_cssutils(data, inline=False):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as string.
+        inline: True if the argument is a inline HTML style attribute.
+    """
+    # We don't care about invalid CSS data, this will only litter the log
+    # output with CSS errors
+    parser = cssutils.CSSParser(loglevel=100,
+                                fetcher=lambda url: (None, ""), validate=False)
+    if not inline:
+        sheet = parser.parseString(data)
+        return list(cssutils.getUrls(sheet))
+    else:
+        urls = []
+        declaration = parser.parseStyle(data)
+        # prop = background, color, margin, ...
+        for prop in declaration:
+            # value = red, 10px, url(foobar), ...
+            for value in prop.propertyValue:
+                if isinstance(value, cssutils.css.URIValue):
+                    if value.uri:
+                        urls.append(value.uri)
+        return urls
+
+
+def _get_css_imports(data, inline=False):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as string.
+        inline: True if the argument is a inline HTML style attribute.
+    """
+    if cssutils is None:
+        return _get_css_imports_regex(data)
+    else:
+        return _get_css_imports_cssutils(data, inline)
+
+
 MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
 
 
diff --git a/requirements.txt b/requirements.txt
index fd5f81a0b..9e07256bd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ pyPEG2==2.15.2
 PyYAML==3.11
 colorama==0.3.3
 colorlog==2.6.0
+cssutils==1.0
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 06276ae6a..71c6ca2d6 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -250,6 +250,7 @@ def test_removing_file_from_mhtml(checker):
         """)
 
 
+@pytest.mark.parametrize('has_cssutils', [True, False])
 @pytest.mark.parametrize('inline, style, expected_urls', [
     (False, "@import 'default.css'", ['default.css']),
     (False, '@import "default.css"', ['default.css']),
@@ -261,7 +262,12 @@ def test_removing_file_from_mhtml(checker):
     (True, 'background: url(folder/file.png) no-repeat', ['folder/file.png']),
     (True, 'content: url()', []),
 ])
-def test_css_url_scanner(monkeypatch, inline, style, expected_urls):
+def test_css_url_scanner(monkeypatch, has_cssutils, inline, style,
+                         expected_urls):
+    if has_cssutils:
+        assert mhtml.cssutils is not None
+    else:
+        monkeypatch.setattr('qutebrowser.browser.mhtml.cssutils', None)
     expected_urls.sort()
     urls = mhtml._get_css_imports(style, inline=inline)
     urls.sort()

From 1902e4858f1a6bd03d8a9edc7ae55642db66636f Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 11:24:25 +0200
Subject: [PATCH 039/104] Also catch re.error on cssutils import

cssutils 1.0 and earlier are broken on Python 3.5 due to a bad regex
escape.
---
 qutebrowser/browser/mhtml.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 184465b89..0475651e4 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -37,7 +37,10 @@ from qutebrowser.utils import log, objreg, message, usertypes
 
 try:
     import cssutils
-except ImportError:
+except (ImportError, re.error):
+    # Catching re.error because cssutils in earlier releases (<= 1.0) is broken
+    # on Python 3.5
+    # See https://bitbucket.org/cthedot/cssutils/issues/52
     cssutils = None
 
 _File = collections.namedtuple('_File',

From 919365dfa1693405a49b0e32a246018e043a1cbc Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 11:34:59 +0200
Subject: [PATCH 040/104] Remove dead code mhtml.py:MHTMLWriter:remove_file

---
 qutebrowser/browser/mhtml.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 0475651e4..da598543d 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -161,14 +161,6 @@ class MHTMLWriter():
             content_location=location, transfer_encoding=transfer_encoding,
         )
 
-    def remove_file(self, location):
-        """Remove a file.
-
-        Args:
-            location: The URL that identifies the file.
-        """
-        del self._files[location]
-
     def write_to(self, fp):
         """Output the MHTML file to the given file-like object.
 

From dab0db30a5ad3493354b8040689f7f34137c6450 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 11:46:05 +0200
Subject: [PATCH 041/104] Remove tests for remove_file from test_mhtml.py

---
 tests/unit/browser/test_mhtml.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 71c6ca2d6..643f0ded4 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -228,28 +228,6 @@ def test_empty_content_type(checker):
         """)
 
 
-def test_removing_file_from_mhtml(checker):
-    writer = mhtml.MHTMLWriter(root_content=b'root',
-                               content_location='http://example.com/',
-                               content_type='text/plain')
-    writer.add_file('http://evil.com/', b'file content')
-    writer.remove_file('http://evil.com/')
-    writer.write_to(checker.fp)
-    checker.expect("""
-        Content-Type: multipart/related; boundary="---=_qute-UUID"
-        MIME-Version: 1.0
-
-        -----=_qute-UUID
-        Content-Location: http://example.com/
-        MIME-Version: 1.0
-        Content-Type: text/plain
-        Content-Transfer-Encoding: quoted-printable
-
-        root
-        -----=_qute-UUID--
-        """)
-
-
 @pytest.mark.parametrize('has_cssutils', [True, False])
 @pytest.mark.parametrize('inline, style, expected_urls', [
     (False, "@import 'default.css'", ['default.css']),

From b027e6af1ba65a4416456cb10e25545b589b8d12 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 11:49:17 +0200
Subject: [PATCH 042/104] Mark cssutils tests as xfail on Python >= 3.5

---
 tests/unit/browser/test_mhtml.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 643f0ded4..f3375fd66 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -2,6 +2,7 @@
 import io
 import textwrap
 import re
+import sys
 
 import pytest
 
@@ -228,7 +229,12 @@ def test_empty_content_type(checker):
         """)
 
 
-@pytest.mark.parametrize('has_cssutils', [True, False])
+@pytest.mark.parametrize('has_cssutils', [
+    # TODO: remove xfail once new cssutils is released
+    pytest.mark.xfail(sys.version_info >= (3,5), reason='https://'
+                      'bitbucket.org/cthedot/cssutils/issues/52')(True),
+    False,
+])
 @pytest.mark.parametrize('inline, style, expected_urls', [
     (False, "@import 'default.css'", ['default.css']),
     (False, '@import "default.css"', ['default.css']),

From dd8ff860f46c1ce12f332d153a34aa1960bd8447 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 12:08:54 +0200
Subject: [PATCH 043/104] Fix lint

---
 tests/unit/browser/test_mhtml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index f3375fd66..3ac115ca5 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -231,7 +231,7 @@ def test_empty_content_type(checker):
 
 @pytest.mark.parametrize('has_cssutils', [
     # TODO: remove xfail once new cssutils is released
-    pytest.mark.xfail(sys.version_info >= (3,5), reason='https://'
+    pytest.mark.xfail(sys.version_info >= (3, 5), reason='https://'
                       'bitbucket.org/cthedot/cssutils/issues/52')(True),
     False,
 ])

From b17d74452ffffacfb0f545301c771f36be98ee5f Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 12:12:02 +0200
Subject: [PATCH 044/104] Expand $HOME before checking if file exists

Otherwise we might accidentally overwrite a file.
---
 qutebrowser/browser/mhtml.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index da598543d..56fc600e6 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -435,7 +435,11 @@ def start_download_checked(dest):
     Args:
         dest: The filename where the resulting file should be saved.
     """
-    if not os.path.isfile(dest):
+    # start_download will call os.path.expanduser on dest too, so no need to
+    # overwrite dest. We just want to make sure that we're checking
+    # the right path here. This also means that the user question will show the
+    # original path, not the expanded.
+    if not os.path.isfile(os.path.expanduser(dest)):
         start_download(dest)
         return
 

From a898fd21d176807923947622b757ed893ee65e62 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 13:07:59 +0200
Subject: [PATCH 045/104] Update docs

---
 doc/help/commands.asciidoc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index f47bdabd3..f54bd6010 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -19,6 +19,7 @@
 |<<download-open,download-open>>|Open the last/[count]th download.
 |<<download-remove,download-remove>>|Remove the last/[count]th download from the list.
 |<<download-retry,download-retry>>|Retry the first failed/[count]th download.
+|<<download-whole,download-whole>>|Download the current page as a MHTML file, including all assets.
 |<<forward,forward>>|Go forward in the history of the current tab.
 |<<fullscreen,fullscreen>>|Toggle fullscreen mode.
 |<<help,help>>|Show help about a command or setting.
@@ -197,6 +198,15 @@ Retry the first failed/[count]th download.
 ==== count
 The index of the download to cancel.
 
+[[download-whole]]
+=== download-whole
+Syntax: +:download-whole ['dest']+
+
+Download the current page as a MHTML file, including all assets.
+
+==== positional arguments
+* +'dest'+: The file path to write the download to.
+
 [[forward]]
 === forward
 Syntax: +:forward [*--tab*] [*--bg*] [*--window*]+

From 8cf0af004fd8f3c2e9f7e8e23a1c2bc6107ebe86 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 23:13:17 +0200
Subject: [PATCH 046/104] Deprecate :download [url] [dest], add --dest param

:download --dest [dest] [url] is the new syntax.
---
 doc/help/commands.asciidoc      |  9 +++++++--
 qutebrowser/browser/commands.py | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index f54bd6010..dcc90af65 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -146,13 +146,18 @@ Close the current window.
 
 [[download]]
 === download
-Syntax: +:download ['url'] ['dest']+
+Syntax: +:download [*--dest* 'DEST'] ['url'] ['dest-old']+
 
 Download a given URL, or current page if no URL given.
 
+The form `:download [url] [dest]` is deprecated, use `:download --dest [dest] [url]` instead.
+
 ==== positional arguments
 * +'url'+: The URL to download. If not given, download the current page.
-* +'dest'+: The file path to write the download to, or not given to ask.
+* +'dest-old'+: (deprecated) Same as dest.
+
+==== optional arguments
+* +*-d*+, +*--dest*+: The file path to write the download to, or not given to ask.
 
 [[download-cancel]]
 === download-cancel
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a2cfff718..633285727 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1140,13 +1140,25 @@ class CommandDispatcher:
                 cur.inspector.show()
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def download(self, url=None, dest=None):
+    def download(self, url=None, dest_old=None, *, dest=None):
         """Download a given URL, or current page if no URL given.
 
+        The form `:download [url] [dest]` is deprecated, use `:download --dest
+        [dest] [url]` instead.
+
         Args:
             url: The URL to download. If not given, download the current page.
+            dest_old: (deprecated) Same as dest.
             dest: The file path to write the download to, or None to ask.
         """
+        if dest_old is not None:
+            message.warning('current', ":download [url] [dest] is deprecated -"
+                            " use download --dest [dest] [url]")
+            if dest is not None:
+                raise cmdexc.CommandError("Can't give two destinations for the"
+                                          " download.")
+            dest = dest_old
+
         download_manager = objreg.get('download-manager', scope='window',
                                       window=self._win_id)
         if url:
@@ -1155,7 +1167,7 @@ class CommandDispatcher:
             download_manager.get(url, filename=dest)
         else:
             page = self._current_widget().page()
-            download_manager.get(self._current_url(), page=page)
+            download_manager.get(self._current_url(), page=page, filename=dest)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def download_whole(self, dest=None):

From d1f8d29c20ee2a5a113e850f5195d558235dd024 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 23:22:21 +0200
Subject: [PATCH 047/104] Add --mhtml flag to :download

And remove :download-whole command.
---
 doc/help/commands.asciidoc      | 13 ++-----------
 qutebrowser/browser/commands.py | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index dcc90af65..22219a994 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -19,7 +19,6 @@
 |<<download-open,download-open>>|Open the last/[count]th download.
 |<<download-remove,download-remove>>|Remove the last/[count]th download from the list.
 |<<download-retry,download-retry>>|Retry the first failed/[count]th download.
-|<<download-whole,download-whole>>|Download the current page as a MHTML file, including all assets.
 |<<forward,forward>>|Go forward in the history of the current tab.
 |<<fullscreen,fullscreen>>|Toggle fullscreen mode.
 |<<help,help>>|Show help about a command or setting.
@@ -146,7 +145,7 @@ Close the current window.
 
 [[download]]
 === download
-Syntax: +:download [*--dest* 'DEST'] ['url'] ['dest-old']+
+Syntax: +:download [*--mhtml*] [*--dest* 'DEST'] ['url'] ['dest-old']+
 
 Download a given URL, or current page if no URL given.
 
@@ -157,6 +156,7 @@ The form `:download [url] [dest]` is deprecated, use `:download --dest [dest] [u
 * +'dest-old'+: (deprecated) Same as dest.
 
 ==== optional arguments
+* +*-m*+, +*--mhtml*+: Download the current page and all assets as mhtml file.
 * +*-d*+, +*--dest*+: The file path to write the download to, or not given to ask.
 
 [[download-cancel]]
@@ -203,15 +203,6 @@ Retry the first failed/[count]th download.
 ==== count
 The index of the download to cancel.
 
-[[download-whole]]
-=== download-whole
-Syntax: +:download-whole ['dest']+
-
-Download the current page as a MHTML file, including all assets.
-
-==== positional arguments
-* +'dest'+: The file path to write the download to.
-
 [[forward]]
 === forward
 Syntax: +:forward [*--tab*] [*--bg*] [*--window*]+
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 633285727..aa9dd2e4d 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1140,7 +1140,7 @@ class CommandDispatcher:
                 cur.inspector.show()
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def download(self, url=None, dest_old=None, *, dest=None):
+    def download(self, url=None, dest_old=None, *, mhtml=False, dest=None):
         """Download a given URL, or current page if no URL given.
 
         The form `:download [url] [dest]` is deprecated, use `:download --dest
@@ -1150,6 +1150,7 @@ class CommandDispatcher:
             url: The URL to download. If not given, download the current page.
             dest_old: (deprecated) Same as dest.
             dest: The file path to write the download to, or None to ask.
+            mhtml: Download the current page and all assets as mhtml file.
         """
         if dest_old is not None:
             message.warning('current', ":download [url] [dest] is deprecated -"
@@ -1162,15 +1163,20 @@ class CommandDispatcher:
         download_manager = objreg.get('download-manager', scope='window',
                                       window=self._win_id)
         if url:
+            if mhtml:
+                raise cmdexc.CommandError("Can only download the current page"
+                                          " as mhtml.")
             url = urlutils.qurl_from_user_input(url)
             urlutils.raise_cmdexc_if_invalid(url)
             download_manager.get(url, filename=dest)
         else:
-            page = self._current_widget().page()
-            download_manager.get(self._current_url(), page=page, filename=dest)
+            if mhtml:
+                self._download_mhtml(dest)
+            else:
+                page = self._current_widget().page()
+                download_manager.get(self._current_url(), page=page, filename=dest)
 
-    @cmdutils.register(instance='command-dispatcher', scope='window')
-    def download_whole(self, dest=None):
+    def _download_mhtml(self, dest=None):
         """Download the current page as a MHTML file, including all assets.
 
         Args:

From 12a9deb9bc69eaff72df38bb3d2ac6165cdec849 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Wed, 7 Oct 2015 23:53:03 +0200
Subject: [PATCH 048/104] Fix lints

---
 qutebrowser/browser/commands.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index aa9dd2e4d..f3bb32513 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1140,7 +1140,7 @@ class CommandDispatcher:
                 cur.inspector.show()
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def download(self, url=None, dest_old=None, *, mhtml=False, dest=None):
+    def download(self, url=None, dest_old=None, *, mhtml_=False, dest=None):
         """Download a given URL, or current page if no URL given.
 
         The form `:download [url] [dest]` is deprecated, use `:download --dest
@@ -1150,7 +1150,7 @@ class CommandDispatcher:
             url: The URL to download. If not given, download the current page.
             dest_old: (deprecated) Same as dest.
             dest: The file path to write the download to, or None to ask.
-            mhtml: Download the current page and all assets as mhtml file.
+            mhtml_: Download the current page and all assets as mhtml file.
         """
         if dest_old is not None:
             message.warning('current', ":download [url] [dest] is deprecated -"
@@ -1163,18 +1163,19 @@ class CommandDispatcher:
         download_manager = objreg.get('download-manager', scope='window',
                                       window=self._win_id)
         if url:
-            if mhtml:
+            if mhtml_:
                 raise cmdexc.CommandError("Can only download the current page"
                                           " as mhtml.")
             url = urlutils.qurl_from_user_input(url)
             urlutils.raise_cmdexc_if_invalid(url)
             download_manager.get(url, filename=dest)
         else:
-            if mhtml:
+            if mhtml_:
                 self._download_mhtml(dest)
             else:
                 page = self._current_widget().page()
-                download_manager.get(self._current_url(), page=page, filename=dest)
+                download_manager.get(self._current_url(), page=page,
+                                     filename=dest)
 
     def _download_mhtml(self, dest=None):
         """Download the current page as a MHTML file, including all assets.

From 3a2bb2d348f5517a3e4eda52b03d563023f72d78 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Thu, 8 Oct 2015 18:04:53 +0200
Subject: [PATCH 049/104] Add cssutils to README and utils/version.py

---
 README.asciidoc                  |  3 +++
 qutebrowser/utils/version.py     |  1 +
 tests/unit/utils/test_version.py | 14 ++++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/README.asciidoc b/README.asciidoc
index 43240d97c..04ca13a35 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -100,6 +100,9 @@ The following software and libraries are required to run qutebrowser:
 * http://pygments.org/[pygments]
 * http://pyyaml.org/wiki/PyYAML[PyYAML]
 
+The following libraries are optional and provide a better user experience:
+* http://cthedot.de/cssutils/[cssutils]
+
 To generate the documentation for the `:help` command, when using the git
 repository (rather than a release), http://asciidoc.org/[asciidoc] is needed.
 
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 6975ba5fa..91366bd28 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -133,6 +133,7 @@ def _module_versions():
         ('jinja2', ['__version__']),
         ('pygments', ['__version__']),
         ('yaml', ['__version__']),
+        ('cssutils', ['__version__']),
     ])
     for name, attributes in modules.items():
         try:
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 8502c6878..d759b44dd 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -324,6 +324,7 @@ class ImportFake:
             'jinja2': True,
             'pygments': True,
             'yaml': True,
+            'cssutils': True,
         }
         self.version_attribute = '__version__'
         self.version = '1.2.3'
@@ -383,12 +384,13 @@ class TestModuleVersions:
         """Test with all modules present in version 1.2.3."""
         expected = ['sip: yes', 'colorlog: yes', 'colorama: 1.2.3',
                     'pypeg2: 1.2.3', 'jinja2: 1.2.3', 'pygments: 1.2.3',
-                    'yaml: 1.2.3']
+                    'yaml: 1.2.3', 'cssutils: 1.2.3']
         assert version._module_versions() == expected
 
     @pytest.mark.parametrize('module, idx, expected', [
         ('colorlog', 1, 'colorlog: no'),
         ('colorama', 2, 'colorama: no'),
+        ('cssutils', 7, 'cssutils: no'),
     ])
     def test_missing_module(self, module, idx, expected, import_fake):
         """Test with a module missing.
@@ -404,12 +406,13 @@ class TestModuleVersions:
     @pytest.mark.parametrize('value, expected', [
         ('VERSION', ['sip: yes', 'colorlog: yes', 'colorama: 1.2.3',
                      'pypeg2: yes', 'jinja2: yes', 'pygments: yes',
-                     'yaml: yes']),
+                     'yaml: yes', 'cssutils: yes']),
         ('SIP_VERSION_STR', ['sip: 1.2.3', 'colorlog: yes', 'colorama: yes',
                              'pypeg2: yes', 'jinja2: yes', 'pygments: yes',
-                             'yaml: yes']),
+                             'yaml: yes', 'cssutils: yes']),
         (None, ['sip: yes', 'colorlog: yes', 'colorama: yes', 'pypeg2: yes',
-                'jinja2: yes', 'pygments: yes', 'yaml: yes']),
+                'jinja2: yes', 'pygments: yes', 'yaml: yes',
+                'cssutils: yes']),
     ])
     def test_version_attribute(self, value, expected, import_fake):
         """Test with a different version attribute.
@@ -432,6 +435,9 @@ class TestModuleVersions:
         ('jinja2', True),
         ('pygments', True),
         ('yaml', True),
+        pytest.mark.xfail(sys.version_info >= (3, 5), reason='cssutils 1.0 and'
+                          ' earlier are broken on Python 3.5')(('cssutils',
+                                                                True)),
     ])
     def test_existing_attributes(self, name, has_version):
         """Check if all dependencies have an expected __version__ attribute.

From ed8a6a4c7bd2bd367027d6e54067469e622b6116 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 11 Oct 2015 11:06:00 +0200
Subject: [PATCH 050/104] Update to cssutils 1.0.1

This fixes cssutils on Python 3.5 (yay!).
---
 requirements.txt                 | 2 +-
 tests/unit/browser/test_mhtml.py | 4 +---
 tests/unit/utils/test_version.py | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9e07256bd..d5dd44c08 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ pyPEG2==2.15.2
 PyYAML==3.11
 colorama==0.3.3
 colorlog==2.6.0
-cssutils==1.0
+cssutils==1.0.1
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 3ac115ca5..287bb1bc1 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -230,9 +230,7 @@ def test_empty_content_type(checker):
 
 
 @pytest.mark.parametrize('has_cssutils', [
-    # TODO: remove xfail once new cssutils is released
-    pytest.mark.xfail(sys.version_info >= (3, 5), reason='https://'
-                      'bitbucket.org/cthedot/cssutils/issues/52')(True),
+    True,
     False,
 ])
 @pytest.mark.parametrize('inline, style, expected_urls', [
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index d759b44dd..eb398156f 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -435,9 +435,7 @@ class TestModuleVersions:
         ('jinja2', True),
         ('pygments', True),
         ('yaml', True),
-        pytest.mark.xfail(sys.version_info >= (3, 5), reason='cssutils 1.0 and'
-                          ' earlier are broken on Python 3.5')(('cssutils',
-                                                                True)),
+        ('cssutils', True),
     ])
     def test_existing_attributes(self, name, has_version):
         """Check if all dependencies have an expected __version__ attribute.

From f2f9529af739d047801c66052abb8b2c4fedbc67 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sun, 11 Oct 2015 11:51:22 +0200
Subject: [PATCH 051/104] Remove sys import in test_mhtml

---
 tests/unit/browser/test_mhtml.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 287bb1bc1..d19d6e1c6 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -2,8 +2,6 @@
 import io
 import textwrap
 import re
-import sys
-
 import pytest
 
 from qutebrowser.browser import mhtml

From a1e0ccb78725abb94cfc1d1ad489ea6fc136e12a Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 19 Oct 2015 11:55:11 +0200
Subject: [PATCH 052/104] Fix spelling/style.

---
 qutebrowser/browser/mhtml.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 56fc600e6..1ac39be94 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -121,11 +121,12 @@ def _get_css_imports(data, inline=False):
 MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
 
 
+# Encode the file using base64 encoding.
 E_BASE64 = email.encoders.encode_base64
-"""Encode the file using base64 encoding"""
 
+
+# Encode the file using MIME quoted-printable encoding.
 E_QUOPRI = email.encoders.encode_quopri
-"""Encode the file using MIME quoted-printable encoding."""
 
 
 class MHTMLWriter():
@@ -136,14 +137,13 @@ class MHTMLWriter():
         root_content: The root content as bytes.
         content_location: The url of the page as str.
         content_type: The MIME-type of the root content as str.
-        _files: Mapping of location->_File struct.
+        _files: Mapping of location->_File namedtuple.
     """
 
     def __init__(self, root_content, content_location, content_type):
         self.root_content = root_content
         self.content_location = content_location
         self.content_type = content_type
-
         self._files = {}
 
     def add_file(self, location, content, content_type=None,
@@ -165,7 +165,7 @@ class MHTMLWriter():
         """Output the MHTML file to the given file-like object.
 
         Args:
-            fp: The file-object, openend in "wb" mode.
+            fp: The file-object, opened in "wb" mode.
         """
         msg = email.mime.multipart.MIMEMultipart(
             'related', '---=_qute-{}'.format(uuid.uuid4()))

From 8bb887ddabe5ae0cbbd6523600217536987d3bcc Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 19 Oct 2015 12:13:49 +0200
Subject: [PATCH 053/104] Specify window and tab instead of 'current'

---
 qutebrowser/browser/commands.py | 12 ++++++++----
 qutebrowser/browser/mhtml.py    | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index f3bb32513..7588fa424 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1153,8 +1153,8 @@ class CommandDispatcher:
             mhtml_: Download the current page and all assets as mhtml file.
         """
         if dest_old is not None:
-            message.warning('current', ":download [url] [dest] is deprecated -"
-                            " use download --dest [dest] [url]")
+            message.warning(self._win_id, ":download [url] [dest] is deprecated"
+                            " - use download --dest [dest] [url]")
             if dest is not None:
                 raise cmdexc.CommandError("Can't give two destinations for the"
                                           " download.")
@@ -1183,6 +1183,7 @@ class CommandDispatcher:
         Args:
             dest: The file path to write the download to.
         """
+        tab_id = self._current_index()
         if dest is None:
             suggested_fn = self._current_title() + ".mht"
             q = usertypes.Question()
@@ -1190,12 +1191,15 @@ class CommandDispatcher:
             q.mode = usertypes.PromptMode.text
             q.completed.connect(q.deleteLater)
             q.default = downloads.path_suggestion(suggested_fn)
-            q.answered.connect(mhtml.start_download_checked)
+            q.answered.connect(functools.partial(
+                mhtml.start_download_checked, win_id=self._win_id,
+                tab_id=tab_id))
             message_bridge = objreg.get("message-bridge", scope="window",
                                         window=self._win_id)
             message_bridge.ask(q, blocking=False)
         else:
-            mhtml.start_download_checked(dest)
+            mhtml.start_download_checked(dest, win_id=self._win_id,
+                                         tab_id=tab_id)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        deprecated="Use :download instead.")
diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 1ac39be94..e7bdca516 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -415,39 +415,42 @@ class _NoCloseBytesIO(io.BytesIO):  # pylint: disable=no-init
         super().close()
 
 
-def start_download(dest):
+def _start_download(dest, win_id, tab_id):
     """Start downloading the current page and all assets to a MHTML file.
 
     This will overwrite dest if it already exists.
 
     Args:
         dest: The filename where the resulting file should be saved.
+        win_id, tab_id: Specify the tab whose page should be loaded.
     """
+
     dest = os.path.expanduser(dest)
-    web_view = objreg.get('webview', scope='tab', tab='current')
+    web_view = objreg.get('webview', scope='tab', window=win_id, tab=tab_id)
     loader = _Downloader(web_view, dest)
     loader.run()
 
-
-def start_download_checked(dest):
+def start_download_checked(dest, win_id, tab_id):
     """First check if dest is already a file, then start the download.
 
     Args:
         dest: The filename where the resulting file should be saved.
+        win_id, tab_id: Specify the tab whose page should be loaded.
     """
     # start_download will call os.path.expanduser on dest too, so no need to
     # overwrite dest. We just want to make sure that we're checking
     # the right path here. This also means that the user question will show the
     # original path, not the expanded.
     if not os.path.isfile(os.path.expanduser(dest)):
-        start_download(dest)
+        _start_download(dest, win_id=win_id, tab_id=tab_id)
         return
 
     q = usertypes.Question()
     q.mode = usertypes.PromptMode.yesno
     q.text = "{} exists. Overwrite?".format(dest)
     q.completed.connect(q.deleteLater)
-    q.answered_yes.connect(functools.partial(start_download, dest))
+    q.answered_yes.connect(functools.partial(
+        _start_download, dest, win_id=win_id, tab_id=tab_id))
     message_bridge = objreg.get('message-bridge', scope='window',
-                                window='current')
+                                window=win_id)
     message_bridge.ask(q, blocking=False)

From ae8a9b87987d989e0252f1249749efcaee129024 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 19 Oct 2015 14:05:59 +0200
Subject: [PATCH 054/104] Handle non-ASCII in headers/url better

---
 qutebrowser/browser/mhtml.py      | 14 +++++++++-----
 qutebrowser/utils/urlutils.py     |  9 +++++++++
 tests/unit/utils/test_urlutils.py | 13 +++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index e7bdca516..82bb20ed0 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -33,7 +33,7 @@ import email.mime.multipart
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.browser import webelem
-from qutebrowser.utils import log, objreg, message, usertypes
+from qutebrowser.utils import log, objreg, message, usertypes, utils, urlutils
 
 try:
     import cssutils
@@ -237,7 +237,7 @@ class _Downloader():
 
         self.writer = MHTMLWriter(
             web_frame.toHtml().encode('utf-8'),
-            content_location=web_url.toString(),
+            content_location=urlutils.encoded_url(web_url),
             # I've found no way of getting the content type of a QWebView, but
             # since we're using .toHtml, it's probably safe to say that the
             # content-type is HTML
@@ -347,8 +347,12 @@ class _Downloader():
                 self.fetch_url(absolute_url)
 
         encode = E_QUOPRI if mime.startswith('text/') else E_BASE64
-        self.writer.add_file(url.toString(), item.fileobj.getvalue(), mime,
-                             encode)
+        # Our MHTML handler refuses non-ASCII headers. This will replace every
+        # non-ASCII char with '?'. This is probably okay, as official Content-
+        # Type headers contain ASCII only anyway. Anything else is madness.
+        mime = utils.force_encoding(mime, 'ascii')
+        self.writer.add_file(urlutils.encoded_url(url),
+                             item.fileobj.getvalue(), mime, encode)
         item.fileobj.actual_close()
         if self.pending_downloads:
             return
@@ -369,7 +373,7 @@ class _Downloader():
             log.downloads.debug("Oops! Download already gone: %s", item)
             return
         item.fileobj.actual_close()
-        self.writer.add_file(url.toString(), b'')
+        self.writer.add_file(ulrutils.encoded_url(url), b'')
         if self.pending_downloads:
             return
         self.finish_file()
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index e372dc65f..01c366c25 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -438,6 +438,15 @@ def same_domain(url1, url2):
     return domain1 == domain2
 
 
+def encoded_url(url):
+    """Return the fully encoded url as string.
+
+    Args:
+        url: The url to encode as QUrl.
+    """
+    return bytes(url.toEncoded()).decode('ascii')
+
+
 class IncDecError(Exception):
 
     """Exception raised by incdec_number on problems.
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index 4a19df689..5496a019b 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -527,6 +527,19 @@ def test_same_domain_invalid_url(url1, url2):
     with pytest.raises(urlutils.InvalidUrlError):
         urlutils.same_domain(QUrl(url1), QUrl(url2))
 
+
+@pytest.mark.parametrize('url, expected', [
+    ('http://example.com', 'http://example.com'),
+    ('http://ünicode.com', 'http://xn--nicode-2ya.com'),
+    ('http://foo.bar/?header=text/pläin',
+     'http://foo.bar/?header=text/pl%C3%A4in'),
+])
+def test_encoded_url(url, expected):
+    """Test encoded_url"""
+    url = QUrl(url)
+    assert urlutils.encoded_url(url) == expected
+
+
 class TestIncDecNumber:
 
     """Tests for urlutils.incdec_number()."""

From a780325a3ae279785a1f6b9c020c2b5cde925c46 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 19 Oct 2015 20:08:37 +0200
Subject: [PATCH 055/104] Allow directories to be entered as destination

The filename will then default to 'page title.mht'
---
 qutebrowser/browser/downloads.py | 63 +++++++++++++++++---------------
 qutebrowser/browser/mhtml.py     | 41 +++++++++++++++------
 2 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 3478b0a87..efe7f21e9 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -49,7 +49,7 @@ ModelRole = usertypes.enum('ModelRole', ['item'], start=Qt.UserRole,
 RetryInfo = collections.namedtuple('RetryInfo', ['request', 'manager'])
 
 # Remember the last used directory
-_last_used_directory = None
+last_used_directory = None
 
 
 # All REFRESH_INTERVAL milliseconds, speeds will be recalculated and downloads
@@ -57,13 +57,13 @@ _last_used_directory = None
 REFRESH_INTERVAL = 500
 
 
-def _download_dir():
+def download_dir():
     """Get the download directory to use."""
     directory = config.get('storage', 'download-directory')
     remember_dir = config.get('storage', 'remember-download-directory')
 
-    if remember_dir and _last_used_directory is not None:
-        return _last_used_directory
+    if remember_dir and last_used_directory is not None:
+        return last_used_directory
     elif directory is None:
         return standarddir.download()
     else:
@@ -79,15 +79,36 @@ def path_suggestion(filename):
     suggestion = config.get('completion', 'download-path-suggestion')
     if suggestion == 'path':
         # add trailing '/' if not present
-        return os.path.join(_download_dir(), '')
+        return os.path.join(download_dir(), '')
     elif suggestion == 'filename':
         return filename
     elif suggestion == 'both':
-        return os.path.join(_download_dir(), filename)
+        return os.path.join(download_dir(), filename)
     else:
         raise ValueError("Invalid suggestion value {}!".format(suggestion))
 
 
+def create_full_filename(basename, filename):
+    """Create a full filename based on the given basename and filename.
+
+    Args:
+        basename: The basename to use if filename is a directory.
+        filename: The path to a folder or file where you want to save.
+
+    Return:
+        The full absolute path, or None if filename creation was not possible.
+    """
+    if os.path.isabs(filename) and os.path.isdir(filename):
+        # We got an absolute directory from the user, so we save it under
+        # the default filename in that directory.
+        return os.path.join(filename, basename)
+    elif os.path.isabs(filename):
+        # We got an absolute filename from the user, so we save it under
+        # that filename.
+        return filename
+    return None
+
+
 class DownloadItemStats(QObject):
 
     """Statistics (bytes done, total bytes, time, etc.) about a download.
@@ -447,7 +468,7 @@ class DownloadItem(QObject):
             filename: The full filename to save the download to.
                       None: special value to stop the download.
         """
-        global _last_used_directory
+        global last_used_directory
         if self.fileobj is not None:
             raise ValueError("fileobj was already set! filename: {}, "
                              "existing: {}, fileobj {}".format(
@@ -457,13 +478,16 @@ class DownloadItem(QObject):
         # See https://github.com/The-Compiler/qutebrowser/issues/427
         encoding = sys.getfilesystemencoding()
         filename = utils.force_encoding(filename, encoding)
-        if not self._create_full_filename(filename):
+        self._filename = create_full_filename(self.basename, filename)
+        if self._filename is None:
             # We only got a filename (without directory) or a relative path
             # from the user, so we append that to the default directory and
             # try again.
-            self._create_full_filename(os.path.join(_download_dir(), filename))
+            self._filename = create_full_filename(
+                self.basename, os.path.join(download_dir(), filename))
 
-        _last_used_directory = os.path.dirname(self._filename)
+        self.basename = os.path.basename(self._filename)
+        last_used_directory = os.path.dirname(self._filename)
 
         log.downloads.debug("Setting filename to {}".format(filename))
         if os.path.isfile(self._filename):
@@ -480,25 +504,6 @@ class DownloadItem(QObject):
         else:
             self._create_fileobj()
 
-    def _create_full_filename(self, filename):
-        """Try to create the full filename.
-
-        Return:
-            True if the full filename was created, False otherwise.
-        """
-        if os.path.isabs(filename) and os.path.isdir(filename):
-            # We got an absolute directory from the user, so we save it under
-            # the default filename in that directory.
-            self._filename = os.path.join(filename, self.basename)
-            return True
-        elif os.path.isabs(filename):
-            # We got an absolute filename from the user, so we save it under
-            # that filename.
-            self._filename = filename
-            self.basename = os.path.basename(self._filename)
-            return True
-        return False
-
     def set_fileobj(self, fileobj):
         """"Set the file object to write the download to.
 
diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 82bb20ed0..23170f621 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -23,6 +23,7 @@ import functools
 import io
 import os
 import re
+import sys
 import collections
 import uuid
 import email.policy
@@ -32,7 +33,7 @@ import email.mime.multipart
 
 from PyQt5.QtCore import QUrl
 
-from qutebrowser.browser import webelem
+from qutebrowser.browser import webelem, downloads
 from qutebrowser.utils import log, objreg, message, usertypes, utils, urlutils
 
 try:
@@ -373,7 +374,7 @@ class _Downloader():
             log.downloads.debug("Oops! Download already gone: %s", item)
             return
         item.fileobj.actual_close()
-        self.writer.add_file(ulrutils.encoded_url(url), b'')
+        self.writer.add_file(urlutils.encoded_url(url), b'')
         if self.pending_downloads:
             return
         self.finish_file()
@@ -428,12 +429,11 @@ def _start_download(dest, win_id, tab_id):
         dest: The filename where the resulting file should be saved.
         win_id, tab_id: Specify the tab whose page should be loaded.
     """
-
-    dest = os.path.expanduser(dest)
     web_view = objreg.get('webview', scope='tab', window=win_id, tab=tab_id)
     loader = _Downloader(web_view, dest)
     loader.run()
 
+
 def start_download_checked(dest, win_id, tab_id):
     """First check if dest is already a file, then start the download.
 
@@ -441,20 +441,37 @@ def start_download_checked(dest, win_id, tab_id):
         dest: The filename where the resulting file should be saved.
         win_id, tab_id: Specify the tab whose page should be loaded.
     """
-    # start_download will call os.path.expanduser on dest too, so no need to
-    # overwrite dest. We just want to make sure that we're checking
-    # the right path here. This also means that the user question will show the
-    # original path, not the expanded.
-    if not os.path.isfile(os.path.expanduser(dest)):
-        _start_download(dest, win_id=win_id, tab_id=tab_id)
+    # The default name is 'page title.mht'
+    title = (objreg.get('webview', scope='tab', window=win_id, tab=tab_id)
+             .title())
+    default_name = title + '.mht'
+
+    # Remove characters which cannot be expressed in the file system encoding
+    encoding = sys.getfilesystemencoding()
+    default_name = utils.force_encoding(default_name, encoding)
+    dest = utils.force_encoding(dest, encoding)
+
+    dest = os.path.expanduser(dest)
+
+    # See if we already have an absolute path
+    path = downloads.create_full_filename(default_name, dest)
+    if path is None:
+        # We still only have a relative path, prepend download_dir and
+        # try again.
+        path = downloads.create_full_filename(
+            default_name, os.path.join(downloads.download_dir(), dest))
+    downloads.last_used_directory = os.path.dirname(path)
+
+    if not os.path.isfile(path):
+        _start_download(path, win_id=win_id, tab_id=tab_id)
         return
 
     q = usertypes.Question()
     q.mode = usertypes.PromptMode.yesno
-    q.text = "{} exists. Overwrite?".format(dest)
+    q.text = "{} exists. Overwrite?".format(path)
     q.completed.connect(q.deleteLater)
     q.answered_yes.connect(functools.partial(
-        _start_download, dest, win_id=win_id, tab_id=tab_id))
+        _start_download, path, win_id=win_id, tab_id=tab_id))
     message_bridge = objreg.get('message-bridge', scope='window',
                                 window=win_id)
     message_bridge.ask(q, blocking=False)

From f34161423c9e2cece6712fa512ce33aa0c386f8e Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 19 Oct 2015 20:17:22 +0200
Subject: [PATCH 056/104] Fix "line too long"

---
 qutebrowser/browser/commands.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 7588fa424..763c2c319 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1153,8 +1153,9 @@ class CommandDispatcher:
             mhtml_: Download the current page and all assets as mhtml file.
         """
         if dest_old is not None:
-            message.warning(self._win_id, ":download [url] [dest] is deprecated"
-                            " - use download --dest [dest] [url]")
+            message.warning(
+                self._win_id, ":download [url] [dest] is deprecated - use"
+                              " download --dest [dest] [url]")
             if dest is not None:
                 raise cmdexc.CommandError("Can't give two destinations for the"
                                           " download.")

From c2218f51cd7fc9e6534d5d4cdb270e4a87d1a3f0 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sat, 24 Oct 2015 11:21:00 +0200
Subject: [PATCH 057/104] Add mhtml.last_used_directory to vulture whitelist

---
 scripts/dev/run_vulture.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py
index 4d9805332..6715cd201 100644
--- a/scripts/dev/run_vulture.py
+++ b/scripts/dev/run_vulture.py
@@ -80,6 +80,7 @@ def whitelist_generator():
     # https://bitbucket.org/jendrikseipp/vulture/issues/10/
     yield 'qutebrowser.misc.utilcmds.pyeval_output'
     yield 'utils.use_color'
+    yield 'qutebrowser.browser.mhtml.last_used_directory'
 
     # Other false-positives
     yield ('qutebrowser.completion.models.sortfilter.CompletionFilterModel().'

From 252dc9a8bd747c3d1f5b997dd3fb5896cdf68cbd Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sat, 24 Oct 2015 11:32:25 +0200
Subject: [PATCH 058/104] mhtml: Don't attempt to download hostblocked urls

---
 qutebrowser/browser/mhtml.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 23170f621..d6c5de8a1 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -297,6 +297,15 @@ class _Downloader():
 
         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',
                                       window='current')
         item = download_manager.get(url, fileobj=_NoCloseBytesIO(),
@@ -374,6 +383,7 @@ class _Downloader():
             log.downloads.debug("Oops! Download already gone: %s", item)
             return
         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'')
         if self.pending_downloads:
             return

From 9694b3b54804c594a7a3a1b437998f10c6f20b61 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sat, 24 Oct 2015 11:33:04 +0200
Subject: [PATCH 059/104] downloads: Remove safety check in on_reply_error

Probably not needed after the last commit.
---
 qutebrowser/browser/downloads.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index efe7f21e9..e2aea5dd3 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -590,9 +590,6 @@ class DownloadItem(QObject):
         if code == QNetworkReply.OperationCanceledError:
             return
         else:
-            if self.reply is None:
-                log.downloads.debug("QNetworkReply disappeared %s", self)
-                return
             self._die(self.reply.errorString())
 
     @pyqtSlot()

From 5601c8e7c11f27f14fdd582a3d5aa8bc4af8ec6c Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sat, 24 Oct 2015 11:54:25 +0200
Subject: [PATCH 060/104] mhtml: Skip test if cssutils is unavailable

Instead of failing the test (assert cssutils is not None)
---
 tests/unit/browser/test_mhtml.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index d19d6e1c6..7b5fed7be 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -228,9 +228,10 @@ def test_empty_content_type(checker):
 
 
 @pytest.mark.parametrize('has_cssutils', [
-    True,
+    pytest.mark.skipif(mhtml.cssutils is None,
+                       reason="requires cssutils")(True),
     False,
-])
+], ids=['with_cssutils', 'no_cssutils'])
 @pytest.mark.parametrize('inline, style, expected_urls', [
     (False, "@import 'default.css'", ['default.css']),
     (False, '@import "default.css"', ['default.css']),
@@ -244,9 +245,7 @@ def test_empty_content_type(checker):
 ])
 def test_css_url_scanner(monkeypatch, has_cssutils, inline, style,
                          expected_urls):
-    if has_cssutils:
-        assert mhtml.cssutils is not None
-    else:
+    if not has_cssutils:
         monkeypatch.setattr('qutebrowser.browser.mhtml.cssutils', None)
     expected_urls.sort()
     urls = mhtml._get_css_imports(style, inline=inline)

From 71533b3456e52fffc0755e0ec6c202bde80ab3c3 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Sat, 24 Oct 2015 12:12:07 +0200
Subject: [PATCH 061/104] mhtml: Add comments describing the hostblock check

---
 qutebrowser/browser/mhtml.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index d6c5de8a1..bc6f0aa6b 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -297,6 +297,10 @@ class _Downloader():
 
         log.downloads.debug("loading asset at %s", url)
 
+        # Using the download manager to download host-blocked urls might crash
+        # qute, see the comments/discussion on
+        # https://github.com/The-Compiler/qutebrowser/pull/962#discussion_r40256987
+        # and https://github.com/The-Compiler/qutebrowser/issues/1053
         host_blocker = objreg.get('host-blocker')
         if host_blocker.is_blocked(url):
             log.downloads.debug("Skipping %s, host-blocked", url)

From 4f01382c64ef5e92823e0eddb22fbc3880a02574 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 30 Oct 2015 19:59:58 +0100
Subject: [PATCH 062/104] mhtml: Ignore non-http(s) assets

---
 qutebrowser/browser/mhtml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index bc6f0aa6b..62bb75a55 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -288,7 +288,7 @@ class _Downloader():
         Args:
             url: The file to download as QUrl.
         """
-        if url.scheme() == 'data':
+        if url.scheme() not in {'http', 'https'}:
             return
         # Prevent loading an asset twice
         if url in self.loaded_urls:

From a1bc020fecf786ceb448ebeec27c79bdd7de4f6b Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Fri, 30 Oct 2015 21:08:37 +0100
Subject: [PATCH 063/104] mhtml: Sanitize default filename suggestion

---
 qutebrowser/browser/commands.py |  1 +
 qutebrowser/browser/mhtml.py    |  2 +-
 qutebrowser/utils/utils.py      | 21 +++++++++++++++++++++
 tests/unit/utils/test_utils.py  | 14 ++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 763c2c319..4e4527cae 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1187,6 +1187,7 @@ class CommandDispatcher:
         tab_id = self._current_index()
         if dest is None:
             suggested_fn = self._current_title() + ".mht"
+            suggested_fn = utils.sanitize_filename(suggested_fn)
             q = usertypes.Question()
             q.text = "Save page to: "
             q.mode = usertypes.PromptMode.text
diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 62bb75a55..e7272cd78 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -458,7 +458,7 @@ def start_download_checked(dest, win_id, tab_id):
     # The default name is 'page title.mht'
     title = (objreg.get('webview', scope='tab', window=win_id, tab=tab_id)
              .title())
-    default_name = title + '.mht'
+    default_name = utils.sanitize_filename(title + '.mht')
 
     # Remove characters which cannot be expressed in the file system encoding
     encoding = sys.getfilesystemencoding()
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 01723c704..d0d2a83db 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -611,6 +611,27 @@ def force_encoding(text, encoding):
     return text.encode(encoding, errors='replace').decode(encoding)
 
 
+def sanitize_filename(name, replacement='_'):
+    """Replace invalid filename characters.
+
+    Note: This should be used for the basename, as it also removes the path
+    separator.
+
+    Args:
+        name: The filename.
+        replacement: The replacement character (or None).
+    """
+    if replacement is None:
+        replacement = ''
+    # Bad characters taken from Windows, there are even fewer on Linux
+    # See also
+    # https://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
+    bad_chars = '\\/:*?"<>|'
+    for bad_char in bad_chars:
+        name = name.replace(bad_char, replacement)
+    return name
+
+
 def newest_slice(iterable, count):
     """Get an iterable for the n newest items of the given iterable.
 
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index f0ec48531..6d358bee3 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -839,6 +839,20 @@ def test_force_encoding(inp, enc, expected):
     assert utils.force_encoding(inp, enc) == expected
 
 
+@pytest.mark.parametrize('inp, expected', [
+    ('normal.txt', 'normal.txt'),
+    ('user/repo issues.mht', 'user_repo issues.mht'),
+    ('<Test\\File> - "*?:|', '_Test_File_ - _____'),
+])
+def test_sanitize_filename(inp, expected):
+    assert utils.sanitize_filename(inp) == expected
+
+
+def test_sanitize_filename_empty_replacement():
+    name = '/<Bad File>/'
+    assert utils.sanitize_filename(name, replacement=None) == 'Bad File'
+
+
 class TestNewestSlice:
 
     """Test newest_slice."""

From f79722975f4016155dc94949e7804a9ffb773b14 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 9 Nov 2015 17:06:50 +0100
Subject: [PATCH 064/104] Fix _download_dir reference

---
 qutebrowser/browser/downloads.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index e2aea5dd3..078fa622f 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -737,7 +737,7 @@ class DownloadManager(QAbstractListModel):
             prompt_download_directory = config.get(
                 'storage', 'prompt-download-directory')
         if not prompt_download_directory and not fileobj:
-            filename = _download_dir()
+            filename = download_dir()
 
         if fileobj is not None or filename is not None:
             return self.fetch_request(request,
@@ -832,7 +832,7 @@ class DownloadManager(QAbstractListModel):
         prompt_download_directory = config.get('storage',
                                                'prompt-download-directory')
         if not prompt_download_directory and not fileobj:
-            filename = _download_dir()
+            filename = download_dir()
 
         if filename is not None:
             download.set_filename(filename)

From c0535727ef4dda65e837b45ac1382b7c64ab5564 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 9 Nov 2015 22:28:24 +0100
Subject: [PATCH 065/104] Only download elements with rel={stylesheet,icon}

Websites may set the rel attribute to whatever they want, so we just
care about stylesheets and icons and not the other stuff like wss
links (looking at you, GitHub), RSS-feeds, ...
---
 qutebrowser/browser/mhtml.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index e7272cd78..bfdd1ae8f 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -119,6 +119,23 @@ def _get_css_imports(data, inline=False):
         return _get_css_imports_cssutils(data, inline)
 
 
+def _check_rel(element):
+    """Return true if the element's rel attribute fits our criteria.
+
+    rel has to contain 'stylesheet' or 'icon'. Also returns True if the rel
+    attribute is unset.
+
+    Args:
+        element: The WebElementWrapper which should be checked.
+    """
+    if 'rel' not in element:
+        return True
+    must_have = {'stylesheet', 'icon'}
+    rels = [rel.lower() for rel in element['rel'].split(' ')]
+    return any(rel in rels for rel in must_have)
+
+
+
 MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
 
 
@@ -250,6 +267,10 @@ class _Downloader():
 
         for element in elements:
             element = webelem.WebElementWrapper(element)
+            # Websites are free to set whatever rel=... attribute they want.
+            # We just care about stylesheets and icons.
+            if not _check_rel(element):
+                continue
             if 'src' in element:
                 element_url = element['src']
             elif 'href' in element:

From a5ee39c35e82078fff3d0bdada9167ac0fdf1a26 Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Tue, 10 Nov 2015 09:45:01 +0100
Subject: [PATCH 066/104] Fix PEP 8

---
 qutebrowser/browser/mhtml.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index bfdd1ae8f..7381f2d06 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -135,7 +135,6 @@ def _check_rel(element):
     return any(rel in rels for rel in must_have)
 
 
-
 MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
 
 

From 6bd45bbf24ae9b31e5fcc8cb5f969f91c404bfd8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 11 Nov 2015 07:48:36 +0100
Subject: [PATCH 067/104] tests: Add some code for MHTML integration tests.

---
 .../data/downloads/mhtml/simple/requests      |   1 +
 .../data/downloads/mhtml/simple/simple.html   |  10 ++
 .../data/downloads/mhtml/simple/simple.mht    |  20 ++++
 tests/integration/test_mhtml_e2e.py           | 103 ++++++++++++++++++
 4 files changed, 134 insertions(+)
 create mode 100644 tests/integration/data/downloads/mhtml/simple/requests
 create mode 100644 tests/integration/data/downloads/mhtml/simple/simple.html
 create mode 100644 tests/integration/data/downloads/mhtml/simple/simple.mht
 create mode 100644 tests/integration/test_mhtml_e2e.py

diff --git a/tests/integration/data/downloads/mhtml/simple/requests b/tests/integration/data/downloads/mhtml/simple/requests
new file mode 100644
index 000000000..aff865ec9
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/simple/requests
@@ -0,0 +1 @@
+simple.html
diff --git a/tests/integration/data/downloads/mhtml/simple/simple.html b/tests/integration/data/downloads/mhtml/simple/simple.html
new file mode 100644
index 000000000..7584c3f91
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/simple/simple.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Simple MHTML test</title>
+    </head>
+    <body>
+        <a href="/">normal link to another page</a>
+    </body>
+</html>
diff --git a/tests/integration/data/downloads/mhtml/simple/simple.mht b/tests/integration/data/downloads/mhtml/simple/simple.mht
new file mode 100644
index 000000000..d0b7a7c48
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/simple/simple.mht
@@ -0,0 +1,20 @@
+Content-Type: multipart/related; boundary="---=_qute-6d584056-b1e4-4882-91e6-d4a6d23adb67"
+MIME-Version: 1.0
+
+-----=_qute-6d584056-b1e4-4882-91e6-d4a6d23adb67
+Content-Location: http://localhost:1234/data/downloads/mhtml/simple/simple.html
+MIME-Version: 1.0
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE=20html><html><head>
+=20=20=20=20=20=20=20=20<meta=20charset=3D"utf-8">
+=20=20=20=20=20=20=20=20<title>Simple=20MHTML=20test</title>
+=20=20=20=20</head>
+=20=20=20=20<body>
+=20=20=20=20=20=20=20=20<a=20href=3D"/">normal=20link=20to=20another=20page=
+</a>
+=20=20=20=20
+
+</body></html>
+-----=_qute-6d584056-b1e4-4882-91e6-d4a6d23adb67--
diff --git a/tests/integration/test_mhtml_e2e.py b/tests/integration/test_mhtml_e2e.py
new file mode 100644
index 000000000..c3185c007
--- /dev/null
+++ b/tests/integration/test_mhtml_e2e.py
@@ -0,0 +1,103 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test mhtml downloads based on sample files."""
+
+import os
+import re
+import os.path
+
+import pytest
+
+
+def collect_tests():
+    basedir = os.path.dirname(__file__)
+    datadir = os.path.join(basedir, 'data', 'downloads', 'mhtml')
+    files = os.listdir(datadir)
+    return files
+
+
+def normalize_line(line):
+    line = line.rstrip('\n')
+    line = re.sub('boundary="---=_qute-[0-9a-f-]+"',
+                  'boundary="---=_qute-UUID"', line)
+    line = re.sub('^-----=_qute-[0-9a-f-]+$', '-----=_qute-UUID', line)
+    line = re.sub(r'localhost:\d{1,5}', 'localhost:(port)', line)
+    return line
+
+
+class DownloadDir:
+
+    """Abstraction over a download directory."""
+
+    def __init__(self, tmpdir):
+        self._tmpdir = tmpdir
+        self.location = str(tmpdir)
+
+    def read_file(self):
+        files = self._tmpdir.listdir()
+        assert len(files) == 1
+
+        with open(str(files[0]), 'r', encoding='utf-8') as f:
+            return f.readlines()
+
+    def compare_mhtml(self, filename):
+        with open(filename, 'r', encoding='utf-8') as f:
+            expected_data = [normalize_line(line) for line in f]
+        actual_data = self.read_file()
+        actual_data = [normalize_line(line) for line in actual_data]
+        assert actual_data == expected_data
+
+
+@pytest.fixture
+def download_dir(tmpdir):
+    return DownloadDir(tmpdir)
+
+
+@pytest.mark.parametrize('test_name', collect_tests())
+def test_mhtml(test_name, download_dir, quteproc, httpbin):
+    quteproc.set_setting('storage', 'download-directory',
+                         download_dir.location)
+    quteproc.set_setting('storage', 'prompt-download-directory', 'false')
+
+    test_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+                            'data', 'downloads', 'mhtml', test_name)
+    test_path = 'data/downloads/mhtml/{}'.format(test_name)
+
+    quteproc.open_path('{}/{}.html'.format(test_path, test_name))
+    download_dest = os.path.join(download_dir.location,
+                                 '{}-downloaded.mht'.format(test_name))
+    quteproc.send_cmd(':download --mhtml --dest "{}"'.format(download_dest))
+    quteproc.wait_for(category='downloads', module='mhtml',
+                      function='finish_file',
+                      message='All assets downloaded, ready to finish off!')
+
+    expected_file = os.path.join(test_dir, '{}.mht'.format(test_name))
+    download_dir.compare_mhtml(expected_file)
+
+    with open(os.path.join(test_dir, 'requests'), encoding='utf-8') as f:
+        expected_requests = []
+        for line in f:
+            if line.startswith('#'):
+                continue
+            path = '/{}/{}'.format(test_path, line.strip())
+            expected_requests.append(httpbin.Request('GET', path))
+
+    actual_requests = httpbin.get_requests()
+    assert sorted(actual_requests) == sorted(expected_requests)

From 43c3a38938afdf4cea2444530867f0695eb1dbeb Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Wed, 11 Nov 2015 20:00:20 +0100
Subject: [PATCH 068/104] mhtml: Don't crash if output dir doesn't exist

---
 qutebrowser/browser/mhtml.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 7381f2d06..dad2ad63f 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -229,9 +229,10 @@ class _Downloader():
         pending_downloads: A set of unfinished (url, DownloadItem) tuples.
         _finished: A flag indicating if the file has already been written.
         _used: A flag indicating if the downloader has already been used.
+        _win_id: The window this downloader belongs to.
     """
 
-    def __init__(self, web_view, dest):
+    def __init__(self, web_view, dest, win_id):
         self.web_view = web_view
         self.dest = dest
         self.writer = None
@@ -239,6 +240,7 @@ class _Downloader():
         self.pending_downloads = set()
         self._finished = False
         self._used = False
+        self._win_id = win_id
 
     def run(self):
         """Download and save the page.
@@ -420,9 +422,21 @@ class _Downloader():
             return
         self._finished = True
         log.downloads.debug("All assets downloaded, ready to finish off!")
-        with open(self.dest, 'wb') as file_output:
-            self.writer.write_to(file_output)
-        message.info('current', "Page saved as {}".format(self.dest))
+        try:
+            file_output = open(self.dest, 'wb')
+        except OSError as error:
+            message.error(self._win_id,
+                          "Could not save file: {}".format(error))
+            return
+        else:
+            # Yes, ugly nesting of try-blocks, but necessary because there's
+            # no way to let the try block only affect the with-statement-
+            # entry-code and not the with-statement-body.
+            try:
+                self.writer.write_to(file_output)
+            finally:
+                file_output.close()
+        message.info(self._win_id, "Page saved as {}".format(self.dest))
 
     def collect_zombies(self):
         """Collect done downloads and add their data to the MHTML file.
@@ -464,7 +478,7 @@ def _start_download(dest, win_id, tab_id):
         win_id, tab_id: Specify the tab whose page should be loaded.
     """
     web_view = objreg.get('webview', scope='tab', window=win_id, tab=tab_id)
-    loader = _Downloader(web_view, dest)
+    loader = _Downloader(web_view, dest, win_id)
     loader.run()
 
 

From 0f8ec73c55c95d3934d76f77a34020494037a2d4 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Wed, 11 Nov 2015 20:05:42 +0100
Subject: [PATCH 069/104] mhtml: also check dir before starting the download

Otherwise the downloads will be useless anyway.
---
 qutebrowser/browser/mhtml.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index dad2ad63f..b9be58dc3 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -510,6 +510,14 @@ def start_download_checked(dest, win_id, tab_id):
             default_name, os.path.join(downloads.download_dir(), dest))
     downloads.last_used_directory = os.path.dirname(path)
 
+    # Avoid downloading files if we can't save the output anyway...
+    # Yes, this is prone to race conditions, but we're checking again before
+    # saving the file anyway.
+    if not os.path.isdir(os.path.dirname(path)):
+        dir = os.path.dirname(path)
+        message.error(win_id, "Directory {} does not exist.".format(dir))
+        return
+
     if not os.path.isfile(path):
         _start_download(path, win_id=win_id, tab_id=tab_id)
         return

From 4e3cd8b9e81145c5973026f8162a213d46e71f8a Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Wed, 11 Nov 2015 20:39:35 +0100
Subject: [PATCH 070/104] Don't prompt if not storage->prompt-download-dir

---
 qutebrowser/browser/commands.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 4e4527cae..8e0435998 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1185,6 +1185,8 @@ class CommandDispatcher:
             dest: The file path to write the download to.
         """
         tab_id = self._current_index()
+        if not config.get('storage', 'prompt-download-directory'):
+            dest = downloads.download_dir()
         if dest is None:
             suggested_fn = self._current_title() + ".mht"
             suggested_fn = utils.sanitize_filename(suggested_fn)

From 18da73227b2a19a5fceaa652cfafb171fdea1fa1 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Wed, 11 Nov 2015 21:20:04 +0100
Subject: [PATCH 071/104] Don't shadow built-in "dir"

---
 qutebrowser/browser/mhtml.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index b9be58dc3..9b0e1d200 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -514,8 +514,8 @@ def start_download_checked(dest, win_id, tab_id):
     # Yes, this is prone to race conditions, but we're checking again before
     # saving the file anyway.
     if not os.path.isdir(os.path.dirname(path)):
-        dir = os.path.dirname(path)
-        message.error(win_id, "Directory {} does not exist.".format(dir))
+        folder = os.path.dirname(path)
+        message.error(win_id, "Directory {} does not exist.".format(folder))
         return
 
     if not os.path.isfile(path):

From c759bf7a2fc5860f90d5b12ed7bf9d17b5151d6e Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Wed, 11 Nov 2015 23:45:53 +0100
Subject: [PATCH 072/104] Move common filename-ask-code to a function

This should reduce code/logic-duplication regarding asking for download
filenames.
---
 qutebrowser/browser/commands.py  |  24 +++----
 qutebrowser/browser/downloads.py | 115 ++++++++++++++++++++-----------
 2 files changed, 85 insertions(+), 54 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 8e0435998..17f8cab37 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1185,22 +1185,20 @@ class CommandDispatcher:
             dest: The file path to write the download to.
         """
         tab_id = self._current_index()
-        if not config.get('storage', 'prompt-download-directory'):
-            dest = downloads.download_dir()
         if dest is None:
             suggested_fn = self._current_title() + ".mht"
             suggested_fn = utils.sanitize_filename(suggested_fn)
-            q = usertypes.Question()
-            q.text = "Save page to: "
-            q.mode = usertypes.PromptMode.text
-            q.completed.connect(q.deleteLater)
-            q.default = downloads.path_suggestion(suggested_fn)
-            q.answered.connect(functools.partial(
-                mhtml.start_download_checked, win_id=self._win_id,
-                tab_id=tab_id))
-            message_bridge = objreg.get("message-bridge", scope="window",
-                                        window=self._win_id)
-            message_bridge.ask(q, blocking=False)
+            filename, q = downloads.ask_for_filename(
+                suggested_fn, self._win_id, parent=self,
+            )
+            if filename is not None:
+                mhtml.start_download_checked(filename, win_id=self._win_id,
+                                             tab_id=tab_id)
+            else:
+                q.answered.connect(functools.partial(
+                    mhtml.start_download_checked, win_id=self._win_id,
+                    tab_id=tab_id))
+                q.ask()
         else:
             mhtml.start_download_checked(dest, win_id=self._win_id,
                                          tab_id=tab_id)
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 4bea68fa8..8e88f0826 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -48,6 +48,11 @@ ModelRole = usertypes.enum('ModelRole', ['item'], start=Qt.UserRole,
 
 RetryInfo = collections.namedtuple('RetryInfo', ['request', 'manager'])
 
+
+DownloadPath = collections.namedtuple('DownloadPath', ['filename',
+                                                       'question'])
+
+
 # Remember the last used directory
 last_used_directory = None
 
@@ -109,6 +114,49 @@ def create_full_filename(basename, filename):
     return None
 
 
+def ask_for_filename(suggested_filename, win_id, *, parent=None,
+                     prompt_download_directory=None):
+    """Prepare a question for a download-path.
+
+    If a filename can be determined directly, it is returned instead.
+
+    Returns a (filename, question)-namedtuple, in which one component is
+    None. filename is a string, question is a usertypes.Question. The
+    question has a special .ask() method that takes no arguments for
+    convenience, as this function does not yet ask the question, it
+    only prepares it.
+
+    Args:
+        suggested_filename: The "default"-name that is pre-entered as path.
+        win_id: The window where the question will be asked.
+        parent: The parent of the question (a QObject).
+        prompt_download_directory: If this is something else than None, it
+                                   will overwrite the
+                                   storage->prompt-download-directory setting.
+    """
+    if prompt_download_directory is None:
+        prompt_download_directory = config.get('storage',
+                                               'prompt-download-directory')
+
+    if not prompt_download_directory:
+        return DownloadPath(download_dir(), None)
+
+    encoding = sys.getfilesystemencoding()
+    suggested_filename = utils.force_encoding(suggested_filename,
+                                              encoding)
+
+    q = usertypes.Question(parent)
+    q.text = "Save file to:"
+    q.mode = usertypes.PromptMode.text
+    q.completed.connect(q.deleteLater)
+    q.default = path_suggestion(suggested_filename)
+
+    message_bridge = objreg.get('message-bridge', scope='window',
+                                window=win_id)
+    q.ask = lambda: message_bridge.ask(q, blocking=False)
+    return DownloadPath(None, q)
+
+
 class DownloadItemStats(QObject):
 
     """Statistics (bytes done, total bytes, time, etc.) about a download.
@@ -668,15 +716,10 @@ class DownloadManager(QAbstractListModel):
     def __repr__(self):
         return utils.get_repr(self, downloads=len(self.downloads))
 
-    def _prepare_question(self):
-        """Prepare a Question object to be asked."""
-        q = usertypes.Question(self)
-        q.text = "Save file to:"
-        q.mode = usertypes.PromptMode.text
-        q.completed.connect(q.deleteLater)
+    def _postprocess_question(self, q):
+        """Postprocess a Question object that is asked."""
         q.destroyed.connect(functools.partial(self.questions.remove, q))
         self.questions.append(q)
-        return q
 
     @pyqtSlot()
     def update_gui(self):
@@ -733,11 +776,11 @@ class DownloadManager(QAbstractListModel):
                              QNetworkRequest.AlwaysNetwork)
         suggested_fn = urlutils.filename_from_url(request.url())
 
-        if prompt_download_directory is None:
-            prompt_download_directory = config.get(
-                'storage', 'prompt-download-directory')
-        if not prompt_download_directory and not fileobj:
-            filename = download_dir()
+        if fileobj is None:
+            filename, q = ask_for_filename(
+                suggested_fn, self._win_id, parent=self,
+                prompt_download_directory=prompt_download_directory
+            )
 
         if fileobj is not None or filename is not None:
             return self.fetch_request(request,
@@ -745,22 +788,13 @@ class DownloadManager(QAbstractListModel):
                                       filename=filename,
                                       suggested_filename=suggested_fn,
                                       **kwargs)
-        if suggested_fn is None:
-            suggested_fn = 'qutebrowser-download'
-        else:
-            encoding = sys.getfilesystemencoding()
-            suggested_fn = utils.force_encoding(suggested_fn, encoding)
-
-        q = self._prepare_question()
-        q.default = path_suggestion(suggested_fn)
-        message_bridge = objreg.get('message-bridge', scope='window',
-                                    window=self._win_id)
         q.answered.connect(
             lambda fn: self.fetch_request(request,
                                           filename=fn,
                                           suggested_filename=suggested_fn,
                                           **kwargs))
-        message_bridge.ask(q, blocking=False)
+        self._postprocess_question(q)
+        q.ask()
         return None
 
     def fetch_request(self, request, *, page=None, **kwargs):
@@ -834,26 +868,25 @@ class DownloadManager(QAbstractListModel):
         if not self._update_timer.isActive():
             self._update_timer.start()
 
-        prompt_download_directory = config.get('storage',
-                                               'prompt-download-directory')
-        if not prompt_download_directory and not fileobj:
-            filename = download_dir()
-
-        if filename is not None:
-            download.set_filename(filename)
-        elif fileobj is not None:
+        if fileobj is not None:
             download.set_fileobj(fileobj)
             download.autoclose = False
-        else:
-            q = self._prepare_question()
-            q.default = path_suggestion(suggested_filename)
-            q.answered.connect(download.set_filename)
-            q.cancelled.connect(download.cancel)
-            download.cancelled.connect(q.abort)
-            download.error.connect(q.abort)
-            message_bridge = objreg.get('message-bridge', scope='window',
-                                        window=self._win_id)
-            message_bridge.ask(q, blocking=False)
+            return download
+
+        filename, q = ask_for_filename(
+            suggested_filename, self._win_id, parent=self,
+            prompt_download_directory=prompt_download_directory,
+        )
+        if filename is not None:
+            download.set_filename(filename)
+            return download
+
+        self._postprocess_question(q)
+        q.answered.connect(download.set_filename)
+        q.cancelled.connect(download.cancel)
+        download.cancelled.connect(q.abort)
+        download.error.connect(q.abort)
+        q.ask()
 
         return download
 

From 30e2afb59d5622046d547f287cc5870b11a4ca43 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Thu, 12 Nov 2015 13:17:10 +0100
Subject: [PATCH 073/104] mhtml: reduce test flakiness

Waiting for "All assets downloaded" may lead to race conditions when
the output file is read before qute wrote it, so the test fails.
---
 qutebrowser/browser/mhtml.py        | 1 +
 tests/integration/test_mhtml_e2e.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 9b0e1d200..e814db963 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -436,6 +436,7 @@ class _Downloader():
                 self.writer.write_to(file_output)
             finally:
                 file_output.close()
+        log.downloads.debug("File successfully written.")
         message.info(self._win_id, "Page saved as {}".format(self.dest))
 
     def collect_zombies(self):
diff --git a/tests/integration/test_mhtml_e2e.py b/tests/integration/test_mhtml_e2e.py
index c3185c007..fedf6bd69 100644
--- a/tests/integration/test_mhtml_e2e.py
+++ b/tests/integration/test_mhtml_e2e.py
@@ -86,7 +86,7 @@ def test_mhtml(test_name, download_dir, quteproc, httpbin):
     quteproc.send_cmd(':download --mhtml --dest "{}"'.format(download_dest))
     quteproc.wait_for(category='downloads', module='mhtml',
                       function='finish_file',
-                      message='All assets downloaded, ready to finish off!')
+                      message='File successfully written.')
 
     expected_file = os.path.join(test_dir, '{}.mht'.format(test_name))
     download_dir.compare_mhtml(expected_file)

From aef26e7779aac267e325f4590b7b2879f13f506f Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Thu, 12 Nov 2015 20:11:36 +0100
Subject: [PATCH 074/104] mhtml: Recognize more files as css

---
 qutebrowser/browser/mhtml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index e814db963..066686614 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -365,7 +365,7 @@ class _Downloader():
         # content (obs-text) as opaque data.
         mime = mime.decode('iso-8859-1')
 
-        if mime.lower() == 'text/css':
+        if mime.lower() == 'text/css' or url.fileName().endswith('.css'):
             # We can't always assume that CSS files are UTF-8, but CSS files
             # shouldn't contain many non-ASCII characters anyway (in most
             # cases). Using "ignore" lets us decode the file even if it's

From 69a92af097c200cedb9b6119d3bdb80af479d006 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Thu, 12 Nov 2015 20:57:38 +0100
Subject: [PATCH 075/104] mhtml: add "complex" test case

The html page is very ugly, but tests the downloader pretty throughout
---
 .../downloads/mhtml/complex/background.png    | Bin 0 -> 4526 bytes
 .../data/downloads/mhtml/complex/base.css     |   3 +
 .../data/downloads/mhtml/complex/complex.html |  40 +
 .../data/downloads/mhtml/complex/complex.mht  | 795 ++++++++++++++++++
 .../downloads/mhtml/complex/div-image.png     | Bin 0 -> 4633 bytes
 .../downloads/mhtml/complex/extern-css.css    |   4 +
 .../mhtml/complex/external-in-external.css    |   3 +
 .../data/downloads/mhtml/complex/favicon.ico  | Bin 0 -> 16958 bytes
 .../data/downloads/mhtml/complex/image.gif    | Bin 0 -> 6477 bytes
 .../data/downloads/mhtml/complex/inline.png   | Bin 0 -> 4635 bytes
 .../data/downloads/mhtml/complex/requests     |  19 +
 .../data/downloads/mhtml/complex/script.js    |   1 +
 12 files changed, 865 insertions(+)
 create mode 100644 tests/integration/data/downloads/mhtml/complex/background.png
 create mode 100644 tests/integration/data/downloads/mhtml/complex/base.css
 create mode 100644 tests/integration/data/downloads/mhtml/complex/complex.html
 create mode 100644 tests/integration/data/downloads/mhtml/complex/complex.mht
 create mode 100644 tests/integration/data/downloads/mhtml/complex/div-image.png
 create mode 100644 tests/integration/data/downloads/mhtml/complex/extern-css.css
 create mode 100644 tests/integration/data/downloads/mhtml/complex/external-in-external.css
 create mode 100644 tests/integration/data/downloads/mhtml/complex/favicon.ico
 create mode 100644 tests/integration/data/downloads/mhtml/complex/image.gif
 create mode 100644 tests/integration/data/downloads/mhtml/complex/inline.png
 create mode 100644 tests/integration/data/downloads/mhtml/complex/requests
 create mode 100644 tests/integration/data/downloads/mhtml/complex/script.js

diff --git a/tests/integration/data/downloads/mhtml/complex/background.png b/tests/integration/data/downloads/mhtml/complex/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..93bc8bb928812ca2ae82de27b9ab39cafbe2ec10
GIT binary patch
literal 4526
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
M07*qoM6N<$g8$#H<^TWy

literal 0
HcmV?d00001

diff --git a/tests/integration/data/downloads/mhtml/complex/base.css b/tests/integration/data/downloads/mhtml/complex/base.css
new file mode 100644
index 000000000..84d2bc0a5
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/complex/base.css
@@ -0,0 +1,3 @@
+div.fancy {
+    background-color: url("div-image.png");
+}
diff --git a/tests/integration/data/downloads/mhtml/complex/complex.html b/tests/integration/data/downloads/mhtml/complex/complex.html
new file mode 100644
index 000000000..ef886f66c
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/complex/complex.html
@@ -0,0 +1,40 @@
+<html>
+    <head>
+        <!-- make sure external css is included -->
+        <link rel="stylesheet" href="base.css">
+        <!-- make sure <style> is parsed -->
+        <style>
+@import "extern-css.css";
+body {
+    background-image: url("background.png");
+    font-weight: bold;
+    color: white;
+    text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
+}
+        </style>
+        <!-- don't parse non-CSS styles -->
+        <style rel="stylesheet" type="text/qss">
+@import "actually-it's-css";
+        </style>
+        <!-- make sure icons are included -->
+        <link rel="icon" href="favicon.ico">
+        <!-- make sure authors are NOT included -->
+        <link rel="author" href="author.html">
+        <!-- make sure scripts are included -->
+        <script type="text/javascript" src="script.js"></script>
+        <!-- ...but don't crash on scripts without src -->
+        <script>
+var l = 1+1;
+        </script>
+    </head>
+    <body>
+        <!-- include a normal image -->
+        <img src="image.gif">
+        <!-- make sure only http(s) assets are loaded -->
+        <img src="ftp://localhost/image.png">
+        <!-- make sure inline styles are parsed -->
+        <p style="background-image: url('inline.png')">foobar</p>
+        <!-- make sure inline.png is only be requested once -->
+        <img src="inline.png">
+    </body>
+</html>
diff --git a/tests/integration/data/downloads/mhtml/complex/complex.mht b/tests/integration/data/downloads/mhtml/complex/complex.mht
new file mode 100644
index 000000000..1063ff229
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/complex/complex.mht
@@ -0,0 +1,795 @@
+Content-Type: multipart/related; boundary="---=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef"
+MIME-Version: 1.0
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/complex.html
+MIME-Version: 1.0
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<html><head>
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20external=20css=20is=20included=
+=20-->
+=20=20=20=20=20=20=20=20<link=20rel=3D"stylesheet"=20href=3D"base.css">
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20<style>=20is=20parsed=20-->
+=20=20=20=20=20=20=20=20<style>
+@import=20"extern-css.css";
+body=20{
+=20=20=20=20background-image:=20url("background.png");
+=20=20=20=20font-weight:=20bold;
+=20=20=20=20color:=20white;
+=20=20=20=20text-shadow:=20-1px=200=20black,=200=201px=20black,=201px=200=
+=20black,=200=20-1px=20black;
+}
+=20=20=20=20=20=20=20=20</style>
+=20=20=20=20=20=20=20=20<!--=20don't=20parse=20non-CSS=20styles=20-->
+=20=20=20=20=20=20=20=20<style=20rel=3D"stylesheet"=20type=3D"text/qss">
+@import=20"actually-it's-css";
+=20=20=20=20=20=20=20=20</style>
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20icons=20are=20included=20-->
+=20=20=20=20=20=20=20=20<link=20rel=3D"icon"=20href=3D"favicon.ico">
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20authors=20are=20NOT=20included=
+=20-->
+=20=20=20=20=20=20=20=20<link=20rel=3D"author"=20href=3D"author.html">
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20scripts=20are=20included=20-->
+=20=20=20=20=20=20=20=20<script=20type=3D"text/javascript"=20src=3D"script.=
+js"></script></head><body>The=20story=20so=20far:=20In=20the=20beginning=20=
+the=20Universe=20was=20created.=20This=20has=20made=20a=20lot=20of=20people=
+=20very=20angry=20and=20has=20been=20widely=20regarded=20as=20a=20bad=20mov=
+e.=20-=20Douglas=20Adams<br>
+=20=20=20=20=20=20=20=20<!--=20...but=20don't=20crash=20on=20scripts=20with=
+out=20src=20-->
+=20=20=20=20=20=20=20=20<script>
+var=20l=20=3D=201+1;
+=20=20=20=20=20=20=20=20</script>
+=20=20=20=20
+=20=20=20=20
+=20=20=20=20=20=20=20=20<!--=20include=20a=20normal=20image=20-->
+=20=20=20=20=20=20=20=20<img=20src=3D"image.gif">
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20only=20http(s)=20assets=20are=
+=20loaded=20-->
+=20=20=20=20=20=20=20=20<img=20src=3D"ftp://localhost/image.png">
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20inline=20styles=20are=20parsed=
+=20-->
+=20=20=20=20=20=20=20=20<p=20style=3D"background-image:=20url('inline.png')=
+">foobar</p>
+=20=20=20=20=20=20=20=20<!--=20make=20sure=20inline.png=20is=20only=20be=20=
+requested=20once=20-->
+=20=20=20=20=20=20=20=20<img=20src=3D"inline.png">
+=20=20=20=20
+
+</body></html>
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/background.png
+MIME-Version: 1.0
+Content-Type: image/png
+Content-Transfer-Encoding: base64
+
+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
+4n8BgjXlKCMEM1EAAAAASUVORK5CYII=
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/base.css
+MIME-Version: 1.0
+Content-Type: text/css; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+div.fancy=20{
+=20=20=20=20background-color:=20url("div-image.png");
+}
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/div-image.png
+MIME-Version: 1.0
+Content-Type: image/png
+Content-Transfer-Encoding: base64
+
+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
+m+48GgAAAABJRU5ErkJggg==
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/extern-css.css
+MIME-Version: 1.0
+Content-Type: text/css; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+@import=20"external-in-external.css";
+p=20{
+=20=20=20=20font-family:=20"Monospace";
+}
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/external-in-external.css
+MIME-Version: 1.0
+Content-Type: text/css; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+img=20{
+=20=20=20=20width:=20100%;
+}
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/favicon.ico
+MIME-Version: 1.0
+Content-Type: image/x-icon
+Content-Transfer-Encoding: base64
+
+AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAAIEXAACBFwAAAAAA
+AAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDxmEwl7pRFlOyTRLvs
+lUbU6ZZI5+iWSfTol0v755lN/ueYTv/pmlH96ZVG8eN1FL/kdhWn5HYUjeZ3FmfjcQ4S////AP//
+/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
+AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A7JA8N+2WR7TpmEzy5phO/+aYTv/mmE7/5phO/+eaUf/pnlf/66Jc/+ylYf/spWH/66Jc/+me
+V//jeBf/4nUT/+J1E//idRP/4nQT/ON1FM/meBOE5HIUJv///wD///8A////AP///wD///8A////
+AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AOyhTBvpk0O96JZJ9uaYTv/mmU//6J5W/+6pZv/ztHX/9rl8//e9
+gf/4voP/+L6D//i+g//4voP/+L6D//i+g//4voL/8X8Z//B/Gf/vfhj/7XwX/+l6Fv/kdxT/4nUT
+/+J1E//jdhTe5XYTkduAEg7///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A1YAABuZ4FILkgSb055lQ/+uh
+W//wrWz/9rh8//m/hf/5v4X/+b+F//m/hf/5v4X/+b+F//m/hf/5v4X/+b+F//m/hf/5v4X/+b+F
+//WdS//xgBn/8YAZ//GAGf/xgBn/8YAZ/+5+GP/qexb/5XgV/+J2E//idhTw5ngUgtWAAAb///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A53gWauN3FOfjdxP/6osy//a6f//5wIf/+cCH//nAh//5wIf/+cCH//nAh//5wIf/+cCH
+//nAh//5wIf/+cCH//nAh//5wIf/+cCH//nAh//5wIf/97Ju//SSN//yhB7/8oEZ//KBGf/ygRn/
+8oEZ//KBGf/wfxj/6HoV/+N3E//jdxTn53gWav///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A////AP///wDmdRQy5HcU2uN3FP/nehX/74AZ//WcSf/5wYn/+cGJ
+//nBif/5wYn/+cGJ//nBif/5wYn/+cGJ//nBif/5wYn/+cGJ//nBif/5wYn/+cGJ//nBif/5wYn/
++cGJ//nBif/5wYn/+cGJ//amWv/yghr/8oIa//KCGv/yghr/8oIa//KCGv/vgBn/53oV/+N3FP/k
+dxTa5nUUMv///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDoehda43gU
+9eZ6Ff/ugBj/8oMa//KDGv/1n0z/+cKK//nCiv/5wor/+cKK//nCiv/5wor/+cKK//nCiv/5wor/
++cKK//nCiv/5wor/+cKK//nCiv/5wor/+cKK//nCiv/5wor/+cKK//nCiv/5wor/85Ax//KDGv/y
+gxr/8oMa//KDGv/ygxr/8oMa//KDGv/ugBj/5noV/+N4FPXoehda////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
+AP///wD///8A////AP///wDnehWI43gU/el9F//yhBr/8oQa//KEGv/yhBr/9qxi//nDjP/5w4z/
++cOM//nDjP/5w4z/+cOM//nDjP/5w4z/+cOM//nDjP/5w4z/+cOM//nDjP/5w4z/+cOM//nDjP/5
+w4z/+cOM//nDjP/5w4z/+cOM//evaf/yhBr/8oQa//KEGv/yhBr/8oQa//KEGv/yhBr/8oQa//KE
+Gv/pfRf/43gU/ed6FYj///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
+AP///wD///8A////AP///wD///8A////AP///wD///8A////AP+SJAfkehW243kU/+yAGP/yhRr/
+8oUa//KFGv/yhRr/840p//i+hP/5xI7/+cSO//nEjv/5xI7/+cSO//nEjv/5xI7/+cSO//nEjv/5
+xI7/+cSO//nEjv/5xI7/+cSO//nEjv/5xI7/+cSO//nEjv/1wIr/6rWA/+KteP/ssHT/8YUa//KF
+Gv/yhRr/8oUa//KFGv/yhRr/8oUa//KFGv/yhRr/8oUa/+yAGP/jeRT/5HoVtv+SJAf///8A////
+AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
+////AP+SJAfjexXS5HsV/++DGf/yhhr/8oYa//KGGv/yhhv/9JpA//jAh//5xZD/+cWQ//nFkP/5
+xZD/+cWQ//nFkP/5xZD/+cWQ//nFkP/5xZD/+cWQ//nFkP/5xZD/+cWQ//nFkP/5xZD/4Kx4/6Nu
+Pf91QBD/bjkK/245Cv9uOQr/bjkK/3E7C/99Qgz/ikoN/5hRD/+xYBL/2ngX//KGGv/yhhr/8oYa
+//KGGv/yhhr/74MZ/+R7Ff/jexXS/5IkB////wD///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wDkexW25n0V//GGGf/yhxr/8oca//KHGv/0
+mTv/+LyA//nGkv/5xpL/+caS//nGkv/5xpL/+caS/9Ogbf/Wo3D/9sOP//nGkv/5xpL/+caS//nG
+kv/5xpL/+caS//nGkv/5xpL/rHdG/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv9+Qgz/ploR/9l4F//yhxr/8oca//KHGv/xhhn/5n0V/+R7Fbb///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDn
+fhWI5XwV//KHGv/ziBr/84ga//OIGv/1nUH/+caS//nHk//5x5P/+ceT//nHk//5x5P/+ceT//nH
+k/+rd0b/bjkK/3ZBEv+caDf/xJFf/+y6hv/5x5P/+ceT//nHk//5x5P/y5hm/245Cv9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9vOQr/
+nVUQ/+J+GP/ziBr/84ga//KHGv/lfBX/534ViP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wDogBda5XwU/fGHGf/ziRr/84ka//OJGv/zihz/+L6C//nI
+lf/5yJX/+ciV//nIlf/5yJX/+ciV//nIlf/5yJX/q3dH/245Cv9uOQr/bjkK/245Cv9vOgv/ilYm
+/7J/Tv/bqXf/+ciV/5VhMf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9xOwr/q14R//GIGv/ziRr/8YcZ/+V8FP3o
+gBda////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDmehQy5HwU9e+G
+GP/zihr/84oa//OKGv/zihr/96pa//rJl//6yZf/+smX//rJl//6yZf/+smX//rJl//6yZf/+smX
+/6t4R/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK//bEk/+MWCj/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv+PTQ7/6IMZ//OKGv/vhhj/5HwU9eZ6FDL///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A5X0V2u2FGP/zixv/84sb//OLG//zixv/9JMq//rIlf/6ypn/+sqZ
+//rKmf/6ypn/+sqZ//rKmf/6ypn/+sqZ//rKmf+reEj/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv/2xZX/jFgp/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/35DDP/ffhj/84sb/+2F
+GP/lfRXa////AP///wD///8A////AP///wD///8A////AP///wD///8A54AWaumCF//zjBv/84wb
+//OMG//zjBv/84wb//i1bv/6y5r/+sua//rLmv/6y5r/+sua//rLmv/6y5r/+sua//rLmv/6y5r/
+q3lJ/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/9saV/4xYKf9uOQr/bjkK/245Cv9u
+OQr/cDsM/4dTI/+kckL/vYtb/7qIWP+reUn/iE8a/285Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/245Cv9uOQr/hEcN/+6JGv/zjBv/6YIX/+eAFmr///8A////AP///wD///8A////
+AP///wD///8A1YAABuR+Febxixr/840b//ONG//zjRv/840b//WdO//6zJv/+syc//rMnP/6zJz/
++syc//rMnP/6zJz/+syc//rMnP/6zJz/+syc/6t5Sv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK//bHl/+MWSn/bjkK/245Cv9vOgv/r31O//TGlv/6zJz/+syc//rMnP/6zJz/+syc//nD
+iv/afRj/kE8O/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+gWBD/840b
+//GLGv/kfhXm1YAABv///wD///8A////AP///wD///8A////AOaBFoLrhhj/844b//OOG//zjhv/
+844b//SXL//5xo//+s2e//rNnv/6zZ7/+s2e//rNnv/6zZ7/+s2e//rNnv/6zZ7/+s2e//rNnv+r
+eUr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv/2yJn/jFkq/245Cv9uOQr/xJRl//rN
+nv/6zZ7/+s2e//rNnv/6zZ7/+s2e//rNnv/4vn7/844b//OOG//DbxX/dT4L/245Cv9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/812Fv/zjhv/64YY/+aBFoL///8A////AP///wD///8A
+////AO2SEg7lgRXv844b//SPG//0jxv/9I8b//SPG//4vHr/+s6g//rOoP/6zqD/+s6g//rOoP/6
+zqD/+s6g//rOoP/6zqD/+s6g//rOoP/6zqD/q3pL/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/9smb/4xZKv9uOQr/ekYX//jMnv/6zqD/+s6g//rOoP/6zqD/+s6g//rOoP/5v4D/9qFA
+//SPG//0jxv/9I8b/+GDGf97QQz/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+MTA7/
+9I8b//OOG//lgRXv7ZISDv///wD///8A////AP///wDmghWR7ooZ//SQG//0kBv/9JAb//SQG//0
+kBv/+Ldv//rPov/6z6L/+s+i//rPov/6z6L/+s+i//rPov/6z6L/+s+i//rPov/6z6L/+s+i/6t6
+TP9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK//bKnf+MWSv/bjkK/4NQIf/6z6L/+s+i
+//rPov/6z6L/+s+i//rLmf/2pkv/9JAb//SQG//0kBv/9JAb//SQG//0kBv/2X8Y/3Q9C/9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/9J6F//0kBv/7ooZ/+aCFZH///8A////AP///wD/
+//8A6IQW2vSRG//0kRv/9JEb//SRG//0kRv/9JEb//ajQv/60KP/9cue/8qcbv+zhFb/nm0//5dl
+N/+ndkj/todZ/8udb//zyZz/+tCj//rQo/+re03/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/245Cv/2y57/jFor/245Cv+DUCH/+tCj//nKl//4unP/965a//anS//0lSX/9JEb//SRG//0kRv/
+9JEb//SRG//0kRv/9JEb//SRG//Ndxb/bzkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+g
+WhD/9JEb//SRG//ohBba////AP///wD///8A5IAUJu2KGP/0khv/9JIb//SSG//0khv/9JIb//SS
+G//1smX/wZRm/3xIGv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/cz8Q/6FwQv/swpb/q3tN
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/9syg/4xaK/9uOQr/g1Ag//i8dv/1nzj/
+9JIb//SSG//0khv/9JIb//SSG//0khv/9JIb//SSG//0khv/9JIb//SSG//0khv/9JIb/5tXEP9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/eUAL//ORG//0khv/7YoY/+SAFCb///8A////AOaF
+FYTykRr/9JMb//STG//0kxv/9JMb//STG//pjBr/hksS/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/eUUW/4xaLP9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK//fNov+MWSn/bjkK/4JHDf/0kxv/9JMb//STG//0kxv/9JMb//STG//0kxv/9JMb//STG//0
+kxv/9JMb//STG//0kxv/9JMb//STG//Ufhf/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv/XgBf/9JMb//KRGv/mhRWE////AP///wDpiBfI9JQc//SUHP/0lBz/9JQc//SUHP/sjhv/h0oN
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv/3zqT/jFMb/245Cv+CRw3/9JQc//SUHP/0
+lBz/9JQc//SUHP/0lBz/9JQc//SUHP/0lBz/9JQc//SUHP/0lBz/9JQc//SUHP/0lBz/8pMc/3c/
+C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/wXEV//SUHP/0lBz/6YgXyP///wDjjg4S7YwY
++vSVHP/0lRz/9JUc//SVHP/ukRv/i00O/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/98uc/4tOEP9uOQr/gkcN//SVHP/0lRz/9JUc//SVHP/0lRz/9JUc//SVHP/0lRz/9JUc//SV
+HP/0lRz/9JUc//SVHP/0lRz/9JUc//SVHP+eWhD/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/65lE//0lRz/9JUc/+2MGPrjjg4S6YYWZ/OTG//1lhz/9ZYc//WWHP/1lhz/lVQP/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK//S0Z/+LTQ7/bjkK/4NHDf/1lhz/9ZYc//WW
+HP/1lhz/9ZYc//WWHP/1lhz/9ZYc//WWHP/1lhz/9ZYc//WWHP/1lhz/9ZYc//WWHP/1lhz/u24U
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+cWBD/9ZYc//WWHP/zkxv/6YYWZ+2NGIL1lxz/
+9Zcc//WXHP/1lxz/zHoW/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv/xlBz/kVEP/245Cv+DRw3/9Zcc//WXHP/1lxz/9Zcc//WXHP/1lxz/9Zcc//WXHP/1lxz/9Zcc
+//WXHP/1lxz/9Zcc//WXHP/1lxz/9Zcc/8d3Fv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+ilMf//nEhf/4u3D/9qI2/+2NGILukBmX9Zgc//WYHP/1mBz/85cc/4JHDf9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/75Qb//CUG/+yaRP/iUwO//WYHP/1mBz/9Zgc
+//WYHP/1mBz/9Zgc//WYHP/1mBz/9Zgc//WYHP/1mBz/9Zgc//WYHP/1mBz/9Zgc//WYHP/Gdxb/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/4BNH//717D/+9ew//vXsP/0u3vW8JMZrfWZHP/1
+mRz/9Zkc/9aDGP9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9xPA3/r4NY/9y1
+jf/00ar/8Myl/8iedf98SRv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/4RIDf/Pfhf/9Zkc/+6UG//1mRz/9Zkc//WZHP/1mRz/9Zkc//WZHP/1mRz/9Zkc//WZHP/1mRz/
+9Zkc//WZHP/1mRz/9Zkc//WZHP/1mRz/wHMV/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+A
+TR//+9iy//vYsv/72LL/9sSJ6vKUGsT1mhz/9Zoc//WaHP+waRP/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/245Cv9xPQ3/3LaO//vZs//72LD/+9mz//vZs//72bP/9dKs/7GGW/9yPg//bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/5ZWD//hjBn/9Zoc//WaHP/1mhz/
+9Zoc//WaHP/1mhz/9Zoc//WaHP/1mhz/9Zoc//WaHP/1mhz/9Zoc//WaHP/1mhz/9Zoc/7pwFP9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/iFYp//vZs//72bP/+9mz//fIkfTxlxvc9Zsc//Wb
+HP/1mxz/i04O/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/s3Ag//vVq//72bX/+9ew
+//vZtf/72bX/+cWE//i9cP/3r03/57Fv/5pgIv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/cTsK/6tlEv/tlRv/9Zsc//WbHP/1mxz/9Zsc//WbHP/1mxz/9Zsc//WbHP/1
+mxz/9Zsc//WbHP/1mxz/9Zsc//WbHP+rcTD/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/5Zn
+O//72bX/+9m1//vZtf/3zJv78Zkb9PWcHP/1nBz/9Jsc/3A6Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/245Cv9uOQr/hUoN//KaHP/1nB3/96xE//i8a//3rET/961F//WcHP/1nBz/9Zwc//WcHP/1nBz/
+04MX/4ZLDf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/ekIM/8B1Ff/0
+mxz/9Zwc//WcHP/1nBz/9Zwc//WcHP/1nBz/9Zwc//WcHP/1nBz/9Zwc//WcHP/3tVn/g1Ek/245
+Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+kd0z/+9u3//vbt//727f/99Kn//WbHfP2nB3/9pwe
+/+ygOv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/7FqE//2nB3/9pwd//acHf/2nB3/
+9pwd//acHf/2nB3/9pwd//acHf/2nB3/9pwd//acHf/0mx3/vnMV/3lBC/9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/iEwO/9WEGP/2nB3/9pwd//acHf/2nB3/9pwd//ac
+Hf/2nB3/9pwd//acHf/2nB7/5sGd/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/s4hf
+//zbuf/827n//Nu5//rWr//2nR3Z+LJQ//zXr//lwZ7/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv/Nfxf/9p0d//adHf/2nR3/9p0d//adHf/2nR3/9p0d//adHf/2nR3/9p0d//adHf/2
+nR3/9p0d//adHf/tlhz/qWUS/3A7Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/m1oQ/+WRG//2nR3/9p0d//adHf/2nR3/9p0d//adHf/2nR3/96Uy/5hqP/9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/86ngf/83Lv//Ny7//zcu//71q37+cN84fzcuv/83bz/
+2LSP/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/6ZQb//aeHf/2nh3/9p4d//aeHf/2
+nh3/9p4d//aeHf/2nh3/9p4d//aeHf/2nh3/9p4d//aeHf/2nh3/9p4d//KbHP/gjhr/lFUP/245
+Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9yPAv/sGoT//CaHP/2nh3/9p4d
+//aeHf/2nh3/9p4d/8F2Fv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/286C//x0K7/
+/N28//zdvP/83bz/+9Sm9Pzbtff83r7//N6+/8ymgf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/ekIM//afHf/2nx3/9p8d//afHf/2nx3/9p8d//afHf/2nx3/9p8d//afHf/2nx3/9p8d//af
+Hf/2nx3/9p8d//afHf+OUQ7/wHYV//WeHf/NgRf/cTsK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv98RAz/xXoW//WfHf/2nx3/6ZUb/5tbEP9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv+HVir//N6+//zevv/83r7//N6+//vToun5wne5+siD//vWqf/I
+on7/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39GDP/2oB3/9qAd//agHf/2oB3/9qAd//ag
+Hf/2oB3/9qAd//agHf/2oB3/9qAd//agHf/2oB3/9qAd//agHf/2oB3/g0kN/245Cv+SVA//9qAd
+/3Y/C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9zPQv/
+f0YM/3E7Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/upJr//zfwP/8
+38D//N/A//zfwP/70p/Z9qAdcfahHf/2pCT/3LF//245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv93QAv/9qEd//ahHf/2oR3/9qEd//ahHf/2oR3/9qEd//ahHf/2oR3/9qEd//ahHf/2oR3/9qEd
+//ahHf/2oR3/9qEd/4NJDf9uOQr/f0YM//ahHf92Pwv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/fkse//favP/84ML//ODC//zgwv/84ML/+cyPuPWhHU/2oh3/9qId/+6i
+Lf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/+aWG//2oh3/9qId//aiHf/2oh3/9qId
+//aiHf/2oh3/9qId//aiHf/2oh3/9qId//aiHf/2oh3/9qId//aiHf+DSQ3/bjkK/39GDP/2oh3/
+dj8L/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/8ahff/84cT//OHE//zh
+xP/84cT//OHE//nEd37/nRQN96Md+fejHf/3ox3/f0YM/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/245Cv/Nghf/96Md//ejHf/3ox3/96Md//ejHf/3ox3/96Md//ejHf/3ox3/96Md//ejHf/3ox3/
+96Md//ejHf/3ox3/g0kN/245Cv9/Rgz/96Md/3Y/C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/4dWKv/74cT//OLF//zixf/84sX//OLF//zhw///v2oY////APekHbj3pB3/96Qd
+/6ZlEv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/sW0T//ekHf/3pB3/96Qd//ekHf/3pB3/
+96Qd//ekHf/3pB3/96Qd//ekHf/3pB3/96Qd//ekHf/3pB3/96Qd/4NJDf9uOQr/f0YM//ekHf92
+Pwv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/3VBE//bu5v//OPH//zjx//848f//OPH
+//zjx//72q7x////AP///wD4pR1p96Ue//elHv/PhRj/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/39HDf/2pB7/96Ue//elHv/3pR7/96Ue//elHv/3pR7/96Ue//elHv/3pR7/96Ue//elHv/3
+pR7/96Ue//elHv+DSg3/bjkK/39GDP/3pR7/dj8L/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv99RQz/qmgT/286Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/3xKHf/hw6T//OTJ//zkyf/85Mn//OTJ//zkyf/85Mn/+9Odu////wD///8A9qocG/emHv/3ph7/
+8qId/3dAC/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/yoMX//emHv/3ph7/96Ye//emHv/3
+ph7/96Ye//emHv/3ph7/96Ye//emHv/3ph7/96Ye//emHv/3ph7/g0oN/245Cv9/Rgz/96Ye/3Y/
+C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/f0YM//emHv/glBv/mFsQ/245Cv9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/cDsM/5xwSP/s0bT//eXL//3ly//95cv//eXL//3ly//95cv/
+/eXL//vRk0L///8A////AP///wD4qB7M96ce//enHv+xbhT/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/3tEDP/tnx3/96ce//enHv/3px7/96ce//enHv/3px7/96ce//enHv/3px7/96ce//en
+Hv/3px7/96ce/4NKDf9uOQr/f0YM//enHv92Pwv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/39GDP/3px7/96ce//enHv/snhz/0YkZ/7dzFf+cXhH/lVgQ/55fEf+taxP/zoYY/++iIP/71Zz/
+/ebM//3mzP/95sz//ebM//3mzP/95sz//ebM//3br/T///8A////AP///wD///8A9qgfdfeoHv/4
+sjr/7KQo/3M9C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/llkQ//OlHf/3qB7/96ge//eo
+Hv/3qB7/96ge//eoHv/3qB7/96ge//eoHv/3qB7/96ge//eoHv+CSg3/bjkK/39GDP/3qB7/dkAL
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/Rgz/96ge//eoHv/3qB7/96ge//eoHv/3qB7/
+96ge//eoHv/3qB7/96ge//eoHv/3qB7/96ge//nAYv/95sv//efO//3nzv/9587//efO//3nzv/7
+zYit////AP///wD///8A////AP/Ykxr947/8/ejQ//3lyP+rdjf/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/245Cv+NUg//7KAc//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3qR7/96ke
+//epHv/Sixn/bzkK/245Cv9/Rwz/96ke/3ZAC/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+f0cM//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3
+qR7/+cBg//3o0P/96ND//ejQ//3o0P/95sn+/9WKGP///wD///8A////AP///wD///8A+9unvf3p
+0v/96dL/9N7F/4BPI/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/3pDDP+3dBX/76Md
+//iqHv/4qh7/+Koe//iqHv/4qh7/+Koe//iqHv/PiBj/cz0L/245Cv9uOQr/f0cM//iqHv92QAv/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39HDP/4qh7/+Koe//iqHv/4qh7/+Koe//iqHv/4
+qh7/+Koe//iqHv/4qh7/+Koe//iqHv/4qh7/+Koe//itJv/96M7//enS//3p0v/96dL//Neesv//
+/wD///8A////AP///wD///8A////AP/grRn958z9/erU//3q1P/exKj/cTwO/245Cv9uOQr/bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/3U/C/+YXBD/q2sT/716Ff/PiRj/25Ma/7V0FP+HTg7/
+bjkK/245Cv9uOQr/bjkK/39HDP/4qx7/dkAL/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/
+Rwz/+Kse//irHv/4qx7/+Kse//irHv/4qx7/+Kse//irHv/4qx7/+Kse//irHv/4qx7/+Kse//ir
+Hv/4qx7/+sdu//3q1P/96tT//OTC+//bkg7///8A////AP///wD///8A////AP///wD///8A/Nyo
+p/3r1f/969X//evV/72bef9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/Rwz/+Kwe/3ZAC/9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/f0cM//isHv/4rB7/+Kwe//isHv/4rB7/+Kwe//is
+Hv/4rB7/+Kwe//isHv/4rB7/+Kwe//isHv/4rB7/+Kwe//isHv/6wFf//ebF//vVk5D///8A////
+AP///wD///8A////AP///wD///8A////AP/b2wf84rv1/ezX//3s1//869b/pH1Y/245Cv9uOQr/
+bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/f0cM//itHv92QAv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39H
+DP/4rR7/+K0e//itHv/4rR7/+K0e//itHv/4rR7/+K0e//itHv/4rR7/+K0e//itHv/4rR7/+K0e
+//itHv/4rR7/+K0e//q/U9T///8B////AP///wD///8A////AP///wD///8A////AP///wD///8A
++9WKSP3r0/797dn//e3Z//3t2f+/n4D/cDwN/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
+OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39HDf/4rh//dkAL/245
+Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/Rw3/+K4f//iuH//4rh//+K4f//iuH//4rh//+K4f
+//iuH//4rh//+K4f//iuH//4rh//+K4f//iuH//4rh//+K8j//m6RPH4sRwk////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wD93qmS/u7b//7u2//+7tv//u7b/9rBp/96
+SBv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/245Cv9/Rw3/+K8f/3ZAC/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/f0cN
+//ivH//4rx//+K8f//ivH//4rx//+K8f//ivH//4rx//+K8f//ivH//4rx//+K8f//ivH//4rx//
++K8f//nBU/372JuE////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP7juMr+793//u/d//7v3f/+793/7drE/6J7Vv9yPhD/bjkK/245Cv9uOQr/bjkK/245
+Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/gUoN//iwH/92QAv/bjkK
+/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39HDf/4sB//+LAf//iwH//4sB//+LAf//iwH//4sB//
++LAf//iwH//4sB//+LAf//iwH//4sB//+LAf//iwH//5vkl9////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD//78E/eS24f7w3v/+8N7//vDe//7w
+3v/+8N7/8+LO/72dfv+DVCn/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
+/245Cv9uOQr/cz4L/9eUGv/5sR//w4IX/4hPDv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/SA3/
++bEf//mxH//5sR//+bEf//mxH//5sR//+bEf//mxH//5sR//+bEf//mxH//5sR//+bEf//mxH//4
+sh+b////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP/EnQ395Lvv/vDd//3fqv/+8eD//vDb//vRfv/83aP//fDd/9jBqP+tiWf/nXZQ
+/49jO/+AUCX/cj0N/245Cv9uOQr/bjkK/3M+C/+KUg7/uHkV/+qlHf/5sh//+bIf//myH//5sh//
+2ZYa/59kEf9xPAr/bjkK/245Cv9uOQr/f0gN//myH//5sh//+bIf//myH//5sh//+bIf//myH//5
+sh//+bIf//myH//5sh//+bIf//myH//6sh+8/5kzBf///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A/+SuE/3lu+L6v0P//eO1
+//7y4v/968z//ejD//7y4v/95Lf//eGt//7y4v/+8uL//vLi//7u1v/wuk7/4J0b/+ikHP/5wEn/
++bMf//mzH//5sx//+bMf//mzH//5sx//+bMf//mzH//5sx//7agd/7d5Ff9/SA3/bjkK/39IDf/5
+sx//+bMf//mzH//5sx//+bMf//mzH//5sx//+bMf//mzH//5sx//+bMf//mzH//4sx+b/8wzBf//
+/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
+AP///wD///8A////AP///wD///8D/N2dq/rCSv3+79j//eCp//m5MP/825r//vPk//7z5P/+8+T/
+/vPk//7z5P/+8+T//vPk//3ry//82I///efA//3ktv/70Xn/+r49//m0H//5tB//+bQf//m0H//5
+tB//+bQf//m0H//5tB//+LMf/8+PGf+laRL/+bQf//m0H//5tB//+bQf//m0H//5tB//+bQf//m0
+H//5tB//+bQf//m0H/z4tB5t////AP///wD///8A////AP///wD///8A////AP///wD///8A////
+AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD72JF2
+/eKt+v3tzv/82Y///eSz//705f/+9OX//vTl//705f/+9OX//vTl//705f/+9OX//vTl//705f/+
+9OT//NiN//vSev/6yFr/+bUf//m1H//5tR//+bUf//m1H//5tR//+bUf//m1H//5tR//+bUf//m1
+H//5tR//+bUf//m1H//5tR//+bUf//m1H//5tR//+bUf//m1H+74tB5E////AP///wD///8A////
+AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////APi4HCT81X7e/vXn//715//+9ef//vXn//715//+
+9ef//vXn//715//+9ef//vXn//715//+9ef//vPg//m6LP/5th//+bYf//m2H//6xEr/+81q//zY
+jP/84KX/+bYf//m2H//5th//+bYf//m2H//5th//+bYf//m2H//5th//+bYf//m2H//5th//+bYf
+//m2H8f4uBwk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////A/3ippX98NX7/vbp//726f/+9un//vbp//726f/+9un//vbp//726f/+9un//vbp//7w
+1f/7z27/+boq//m6Kf/5tyD/+9V///726f/+9un//eSv//m3IP/5tyD/+bcg//m3IP/5tyD/+bcg
+//m3IP/5tyD/+bcg//m3IP/5tyD/+bcg2Pm3H1L///8A////AP///wD///8A////AP///wD///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A/+qqDPzhqKz+8979/vfr//73
+6//+9+v//vfr//736//+9+v//vfr//736//96sL//NV+//3ou//82Yv//NN4//vBPv/82Yv//evE
+//q7Kv/6uCD/+rgg//q4IP/6uCD/+rgg//q4IP/6uCD/+rgg//q4IP/5uCDm+rcgZ/+/QAT///8A
+////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A/96bF/7hprX+8NT4//jt///47f//+O3///jt///47f//+O3///jt
+///47f//+O3///jt///47f//+Ov//uWx///25//7w0D/+rkg//q5IP/6uSD/+rkg//q5IP/6uSD/
++rkg//q5Icz7uSF1/7MaCv///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
+APvjoj/+5Ker/uvB6//36P//+e7///nu///57v//+e7///nu///57v//+e7///nu///57v//+e7/
+/NmF//q6IP/6uiD/+rog//q6IPn5uiC4+rsgafa9HBv///8A////AP///wD///8A////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
+AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/0XQW/d+Wgf7nrbX+57XO
+/uu/4v7vyvD+89f6/vfo///46///9+X8/vTb9/vFQq/5ux+L+rsgcfm7IE//xCcN////AP///wD/
+//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+/wD///8A////AP///wD///8A////AP///wD///8A////AAD///////gAAB//////wAAAA/////8A
+AAAA/////gAAAAB////4AAAAAB////AAAAAAD///4AAAAAAH//+AAAAAAAH//wAAAAAAAP//AAAA
+AAAA//4AAAAAAAB//AAAAAAAAD/4AAAAAAAAH/gAAAAAAAAf8AAAAAAAAA/gAAAAAAAAB+AAAAAA
+AAAHwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADgAAAAAAAAAGAAAAAAAAAAYAAAAAAAAABAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAACAAAAAAAAAAYAAAAAAAAABgAAAAAAAAAHAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPg
+AAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/gAAAAAAAAf/AAAAAAAAD/+AAAAAAAAf/4A
+AAAAAAD//wAAAAAAAP//gAAAAAAB///AAAAAAAf///AAAAAAD///+AAAAAAf///8AAAAAH////8A
+AAAA/////8AAAAP/////+AAAH///////AAD///8=
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/image.gif
+MIME-Version: 1.0
+Content-Type: image/gif
+Content-Transfer-Encoding: base64
+
+R0lGODlhhQBkAPcAAAAAAAMADAoBDwIBFAsCEwQBGwsEHAwIGhIFHRUGGgYBIgsEJAwEKw4JKBMF
+IxMKJRIELBoGLBQLKxwKLBoIJRsRLRcQJw0IMxQGMxULMxwMNBQLOxwNOxgGNR0SNB0SOxsVPCML
+LSIZLCQLMywMMyYOOSMUPCsTPCQZPSobPCMXNTcUOzEMMCshOzEmPEUUOxoOQhQMQx0SRB0USxcT
+RhwVUiMVRCkWQiUaRCsbRCIWSiUaTCsdSzIaRDUcSCUbUyseUiQbWSwhQy4hTDMkTTcnSi0hUywi
+WyYhXDMkUzUpUzoqVTMmWzUqXDsrWzkmVT4yXT0yVD0yTy0lYTQrYTstYjEnZT0zZDszazw1dEcc
+REknSVIsTUIuXEUrVVQqVUIzXEc3Wlg3WU8zTUM0Y0Q6ZUs7ZEQ2a0U6a0s8a0w3Z1k5ZUY7c0k1
+ZmI9ZGA7X1ZHXE5CZU1CbEdAZ1JDbFhIaUxCc0xEe1JFc1ZKdFpMdFRKeVtMe1dFdV1SfF1SdGRH
+aWNMdWdKdWJTfWdXeXJYe2VWbmxkenxqf0U+gl1Tg1xTiFNKhGNUgmVZg2pdhGRai2tdi2xUgXNc
+h2pekmtihW1ijHJkjHRqjHlniGxjk3JlknRqk3lslXVrm3ltmnxylXxzm396m3xzinx1o3x2pnRs
+oYN1m4R7m4Z5l4Jxj4R8pIl9pYR7qIyBnYyKmo2Hk4yDpIaCrIyErIyHqJOLrJSJqJmTqo2LtIqF
+sZONtJeMs5WRtJyUtJWTuZyZvJyXt6Kas6Kcu6SataukvKilubSxvJ+cwKOewqaiw6qlwqypxa2p
+ybKsw7Ouy7CnwbWyy7u6zLe1yL270rq10sG9y8G91L/Ex8XCzcTC1cbD2snG3MzL3cjL09LT3dXb
+3c7P2tHO4dPU49zd5dvc6tfY5c3N4N7h69zj5d/i8OHl7OTq7uXr6u797+n07eXr8eru8+vz9O/9
+8O72+fD+8fX6+vD/7wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAACFAGQA
+AAj+AAEIHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNq3Mixo8ePIEOKHEmypMmTKFOqXMmypcuX
+MGN+FCAggE2ZOC0GEEDgQQgVN3LwGIrCw4QDAXIqTRiAAIIQJXLkGLLEyRMfQJ4occK1SAoNBJaK
+tYkggoYbPJL4SNLlSRcvPqz6UNKlrVYhFgSIjbmTgAEHEDp0KDGig40bh3s8eeLFS5cwbRx7cdJl
+iYqwe1faJEAAMAYIGDBEGFHixg0SI0jc8LHFy5c1gAQFWqPmrRoyLZJmPmlzAIIFEBgIFw5Bgw0S
+yEmUUL26SBEvYgIBWiMGupk0USro3i2yKQIKESL+BFdAXkEB0CPShwhBgoVqHz1WyNfypb4WNYzc
+qHligDvIAAMQAJ4GGnQQmgIDJDhAAQzYQFgILLiH3AklnLDCCy9osYIWXvDhySmC7CeBfx7xlEB4
+oAlHXgEssqgAaexJSEIHDCzAwAgYaqGjFpLswgwyrURyBgjbkXiRiRQ4UAB5DHRQAQQSMNDieSSs
+4MMNBS6wpHAOsEDfF2584UUm1JhjDTWt2MEDZkZWtBkBLTIAAhFpmJEDjUsuuAAJPmjBQXkMYLBB
+Bn/lCCaYqgyzTTjW/KJIEwO0SVFvBhiwZAlK8OFII3SUAAGTLYbQQw8dQHDBBRAEhoFwJVyohRv+
+k5xSyCSsIOOMMJ1scsUBkka0WQIUQCkEGWeggQcYSTxQngINWFCACkWAUcQHGNBggw472MBDaB3o
+KIkbtuxySi/CsBJIH4N8QgWvvTrUFAEJOMDBE2QYUQIIO3wgAwQLKFBjBjkMG0YORWQAwQ9+QMKH
+E3h0MQIMOtbnxilqHOOMM7O0Ekous9zBbrsKLYhAAg+UwAMTIIBghBAaLJCBEi0MIUccSsxxiBAF
+OODBB0ZoIow43KTCBxgmaODDCa698EUfajjCSjLCCMPLLJ8wESnICPGEAAQTeJBBBg0UAIIMGYCw
+AAiLcMLLL8XYwkozo4SRAghN4HHJJtmgUwv+MMH80QQfJ6z2Aheq+KDDGazYQoszuXwCCQ5YI+SX
+AxFgsIClC4JdwOUDbGCHLJzIQksrsxSDzS2Y1GFGEpqIEw854sAzji2ZLDHCal8IcsMMTJQhByfT
+RJNLK5pkEHlBnCFggAILSFDAguY9L/YBAzQAwgdXcDKIFHZUUkccUhiRRifKiFMOPOqIU40wwXgB
+gw2LGcGEHzlwoAQxUYfiiSILHC+QiQliUAakl7mwKShBCtABD6DgggeAQAhNEIUhoiCHRmxiG/UY
+xzaw4Q11RCMNSbDBD46ABTLoIANCiEUeIgEJO3iCCkUCGU14YgAt6alFC2gAggbQG2bJiQj+Hqhh
+A6Agilhg4g+dkMY21oGO2MUDHsSgQxKooAg5GGEHHNCAGfbgB0Uowg+MAMHx+kKABdhwQVJi3pQU
+xKIFHWCNZ/OKCeywjGhYYxzl4MY6MkiMSjjCGsZQAgc+8AEw0MIMQziDHdCAhavJEE4IOOCStGQj
+BE1ySeY5IIB600YDbGAPsTBGNeCxDW+UQx3fwIYtiBGNOlRBCTYIAypwIAMc2AELbKAB1nYiAANE
+ko3MU0AGKpDJAPIwgGcEEBsrdRZZDuMUwmgGN26RiV0IQhCMiAQfhqAEMzjhDlCYgRGMgIQCtMsm
+NCkAgFpkHi2RZwGSVFAAFtAED0jgjc/+4yEngUOGZwzDFrYoRirUcApWTGISqhhYEtLwh0MAgw1T
+mMEPNnBOmhAgQcp0UT4XtNECoMACCpqBHJQAAgk04I3U05MBIMAEbcSjGb2oRiaKIIhTTEISqnBC
+B8AQBj7MDApGCIIVkOBIIzUlAQkwwDENcNGNshGBH3hAPs9mgQw04QplyEMZcnC9IC6ACMGoxjC0
+UY1b5OAMB52EG4iQAQIRgQg42MAProCFIzSgVwF4Sgh+WYAKJOCACTJASgfAgAz8sgESSNABsgAF
+GdhhDpyoAxmEUAHgmEwN1XDFLYrQhj6soRBeUMITTJCBfXWABkBwwg+QsIEYcievFBj+wQQiaQCk
+cjSAcjoA9RowhBYkaAEg1ZIFKnCACoBgCEWo7GcW4IC2HsIWhyiCg3zwhCTQoS0oyMAMaLABGsRg
+BzWogTmNGoC/UE4DSA0BBabUrAfcU7cFmEEL7rlD4FSgATJAwQMaIAQP1MhGHxiBA3hwCUIQwQs5
+kAEPuqAHNThBBxygZQc2sIHvIuECbeKhU8qogRGE4AQeoKRJC9CABbwxQQ3IgAUOIIEHHKC9ObSA
+EorQgBSbAAJXEEUY6IYHOqAABUvgAAZusIS2VIEH15pBDGAQgxkcgQau3Qs6eaiADxBGBQ8ADgh4
+4LwFVMAC8AQQb6XaAAM8oKqUtZ7+ByqQgaKAABLSiEYlwCCEHBAoBTko2gfOkAY+JAENTdCBDHYw
+AyfXoKi7AVBNFtSACaRgCXEQgkm1tLmUtdgmJAYBPpklgQp4gFn89QADQZAGPVQiCkMwQZNWhQEd
+5OAGqAgGMAiRikE0gQczgMGgkaAAow5g0QVAwARwkIMrpECpCzIAA2jAgx+DFMUmvYAHLNAAD1hb
+xRL4sQoYUAIDlQoCG9ABDASjgyV4IQ/ggMctiDGMSvCAwjSowRQwTKK+rBMCeIbCDR5QqTJKIANY
+gMIHjiuFFrxxvyDwmgcgkHALCAEE3YaAsj8jnAl3IAOr6sANTECGW8SDGMEYhh7+zjCDDcCgBkjQ
+JYngddEBGAADPBhCEyCA2A/kwKQZSEMYRG0JUYgiDkVoQQ0t5WIJ5CACOMBDFHCAgwpUCjQXoFE7
+yZOBD6DBFuOQaSAcoYs+LHkHR6hBlJciAAR0xgE20hYHzuyBFBChCEIYAh8wUQY7KMIRstAFLw5R
+AZcrtQEVIAIKoHALQvgBCkOQgQMYUGEMXGCHLGoBEfAAjKwP4hG3mEYnYGAEHGBhCmPPSVNmazDm
+ZmAIU1GCEpZwHTBcIRKyAIUf5ID47FkCDino2gI+gAMpSOUW3AhGJeQABHHD4AccuICUAmiAEqDC
+G95gByZU0Q1v2AIIMpCBHxr+6R+eTCACDIDSwm3QBCVcwQx6GMQgCPGHPniCFrJAxR8qMIQ7cKIW
+tAgDFOIwhyUsIQofAAno0A2o4AdnMAVA8AM/UAKrYkMFoAFDYAvqEH3BQAe3AA6nQAZHMAN0wAjj
+lWgEMAEOYAASkEUokANGYANGgAeOwAmrwAq7wAqEwAeb8Au+QAgisABK4Aeb4AeWIAzAsAp5EAY8
+oAnTsAyh4AgHiIDi5gNE4AItIAIuIAZwMErYQAyoUASq0DaXsAdIEAeM0D/+ISARgHbZlgQmUAEp
+UAR90AiRsAmkMAtyiAmasgmRcAgioFsNoAinNgRpQAdh0AShUAzAEAqEkAb+VEAFTPADOrAGdeAC
+YyAGgDCJ1TAO3DAMuwAGRNAHquAKm2AHabAId/VaAwAYzIVnKSAEZkAHdHAGZiAHkdAJn+AIkVCL
+jgAGOcAGmSACAdAAfxB0DQABULAESoALyBANoTAIbFAFVBAERkAEhqAKW7AFbwAIhgAIwxAP44AK
+hUAIltAERZAKorAIV8AIo8gdAaIkEPAESxAGdJAGt+YEcvAHkcAKp4AJhNAGZNAGS5Bde3AIFgAC
+RWAzKqCKQ+AI0bAMzFALm9AIZFAFCFgE1QgHY/AGcDCJsAAP9UAMfQAMwJAHOZAJoIAJd3AH55gZ
+O/EXBmACTkAGeJAGOFD+WGiwCaUQC7sQCpFAB2TQBUqQe2hXCXBAbXkQB3JACEJgAqDwDegwDHxQ
+BVXABFYABDcAHWIQiRT5BoWACOwQD9ugCrtwC2owBIQACpbgCVlwkihpABMwATdABmlABmaTAFHA
+CbnwC8qQDJugfnLgBDlABELgAARAeHmYA3RQCWZgNH4wDvXgDX7AA9iigDtQlWIgBm/wBmPgBoBQ
+CKNUDaegCoXzAV7wB6jgClnwgShZisaBA2BQBmUwAS4gBFVgCrhgMb+wCXzAB2FQBEmwBJRlAC1Q
+DHBQAHVwC6mQAibAB7MQDfWgDregBDugA9CZBIYgBlxAmZbJBW/gBsb+MA7D4Aq9MAlPYAM2IASE
+IAtZgGhjEQDyooJkQAY3wDM/Bgmy6Qu6MAuSkAeV0AZQYAa4qAEecAs3UwzQUAc8cAahUA6K6Q2X
+cAZG4ARAkBXTsQXYWZlcgJ23MA7EkAq3sAmOuQHa9wuMEHo5MQCpMhhMoAT+BQFFUAeNsAeaMJuz
+wAdpkAZosQQ9QAQ5oAK2AAuV4A2qQARL4AjQAA/xsJiV4AddQAZq8RpfoAVcEBtvUKFvoArVQAyT
+0AudYAPcZQSY4AtZIKIyYRN/AQFosQM5QAFCkAd7gAZkwAaN0AhpYAT1owFAWgQ8kAJhcA2wcAvY
+UAdp0AefwA3qAA/+6BMLrbAJaWADEYAcF/IFnvkG1AkImTAMz1AIquAHJiBOduAKxzAFRuJyE6Bx
+ODAUC+QHaGAEG5cDPjCqNnACYDAIjgAJYOAAcMAOsHAN2BAHg9AFkTANzdAMwVB4jfAJnkAGqfWQ
+YNAFj5AJhTCZhwALttAMmZAJe3AteYALroALKucfAGIWNpAESUAEYNAHfeAEN6CKZkAEMZcDSuCG
+e7AJo5ADsIAO8yoNZrAJZCAJn3AKmzAJqHAJfoAKs1AJnNAL0aAMyrAK6tcHlKkKsKChp5CBnFcJ
+tFAJmsAARkUAEcABN/ADRrAEM9qeevAInUAHN2AElfGqepAGrYD+CnnQDddwDPMwDZUgC5XAB8fS
+BnxQDLQgDNkQDcZADKAwCqhwC70gCZtAHZnpmamQCoLwAzJgBGXQBHJwB+gpZScinjcABExgBmTg
+BGYgi5+QBkPhBGBAB59QCT8oCsIwD+CADvMADXKbDLXYMJOwC8BwCnrwCaxQCZUwCZ/wCZ0QCW9a
+mYKgCpbKCm5wRdCJBHtgBTdBigawsTYwaC0JBEtAB02QBnewm0kwBGTAB43QCcIADcQgDu9wDvGQ
+DtPgDOaQDLMQCn5AtKsACqlgCZwwC4OQfraADLuQCzY1HW4gCG5QCKfgBjswUTsQBHawrdwqIBhg
+A0xHGUkQBoH+0ANbewOUES2DgAe0wA3QsAzqcA7fsA7fwDbawAzLkAzE0AujYAhhgAnQwA2wYw7a
+IAzbYA7UwAqbsApu4AbZKQiT0AZDQAU0YARUgAWm+VoC0gEciwMtSQR0EAlBRgRUgSxp4Aif4Lra
+EA7pIA7moA7WQAq9IA7JkAyhUAZY1gI9xQrWsA7vsA7lYAvRcA7p2wm2oFZg8r9BIARo0GRlEARg
+KnoCEFsoMASp5QQ8kAaSgIae2wV04gnMQA3IoA3pUA7bIA7n4AyhgAzcIA7TcApmMAIpEAer8Amc
+4A3xcA7v0AyX8DPl4A3S8AzHuwb14QMdoARHEANGcAf01ib+o6ctDUoGSrCyPRAG/keYS9AGp6AN
+2oAM20AO5GAOjCKH4UAO51AOtSAFBOABoKAL0RAN2WALnGAM3SAO2uAN0xAM0nAOlfoFK9ADMcAB
+aEADM8BIC0wiSGUcO+AW7Wm2deBgRaAGUeADjUAN6ZDM5IDFyMAKn6ALwmALoCDGJtADlaAM1KC6
+47AMG2oL6LAMriAMgcAJ1WANbhACGvBuS8AGMTAEVnABQ7wUnUG5QEAGTGADUbCKejCMajAIYLAE
+uuDB6SDJ5LANyuALwKAMxPALvHALxuAKzCAO5PAO6BMP8yDH0TAMjdMHgaAHqICqhnAFGzAHRjAD
+zZjL9Qb+LBpgAknABEDgBXWgfoOgVXKQB31ABH6QDNog0ZJcDuFg0HepDM7QDesAw/DwDu9g0fMQ
+DxatDs7QC46QCpOwBHpQBihgAx0gBHcwA1BgBRSFNQKy0jvAA0UgB5LwCJEwCaIQCj6HCTfbCr7A
+DNZgDuYADbrQC6AQCq2AC6twCrJQw0Vt0UjtDdbADfAwD9ywCp1QBnUQCSI9KGWQBTQQdldrJE4R
+ASVgA0SgBGVAi/2LC7jwC9BwhJ8sOtGADuzQDMAgDc2gDJ3gB2bgBdZbDNugDuQwDcqADMCADNNQ
+pNZwCopwBpgQCntsLXvwAzNQA38M1rHFA0CQA3HwB2X+KQu4AAzJAA3Z4MjaML/o0A70wA7fAN60
+UETAcAvRUA4U/Q7qoA3ToA3WoA3lQA7W0AkyigfNEAkzIANcbQczYAU0UNkZiwAjMEhFgAZykDCe
+IAu+kAzMEA07XQ7nsA7xIA/yYA/2IA/tUAywAAuowAvNcA6DSqhxLA6M4k+fsLJ38ArWwAZjMwR+
+UANBhdJ4RQAQgAAocFV0ZQeWUAqhvQzLQA2OLMnn4A7x0A4X3g5I3g23AAyoQAzKMAxFKwzEMA3M
+sAu7EAmBcJuY8A2xIANT9AdZoAPz5j8CsRMIgAAmwLVQ0AQ6nuALzuDT0N5fHOETbg9I3g7u8A3d
+QC7+jnADKWAGfJAKz2CPiDoIqLAJD21+bFAHi4ByrUXm/yMgHMu1ZaAIO54Ls3kMyeAM0TAN2xDf
+6cAORErhFI7n4BAMnOAHhBCxwyAMlJAGDPYImuAIqhAKskAKm+AJR2AEUAbpA1FeGys/V+CDnsDj
+vnAMyADn3BAO5ZDM6aAO7UDqd94No2AM0fQMzUwGT0AHxaAMpHAJfOMKsUALVhBeMj5GDpDOTUAG
+B64JmrDXuOALyU4Ni1IO8T0O6iDhpZ7kh2AMrc4MqxAJVQAGxSANtZAMzSALP4AChJAF4fUxvl7m
+GmsCCFx3kKAJpkDd8s7g713v44DvRH7n7YAOxgD+Ds/wDLagTWAAC6IcDdAQClYgA2FABTVAA+dO
+5qO3tVXgkpCQ66Vw7Jsut9mQDdxgDuKA7+rgDkrvDuhwDk0Pxp9AB65ADQUNu1iABovABjXfaxF/
+EAGQABqgA0BQBWiQB48w3bPJ4HILDaK80x8/vpmMDuhQDtbgDL/gBzRs787gC7PgCa1gCoxwaF3P
+FA5QAjqAwFdgB41gCbbuC7+g6ScsDaPd3tqQxeIAwuWgDcmAC3xwCb3QwYzCDLqAC60Q+AA++ADw
+9RqwA0YABXVn6ZzA4/HuC0Avt7gtOsRQDNaQDbRvCmhbC85ADdCADLrw91kAz6i/EHnVAYdPBYn+
+z0WaQAqykAsar/bQkAz0qQu/4AzIIIdsELahsAqhAAqeAAl3EAQ3n/y/ToI2gARXNQcHTgmkUAql
+oOALjgucQAu0j+zIYAqNwAkAsQgSJTZHghw5YuRCAAANHT6EGFHiRIoVLV7E+DBAAg8/mFApI4dP
+pE2tZOHC5QtXq5S6fB1rdaeSLFKMkNQwEqTGwow9ff4ECjRAAQYbbBy5UsaOIkiaPIkqVUqWrFKm
+Sn3aREkRHjZVrlyp0WAAw6BlzZ4VWmBBhxtAnpxRYyfPIEh1NWmixOjMmSty8GChIqMBWbSFDR+W
+SMAABBM8mDipQiaNnD2V7dhhQ+YIDhBiCSNABh26cIAABh5k+KBjSBIjSowMkZFhQYHPom3fPsuQ
+9O7auH3/Bh5c+HDixY0fR55c+XLmzZ0/hx5d+nTq1R0GBAA7
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/inline.png
+MIME-Version: 1.0
+Content-Type: image/png
+Content-Transfer-Encoding: base64
+
+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
+cmeb7jwaAAAAAElFTkSuQmCC
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/script.js
+MIME-Version: 1.0
+Content-Type: application/javascript
+Content-Transfer-Encoding: base64
+
+ZG9jdW1lbnQud3JpdGUoIlRoZSBzdG9yeSBzbyBmYXI6IEluIHRoZSBiZWdpbm5pbmcgdGhlIFVu
+aXZlcnNlIHdhcyBjcmVhdGVkLiBUaGlzIGhhcyBtYWRlIGEgbG90IG9mIHBlb3BsZSB2ZXJ5IGFu
+Z3J5IGFuZCBoYXMgYmVlbiB3aWRlbHkgcmVnYXJkZWQgYXMgYSBiYWQgbW92ZS4gLSBEb3VnbGFz
+IEFkYW1zPGJyPiIpCg==
+
+-----=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef--
diff --git a/tests/integration/data/downloads/mhtml/complex/div-image.png b/tests/integration/data/downloads/mhtml/complex/div-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..c65a1cf65c69b45f59eddf6f5136decde84622c5
GIT binary patch
literal 4633
zcmZ`-Wmps5|J{%njUY;g(lv18Xawmlfk}v@0;7=z0Ug~iM+zgPq()4bqO_Exv?4X6
z(@{UZFaIz8&wW0h^W1aKIiLIPKF>uM8E8^duuuR10BUV5b(0%Z`L95vH~oW~_u>r@
zyQu1`0s!?Xlot*pH+wEeEfakJAeavTh>QUM2sc#Z1_0nM4glco0RU(&0B{eU*KVwE
zb3pn`S5qBu{og9;D9^ZI$l+R6zBh`f{|Z<J^m4u-$^5kSHOQ7Isi+tL!G;fSrqHcu
ztE-v?%}%01{LClwdzC{9eRm+csX0J;4sBvyE&&p=RD&jy{Yf1UBn3NXm1)&Ua~_7$
zSt1iNJDi9?&q_^ACa=g^m%9tAHM5Jxet2-F(w>_<lQ=z<^{`V$=G2=b<f`v5{m&wb
z*crOie4;blhP#}@EuCHrFXArc*Foqz_vnAxc@7`8Hc==02$8@_GlguecdYR;eIMC1
zg`#}e9OUD3)neGt{!p44wLWM|ZCJ##OQQiy>-<|RSJAStXx0F)4EbEAs$erHO8N*@
zOI};)=deNlhyjp`>1ty8o&9>7XLhA1R!?*3UUC)tIWF~j*iHoaZ_dye5xztd<y&In
zP7|3*U&#!rd{C+m0)muUdXjQgQcCWWq2D5<I~+0!;CZ>5MR#(O6Tf-vV`OyanqHWO
z584p}pPfrgC%W!fux$ZJeww(0hE&|4YVMAIa)y6cNm&+7Fs0?{8_F647HZ47dyCk=
z!QMYeqcJ>{nZ(5IUqguEJ2_gXji;7`1+w2oIS0|1B&R_n1^UxND_|u&x&{uVx7Amq
zv5Q+PewtK3px_a^2Q8!W6;4Ox%TlwL26QCq1KqpiorA=XW?(I{uCdh&^#{~ne;U)x
ziCTHGFED@scoS)cH(X+QcMUA2OTn7^*_b5PlknnxiiNG-J;LpGq_<iE)r1G=MUa);
z#Ouv&EFk@_dxWu$@EAVf(Z847HnY;UMnn`X#2gs*L$@LLKPo#?lj&an(25#?@wDi}
zMG8pw9+SzmL@2Xs+@Op6+IXxD5v^fQd6Q>Ue12=lEm5!_dTP@X`~!|Iwyxi&XIR+j
zUD;ngJRdvm*AHhXR;~?N`>5@8l*c=s=-7Q9#2udX6c)UNI7jHCBL7R6dq*4nq%?%|
z>m}RF7l8A!Y=D=rfymqVIHP){Oh^8{wt3IH=9a#z_$om$LF8TX+ot>09o-0;H)9+E
zb3O5KKz~WB>l$OFmX@~4uc>TBtu}*G0@?JwYI%qaqEIe|xuP3!q&FK?Wl`sRIV8iE
zRqufsPfD7>=xaEwwmy7%8NYP#^L_CkGq<W>wH6cGx+Q05<57tzUlH79*@11nDo)wg
z{sfqJ<@vrh;?bvnAn^{i-{YuV`?25n7~f)}x9uy<6C8D`>Q5ENTr;aI?1qwB<|T_c
z(97tRyZ+k-UD^;fB0=2Ymy_Rh`V)a&sD_}BxyP%rv@BPNQAkZW_2kQUGlfghzG@*K
zWY30ycfplw-!~y_$^m(^E6q)kE$|(U+f=#Y+{D%SCEoAH9b_}^5-k))G4F(Yyh%#?
zjCp^pg^G+8t<g;zPVq0aqtJi<%%O{{pd0Th3r?oxrbjG4k(S4`K-!7`g6bw|L^yl@
zw&BIcFG^8-V_`~e$8REFAJNU2OB=_-81Ed_;>vZuy6JLesDT|>aYssF;5yl*PPo%Z
zn(kz6UQOBxBSP+VaY;yr(v7fZT#=6`9z(X16=z%A_Ecbw=VBNld#UJ#%`|<|^*i>k
zZ+Q6exTLj>ja*ne0;9s3yplN0+iW4BK*AeatU3hCzn6?6UndK#7y2*7V=g;anxBpf
z!|BT?`_slBM@xLf8O|(!rfOZg73;fi9+3&QwR~I<SlzrIlxG=n%xW7Ew%eyD#&-|6
zX>XkN$4KSJOokR_?btp}&8GXr(J*;Yg?FAP_I_a1ns*LJ{~2bIK{+4Vd^e8u`hfa*
zZ5yR%ON^3f5^DiROM;DOTT~LOj9!1eU!%JIXAeq0=QDLR3n59wjrUIcd<}W<o2&k%
zpIK<5(-$1HAl0K8FH_dlex9w_b9k1WG+X)kJGNos$r#dFn714f$xNP%=6RJ~=~Jr-
ze-x|a%uxJFL15zYpFFmqhpy=OTfl~`7mbO1b72==A!A-(L8Aw+-}n83xXjQ`{^CqA
z<GQ-}?N7&~aVf;edcGNPsXTeIr$a{lIfLM6$0Az|KgLn(bdQaz6vn@BOD?=x!hD1B
zqDm<?+Y(y*jdPA2k6kfa({5OZPN({E!KNCgn`n_S^+!6GKC$~5TNo~zR>`#-i_O{D
z;ZWd^(a<2dbMIdL^L<{XxG!TgF7xCT?N8qZg|hF(IuKD{TFmfDUL?^`RQQ)qO<uzq
z!QBEiI&MKYMU`)K&Q25-BR}X5di~ZTjl}y#?B<8CZ&K(|Pz(dB&t2-nFPp!k!sPrH
zRtB|ljEz5bpc}$$+&XBusM@sKsp;(frAnUtD(z{lvM6f~%}*#(>W1`+MyCNO*s`Es
zfUd5xL&|^8TnL0NL8p-5*B9py@N$0$!^kX_&hz>S(L8Baq6ZO12T<uIWs(5`8h9Nz
z8Mc06B55o)A7xS#FR&%fbC=D?J}kMtO+gpD!f*e$HxVp_m}p`FATM2g3r3I8j~HUd
zr;%p$#?~Yze4;U>FJFUD@f-hsS|n0pv00;D5%CQxjxXujJ0;J@))Y1o?b5EEITGqA
z?0B6IW`z<j2vRkwciBkD=ES&eMNW>XFI~CxiXl96e%&awHm7uT8>Kv}M$cf)1{h=>
zU~?#UagwtGv>_HCWBY^%@I4#)d#HB=0YLa|p$ShXcjjty-4eBW&rK^#P2T}DA2Er2
z(skd1HL%1&6rJ4e`?%89TA6b_PPZ#Y5Gf7{yOd(@00o4VJcu6F;m90XC2a7U${*#o
z!`tMnUe13k;GMkZ$OP3N0@8GbWG>Wgf5l{IrnCS3jCWN7i?GU7_Ny(FP%dpCf36?%
z@P95)0vbrFUw5vHquj^SWvKFxr|W)A9ZR(?JRte`>TsYU&#vddDPiVh)N#hbhyHux
z@rK3&Vi0#isbQ}ub02~?H3yYt)~`1vzZznPG$zpQ6rZAZ(c7WkljzVjVOn|^oE_&i
z9aQ&~8N(>G7ieL{{BKYx&m`xk&+k0ybfGB-Y@?*md3BA4zo@Q0yXwVMBhH`xwASPs
z{#xbFXr1@{FgO3PgZTZL*0i90n5`=rTvnk~4cwO{Kw>Tz-Oi!$H08B*D{0LYC?Iey
z23nJx4V;Qovo)y>@uQX#Dm(OT%wP$S9yQQ^EaR1)VWB-iB{_P%g#8E|DO+vbJKGoS
zxI5B4$iP=UR<X^&)K=@#3V53etv%31@NffG#pmAsc=^vLGPV5&dkk-PUzw}t&u^@G
z+!u2rw$43SD7O>?y{PeN{j+?<Z>-5>tFk7)ty<}qoTNZ4G960mD&SnC$=Z&bgb$@}
z5I&~6IAFb+!}l%1m{`PGoR*uoe_)l2mh-`b6~InH9g}VYBmY5fhkD9i)=)T-rRTfO
zh4AzP$RXYAL?H+Ik&2hVx4%e@d90C(UDbA4_I-t5&istk@|VuuIvQc;c3ejUh-}*E
za_RfG`3ia?hu7+V_E<ONz)}zEmh`6DabKt;>E{psG|`J}j<9J>q;oO-Wv$TFdSX@0
zh{wFwq@d8Gtm$xPRt`JK$~@^cWanKBqS_o$(;ygSBO69sK?|SFF_Fu{hR-m0>Vty0
zC-e!PJeNN)BC{p&grfK0+LKL1?{ZZN(O+%jHPd!OwbS8-nwExmAUiAnM837B+TG7I
z0eozRWI`PJO0W|u%%>Ohjlk}zhjgno^(1<)hYDN6gR}LbBPDuGUmCQMF(&Y^?{qIJ
zJR3IR^w){gn`VfwXT_wzd`VUt%T9@96p6mgtO!b1l}K$GJ%r?N{9;c}(G*!?J*a;H
zYU(wE>%Fp~==2-$2vXdk)cY)Z6KWCS`=c1<WL~lwF&ECyO+L!L@;NAL5>MiLb|tg(
zKv^SLVbT0ptdjznmY?hzeP~JpxU*0A(+#uy7j4W-zOT!qS9#9Pk*+3gTlG#pgH!QH
z!y=-BMbH#yyz&m4I-g|Mg(LKkL)s{B1MA~X>t8b%_H=D`=Sq1!w|gcF{%UW2*6Dtk
zWS8gH)p&8%y9I-#4tkuvEDLbs99tv(o=uw9X=^4D4R0Hx)ET1$s|gEe1Yhb=-0${g
zF&Yc+!ks&rFnb*f#YnWOQ+QXny)Jjk1w^(N9a>w(UCgwxdypu9XgRBkyd_3^^UlGC
zo{GN`=J!$h@~i)zO{T|f!tn^as~GWSjM`ZQm#%;-YO~{phf5#Li35L>L@b&O*LWgb
zyJ+zui>|(9eojB|ka%J&mZ5QzxaV(t(}aAQcyUf)*Gt8Gvz;GV!e>{rFa;Jr)XeUi
zRmj(H+RMXbHKGW-d0k=wG5d0jfz%}-(1hsmpkOpuS>sc&bfqn03cXxwPC+@R_GYNI
z14qimHZ+tFX&6;;h&}(nwD^wiuL8kudt9+>0l7{O{fsMUK+y0~-=kRHu*lZl%Td+<
z3w$xRN~)@+FUQehTPVw0D6uU!*Bhw_8jx8Yl}hqbY(@M{j9PG-=<#MIlrubk%sH=I
zxJ;W;*_*u<556c`T-#0-jJuKqF-1=<#!oKlT%+prt&Z1a>RgN`waEWIf1((1u0Y>_
zme`sIqdW#Hnz&qVZX2wB%EFbaefIM<9rD>}bsE~+4wZgS$PwIztPdo${Il34&bJX8
zzVn8qOK9+24+`!!6!rVUr^qe6Zr&eK*zR_`*Vg(P%4Wh@XC-@r?)Qddm7(VOy$VGG
z#rheBuggJwL&M7muZ2OorB8g^Ncp?J-_VLp*s<4*#H{9EtBz{G1xdYhp(__iSs-xs
zsFNGc44r=35kn@uq@u0r+2zGgkUc}l9Yi4rd^O73R$H^iox;+rygLOAz6{i`pxcX1
zmeF+2!;ct_l&*OO@?fgy>ZVBQEer3#=E44c7F5*KNhM?v>0|zoU62wEv0gY0$jtRs
zxtz?@Vxrdn8s;svh^`WM&ZaGtb{^r~ZM5ShTw%ZAlkEeWcvFivq22$i?yR|(rWR@#
zhts^Ugmp0{2nSV}?k9M5vs>ANWJl3YvV~<Q%Y&_1SJ8pl=}po(Q(Ff)oLw8PNs2TX
z2{E<3ok<IGN!j@c>kW)Scfpzjh{=gfF1aQOYg{id=)AhOw`%n~vE7Ue%cw*x)=!_e
zV;LkR;76H!BE%u*cG#>_BUt*!sU`ad(!E+c?4c<}J^-hpKv8;3t>=0=;%zDRO)5fl
z;5!^+2siIs#)l#dUw`e0uR0*%EkK-alglcE53FsOLlYWF?3CQ)IKf%qMLElJp42JF
zb?pd<8AjgXK}--wU%pu{PwPWFqaB7nSmKtEOgAvq?umdw9ODaT5KC9?(B<$H*@vTD
z1LwbjVUki?%`>4xw+(Lz^Ua;kQA$~tz=f(^69umBurVu}zOl4mxkW3?AH^vJrB-%p
zsC_|rd;aJ7Hgd|vceSoZnQwVc1#j6yy1#Kh-~83B>9c)ORQa%M5E-uRgJ5cCKypu_
zUuPc>`g<T4+{aM(j+c{bC{?+R7*M^Cu*f8}t5)H`Wny6*#-dQKzOpUWT^sq#ynt(o
zM7M$DT%J*iB$@=-?-iXI>svJVN;|lD<fQ;tM|sV?_(<-|&ghZt1|?d20LdU<y6`D^
z!P7F|BAa?4J3V}3^HfDV`{wHLN70>6Av7Kt8^OQGnUbu$)OGwdapY)E()znhH29DK
zo<d>6-A4nhxBSCCth`L@C~Jra>eagpT%VhwRQv1-yWm6CYh8ThS`(VkI1Kf<!ih}P
zp1O6x$t7(B+eN>pYDCQ3pYa;I9Xo}oAbhPX3jNDjrM(+=Dfl}AFjoSPIS~s?yZHg(
z_0xFb_uRqH3F_$MbOV5g;u2D#5)z^k56vVVLM7y&;^M;M5;y&v4C?rQ3?5$3-JD<j
z|Au($=%pJ2^M4aey`2359ekVsfq{WyZk{iE9Ub6KVqQKjs2v5C8xcTT!$7@O%|7~n
DQKHPS

literal 0
HcmV?d00001

diff --git a/tests/integration/data/downloads/mhtml/complex/extern-css.css b/tests/integration/data/downloads/mhtml/complex/extern-css.css
new file mode 100644
index 000000000..7c4fe14b8
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/complex/extern-css.css
@@ -0,0 +1,4 @@
+@import "external-in-external.css";
+p {
+    font-family: "Monospace";
+}
diff --git a/tests/integration/data/downloads/mhtml/complex/external-in-external.css b/tests/integration/data/downloads/mhtml/complex/external-in-external.css
new file mode 100644
index 000000000..b4b5ef324
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/complex/external-in-external.css
@@ -0,0 +1,3 @@
+img {
+    width: 100%;
+}
diff --git a/tests/integration/data/downloads/mhtml/complex/favicon.ico b/tests/integration/data/downloads/mhtml/complex/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..73e4f62da420680448ec62095065c960be5722bc
GIT binary patch
literal 16958
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
M#SD0vy@0>|7lpqHW&i*H

literal 0
HcmV?d00001

diff --git a/tests/integration/data/downloads/mhtml/complex/image.gif b/tests/integration/data/downloads/mhtml/complex/image.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3acc7b8512c0c14c3df7cc033b015ea95791e54b
GIT binary patch
literal 6477
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
P=l_-a>W&)>0TKTPBc--X

literal 0
HcmV?d00001

diff --git a/tests/integration/data/downloads/mhtml/complex/inline.png b/tests/integration/data/downloads/mhtml/complex/inline.png
new file mode 100644
index 0000000000000000000000000000000000000000..4414857c5dcea81c78c3b006661d3eea2feb7ea0
GIT binary patch
literal 4635
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
ITEQ&jfA#C{^Z)<=

literal 0
HcmV?d00001

diff --git a/tests/integration/data/downloads/mhtml/complex/requests b/tests/integration/data/downloads/mhtml/complex/requests
new file mode 100644
index 000000000..97dab9e23
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/complex/requests
@@ -0,0 +1,19 @@
+background.png
+background.png
+base.css
+base.css
+complex.html
+# There are no divs, so this image is only loaded when saving as mhtml
+div-image.png
+extern-css.css
+extern-css.css
+external-in-external.css
+external-in-external.css
+favicon.ico
+favicon.ico
+image.gif
+image.gif
+inline.png
+inline.png
+script.js
+script.js
diff --git a/tests/integration/data/downloads/mhtml/complex/script.js b/tests/integration/data/downloads/mhtml/complex/script.js
new file mode 100644
index 000000000..85f18a0f4
--- /dev/null
+++ b/tests/integration/data/downloads/mhtml/complex/script.js
@@ -0,0 +1 @@
+document.write("The story so far: In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move. - Douglas Adams<br>")

From 354259777adf9d8c233a51a67313759d51dbefce Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Thu, 12 Nov 2015 21:07:14 +0100
Subject: [PATCH 076/104] mhtml: don't test with dynamically modified page

---
 .../data/downloads/mhtml/complex/complex.mht  | 38 ++++++++-----------
 .../data/downloads/mhtml/complex/script.js    |  3 +-
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/tests/integration/data/downloads/mhtml/complex/complex.mht b/tests/integration/data/downloads/mhtml/complex/complex.mht
index 1063ff229..5defe64ef 100644
--- a/tests/integration/data/downloads/mhtml/complex/complex.mht
+++ b/tests/integration/data/downloads/mhtml/complex/complex.mht
@@ -1,7 +1,7 @@
-Content-Type: multipart/related; boundary="---=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef"
+Content-Type: multipart/related; boundary="---=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42"
 MIME-Version: 1.0
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/complex.html
 MIME-Version: 1.0
 Content-Type: text/html; charset="UTF-8"
@@ -33,17 +33,14 @@ body=20{
 =20=20=20=20=20=20=20=20<link=20rel=3D"author"=20href=3D"author.html">
 =20=20=20=20=20=20=20=20<!--=20make=20sure=20scripts=20are=20included=20-->
 =20=20=20=20=20=20=20=20<script=20type=3D"text/javascript"=20src=3D"script.=
-js"></script></head><body>The=20story=20so=20far:=20In=20the=20beginning=20=
-the=20Universe=20was=20created.=20This=20has=20made=20a=20lot=20of=20people=
-=20very=20angry=20and=20has=20been=20widely=20regarded=20as=20a=20bad=20mov=
-e.=20-=20Douglas=20Adams<br>
+js"></script>
 =20=20=20=20=20=20=20=20<!--=20...but=20don't=20crash=20on=20scripts=20with=
 out=20src=20-->
 =20=20=20=20=20=20=20=20<script>
 var=20l=20=3D=201+1;
 =20=20=20=20=20=20=20=20</script>
-=20=20=20=20
-=20=20=20=20
+=20=20=20=20</head>
+=20=20=20=20<body>
 =20=20=20=20=20=20=20=20<!--=20include=20a=20normal=20image=20-->
 =20=20=20=20=20=20=20=20<img=20src=3D"image.gif">
 =20=20=20=20=20=20=20=20<!--=20make=20sure=20only=20http(s)=20assets=20are=
@@ -59,7 +56,7 @@ requested=20once=20-->
 =20=20=20=20
 
 </body></html>
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/background.png
 MIME-Version: 1.0
 Content-Type: image/png
@@ -146,7 +143,7 @@ YZ94xJLOaok75NKBIQU+U2KZEsvoI8N2NbajeKsqheMOXh7iCiEOa8N4XaTUhuYfFXm7UTEBXBIC
 BuP2n3WVJR33K1qrcikplMLNFeiIFPil1IbQCENK1WvTc7A6dVAI0aChTgpZlUi5mzr/vTj9za0p
 4n8BgjXlKCMEM1EAAAAASUVORK5CYII=
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/base.css
 MIME-Version: 1.0
 Content-Type: text/css; charset=utf-8
@@ -156,7 +153,7 @@ div.fancy=20{
 =20=20=20=20background-color:=20url("div-image.png");
 }
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/div-image.png
 MIME-Version: 1.0
 Content-Type: image/png
@@ -245,7 +242,7 @@ dGUAMjAxNS0xMS0xMlQxMjoxOTowMCswMTowMPsHOmMAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUt
 MTEtMTJUMTI6MTk6MDArMDE6MDCKWoLfAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jn
 m+48GgAAAABJRU5ErkJggg==
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/extern-css.css
 MIME-Version: 1.0
 Content-Type: text/css; charset=utf-8
@@ -256,7 +253,7 @@ p=20{
 =20=20=20=20font-family:=20"Monospace";
 }
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/external-in-external.css
 MIME-Version: 1.0
 Content-Type: text/css; charset=utf-8
@@ -266,7 +263,7 @@ img=20{
 =20=20=20=20width:=20100%;
 }
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/favicon.ico
 MIME-Version: 1.0
 Content-Type: image/x-icon
@@ -571,7 +568,7 @@ AAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/gAAAAAAAAf/AAAAAAAAD/+AAAAAAAAf/4A
 AAAAAAD//wAAAAAAAP//gAAAAAAB///AAAAAAAf///AAAAAAD///+AAAAAAf///8AAAAAH////8A
 AAAA/////8AAAAP/////+AAAH///////AAD///8=
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/image.gif
 MIME-Version: 1.0
 Content-Type: image/gif
@@ -692,7 +689,7 @@ Sn3aREkRHjZVrlyp0WAAw6BlzZ4VWmBBhxtAnpxRYyfPIEh1NWmixOjMmSty8GChIqMBWbSFDR+W
 SMAABBM8mDipQiaNnD2V7dhhQ+YIDhBiCSNABh26cIAABh5k+KBjSBIjSowMkZFhQYHPom3fPsuQ
 9O7auH3/Bh5c+HDixY0fR55c+XLmzZ0/hx5d+nTq1R0GBAA7
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/inline.png
 MIME-Version: 1.0
 Content-Type: image/png
@@ -781,15 +778,12 @@ ZWF0ZQAyMDE1LTExLTEyVDEyOjE5OjAwKzAxOjAw+wc6YwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx
 NS0xMS0xMlQxMjoxOTowMCswMTowMIpagt8AAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v
 cmeb7jwaAAAAAElFTkSuQmCC
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/script.js
 MIME-Version: 1.0
 Content-Type: application/javascript
 Content-Transfer-Encoding: base64
 
-ZG9jdW1lbnQud3JpdGUoIlRoZSBzdG9yeSBzbyBmYXI6IEluIHRoZSBiZWdpbm5pbmcgdGhlIFVu
-aXZlcnNlIHdhcyBjcmVhdGVkLiBUaGlzIGhhcyBtYWRlIGEgbG90IG9mIHBlb3BsZSB2ZXJ5IGFu
-Z3J5IGFuZCBoYXMgYmVlbiB3aWRlbHkgcmVnYXJkZWQgYXMgYSBiYWQgbW92ZS4gLSBEb3VnbGFz
-IEFkYW1zPGJyPiIpCg==
+ZnVuY3Rpb24gbm9vcCgpIHt9Cm5vb3AoKTsK
 
------=_qute-510287e3-01a6-4b99-8ec9-d0f703c87fef--
+-----=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42--
diff --git a/tests/integration/data/downloads/mhtml/complex/script.js b/tests/integration/data/downloads/mhtml/complex/script.js
index 85f18a0f4..15103db67 100644
--- a/tests/integration/data/downloads/mhtml/complex/script.js
+++ b/tests/integration/data/downloads/mhtml/complex/script.js
@@ -1 +1,2 @@
-document.write("The story so far: In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move. - Douglas Adams<br>")
+function noop() {}
+noop();

From 4210d7e15d9d250e831cef7470281de879ecd707 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Thu, 12 Nov 2015 21:58:33 +0100
Subject: [PATCH 077/104] mhtml: use png instead of ico for test

Seems like httpbin sends a different MIME-type on travis than on my
laptop, something 'clear' like image/png should fix this.
---
 .../data/downloads/mhtml/complex/complex.html |   2 +-
 .../data/downloads/mhtml/complex/complex.mht  | 409 ++++--------------
 .../data/downloads/mhtml/complex/favicon.ico  | Bin 16958 -> 0 bytes
 .../data/downloads/mhtml/complex/favicon.png  | Bin 0 -> 4564 bytes
 .../data/downloads/mhtml/complex/requests     |   4 +-
 5 files changed, 99 insertions(+), 316 deletions(-)
 delete mode 100644 tests/integration/data/downloads/mhtml/complex/favicon.ico
 create mode 100644 tests/integration/data/downloads/mhtml/complex/favicon.png

diff --git a/tests/integration/data/downloads/mhtml/complex/complex.html b/tests/integration/data/downloads/mhtml/complex/complex.html
index ef886f66c..9249a9d6b 100644
--- a/tests/integration/data/downloads/mhtml/complex/complex.html
+++ b/tests/integration/data/downloads/mhtml/complex/complex.html
@@ -17,7 +17,7 @@ body {
 @import "actually-it's-css";
         </style>
         <!-- make sure icons are included -->
-        <link rel="icon" href="favicon.ico">
+        <link rel="icon" href="favicon.png">
         <!-- make sure authors are NOT included -->
         <link rel="author" href="author.html">
         <!-- make sure scripts are included -->
diff --git a/tests/integration/data/downloads/mhtml/complex/complex.mht b/tests/integration/data/downloads/mhtml/complex/complex.mht
index 5defe64ef..eba652818 100644
--- a/tests/integration/data/downloads/mhtml/complex/complex.mht
+++ b/tests/integration/data/downloads/mhtml/complex/complex.mht
@@ -1,7 +1,7 @@
-Content-Type: multipart/related; boundary="---=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42"
+Content-Type: multipart/related; boundary="---=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384"
 MIME-Version: 1.0
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/complex.html
 MIME-Version: 1.0
 Content-Type: text/html; charset="UTF-8"
@@ -27,7 +27,7 @@ body=20{
 @import=20"actually-it's-css";
 =20=20=20=20=20=20=20=20</style>
 =20=20=20=20=20=20=20=20<!--=20make=20sure=20icons=20are=20included=20-->
-=20=20=20=20=20=20=20=20<link=20rel=3D"icon"=20href=3D"favicon.ico">
+=20=20=20=20=20=20=20=20<link=20rel=3D"icon"=20href=3D"favicon.png">
 =20=20=20=20=20=20=20=20<!--=20make=20sure=20authors=20are=20NOT=20included=
 =20-->
 =20=20=20=20=20=20=20=20<link=20rel=3D"author"=20href=3D"author.html">
@@ -56,7 +56,7 @@ requested=20once=20-->
 =20=20=20=20
 
 </body></html>
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/background.png
 MIME-Version: 1.0
 Content-Type: image/png
@@ -143,7 +143,7 @@ YZ94xJLOaok75NKBIQU+U2KZEsvoI8N2NbajeKsqheMOXh7iCiEOa8N4XaTUhuYfFXm7UTEBXBIC
 BuP2n3WVJR33K1qrcikplMLNFeiIFPil1IbQCENK1WvTc7A6dVAI0aChTgpZlUi5mzr/vTj9za0p
 4n8BgjXlKCMEM1EAAAAASUVORK5CYII=
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/base.css
 MIME-Version: 1.0
 Content-Type: text/css; charset=utf-8
@@ -153,7 +153,7 @@ div.fancy=20{
 =20=20=20=20background-color:=20url("div-image.png");
 }
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/div-image.png
 MIME-Version: 1.0
 Content-Type: image/png
@@ -242,7 +242,7 @@ dGUAMjAxNS0xMS0xMlQxMjoxOTowMCswMTowMPsHOmMAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUt
 MTEtMTJUMTI6MTk6MDArMDE6MDCKWoLfAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jn
 m+48GgAAAABJRU5ErkJggg==
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/extern-css.css
 MIME-Version: 1.0
 Content-Type: text/css; charset=utf-8
@@ -253,7 +253,7 @@ p=20{
 =20=20=20=20font-family:=20"Monospace";
 }
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/external-in-external.css
 MIME-Version: 1.0
 Content-Type: text/css; charset=utf-8
@@ -263,312 +263,95 @@ img=20{
 =20=20=20=20width:=20100%;
 }
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
-Content-Location: http://localhost:1234/data/downloads/mhtml/complex/favicon.ico
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
+Content-Location: http://localhost:1234/data/downloads/mhtml/complex/favicon.png
 MIME-Version: 1.0
-Content-Type: image/x-icon
+Content-Type: image/png
 Content-Transfer-Encoding: base64
 
-AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAAIEXAACBFwAAAAAA
-AAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDxmEwl7pRFlOyTRLvs
-lUbU6ZZI5+iWSfTol0v755lN/ueYTv/pmlH96ZVG8eN1FL/kdhWn5HYUjeZ3FmfjcQ4S////AP//
-/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
-AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A7JA8N+2WR7TpmEzy5phO/+aYTv/mmE7/5phO/+eaUf/pnlf/66Jc/+ylYf/spWH/66Jc/+me
-V//jeBf/4nUT/+J1E//idRP/4nQT/ON1FM/meBOE5HIUJv///wD///8A////AP///wD///8A////
-AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AOyhTBvpk0O96JZJ9uaYTv/mmU//6J5W/+6pZv/ztHX/9rl8//e9
-gf/4voP/+L6D//i+g//4voP/+L6D//i+g//4voL/8X8Z//B/Gf/vfhj/7XwX/+l6Fv/kdxT/4nUT
-/+J1E//jdhTe5XYTkduAEg7///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A1YAABuZ4FILkgSb055lQ/+uh
-W//wrWz/9rh8//m/hf/5v4X/+b+F//m/hf/5v4X/+b+F//m/hf/5v4X/+b+F//m/hf/5v4X/+b+F
-//WdS//xgBn/8YAZ//GAGf/xgBn/8YAZ/+5+GP/qexb/5XgV/+J2E//idhTw5ngUgtWAAAb///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A53gWauN3FOfjdxP/6osy//a6f//5wIf/+cCH//nAh//5wIf/+cCH//nAh//5wIf/+cCH
-//nAh//5wIf/+cCH//nAh//5wIf/+cCH//nAh//5wIf/97Ju//SSN//yhB7/8oEZ//KBGf/ygRn/
-8oEZ//KBGf/wfxj/6HoV/+N3E//jdxTn53gWav///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A////AP///wDmdRQy5HcU2uN3FP/nehX/74AZ//WcSf/5wYn/+cGJ
-//nBif/5wYn/+cGJ//nBif/5wYn/+cGJ//nBif/5wYn/+cGJ//nBif/5wYn/+cGJ//nBif/5wYn/
-+cGJ//nBif/5wYn/+cGJ//amWv/yghr/8oIa//KCGv/yghr/8oIa//KCGv/vgBn/53oV/+N3FP/k
-dxTa5nUUMv///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDoehda43gU
-9eZ6Ff/ugBj/8oMa//KDGv/1n0z/+cKK//nCiv/5wor/+cKK//nCiv/5wor/+cKK//nCiv/5wor/
-+cKK//nCiv/5wor/+cKK//nCiv/5wor/+cKK//nCiv/5wor/+cKK//nCiv/5wor/85Ax//KDGv/y
-gxr/8oMa//KDGv/ygxr/8oMa//KDGv/ugBj/5noV/+N4FPXoehda////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
-AP///wD///8A////AP///wDnehWI43gU/el9F//yhBr/8oQa//KEGv/yhBr/9qxi//nDjP/5w4z/
-+cOM//nDjP/5w4z/+cOM//nDjP/5w4z/+cOM//nDjP/5w4z/+cOM//nDjP/5w4z/+cOM//nDjP/5
-w4z/+cOM//nDjP/5w4z/+cOM//evaf/yhBr/8oQa//KEGv/yhBr/8oQa//KEGv/yhBr/8oQa//KE
-Gv/pfRf/43gU/ed6FYj///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
-AP///wD///8A////AP///wD///8A////AP///wD///8A////AP+SJAfkehW243kU/+yAGP/yhRr/
-8oUa//KFGv/yhRr/840p//i+hP/5xI7/+cSO//nEjv/5xI7/+cSO//nEjv/5xI7/+cSO//nEjv/5
-xI7/+cSO//nEjv/5xI7/+cSO//nEjv/5xI7/+cSO//nEjv/1wIr/6rWA/+KteP/ssHT/8YUa//KF
-Gv/yhRr/8oUa//KFGv/yhRr/8oUa//KFGv/yhRr/8oUa/+yAGP/jeRT/5HoVtv+SJAf///8A////
-AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP+SJAfjexXS5HsV/++DGf/yhhr/8oYa//KGGv/yhhv/9JpA//jAh//5xZD/+cWQ//nFkP/5
-xZD/+cWQ//nFkP/5xZD/+cWQ//nFkP/5xZD/+cWQ//nFkP/5xZD/+cWQ//nFkP/5xZD/4Kx4/6Nu
-Pf91QBD/bjkK/245Cv9uOQr/bjkK/3E7C/99Qgz/ikoN/5hRD/+xYBL/2ngX//KGGv/yhhr/8oYa
-//KGGv/yhhr/74MZ/+R7Ff/jexXS/5IkB////wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wDkexW25n0V//GGGf/yhxr/8oca//KHGv/0
-mTv/+LyA//nGkv/5xpL/+caS//nGkv/5xpL/+caS/9Ogbf/Wo3D/9sOP//nGkv/5xpL/+caS//nG
-kv/5xpL/+caS//nGkv/5xpL/rHdG/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv9+Qgz/ploR/9l4F//yhxr/8oca//KHGv/xhhn/5n0V/+R7Fbb///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDn
-fhWI5XwV//KHGv/ziBr/84ga//OIGv/1nUH/+caS//nHk//5x5P/+ceT//nHk//5x5P/+ceT//nH
-k/+rd0b/bjkK/3ZBEv+caDf/xJFf/+y6hv/5x5P/+ceT//nHk//5x5P/y5hm/245Cv9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9vOQr/
-nVUQ/+J+GP/ziBr/84ga//KHGv/lfBX/534ViP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wDogBda5XwU/fGHGf/ziRr/84ka//OJGv/zihz/+L6C//nI
-lf/5yJX/+ciV//nIlf/5yJX/+ciV//nIlf/5yJX/q3dH/245Cv9uOQr/bjkK/245Cv9vOgv/ilYm
-/7J/Tv/bqXf/+ciV/5VhMf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9xOwr/q14R//GIGv/ziRr/8YcZ/+V8FP3o
-gBda////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wDmehQy5HwU9e+G
-GP/zihr/84oa//OKGv/zihr/96pa//rJl//6yZf/+smX//rJl//6yZf/+smX//rJl//6yZf/+smX
-/6t4R/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK//bEk/+MWCj/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv+PTQ7/6IMZ//OKGv/vhhj/5HwU9eZ6FDL///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A5X0V2u2FGP/zixv/84sb//OLG//zixv/9JMq//rIlf/6ypn/+sqZ
-//rKmf/6ypn/+sqZ//rKmf/6ypn/+sqZ//rKmf+reEj/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv/2xZX/jFgp/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/35DDP/ffhj/84sb/+2F
-GP/lfRXa////AP///wD///8A////AP///wD///8A////AP///wD///8A54AWaumCF//zjBv/84wb
-//OMG//zjBv/84wb//i1bv/6y5r/+sua//rLmv/6y5r/+sua//rLmv/6y5r/+sua//rLmv/6y5r/
-q3lJ/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/9saV/4xYKf9uOQr/bjkK/245Cv9u
-OQr/cDsM/4dTI/+kckL/vYtb/7qIWP+reUn/iE8a/285Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/245Cv9uOQr/hEcN/+6JGv/zjBv/6YIX/+eAFmr///8A////AP///wD///8A////
-AP///wD///8A1YAABuR+Febxixr/840b//ONG//zjRv/840b//WdO//6zJv/+syc//rMnP/6zJz/
-+syc//rMnP/6zJz/+syc//rMnP/6zJz/+syc/6t5Sv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK//bHl/+MWSn/bjkK/245Cv9vOgv/r31O//TGlv/6zJz/+syc//rMnP/6zJz/+syc//nD
-iv/afRj/kE8O/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+gWBD/840b
-//GLGv/kfhXm1YAABv///wD///8A////AP///wD///8A////AOaBFoLrhhj/844b//OOG//zjhv/
-844b//SXL//5xo//+s2e//rNnv/6zZ7/+s2e//rNnv/6zZ7/+s2e//rNnv/6zZ7/+s2e//rNnv+r
-eUr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv/2yJn/jFkq/245Cv9uOQr/xJRl//rN
-nv/6zZ7/+s2e//rNnv/6zZ7/+s2e//rNnv/4vn7/844b//OOG//DbxX/dT4L/245Cv9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/812Fv/zjhv/64YY/+aBFoL///8A////AP///wD///8A
-////AO2SEg7lgRXv844b//SPG//0jxv/9I8b//SPG//4vHr/+s6g//rOoP/6zqD/+s6g//rOoP/6
-zqD/+s6g//rOoP/6zqD/+s6g//rOoP/6zqD/q3pL/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/9smb/4xZKv9uOQr/ekYX//jMnv/6zqD/+s6g//rOoP/6zqD/+s6g//rOoP/5v4D/9qFA
-//SPG//0jxv/9I8b/+GDGf97QQz/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+MTA7/
-9I8b//OOG//lgRXv7ZISDv///wD///8A////AP///wDmghWR7ooZ//SQG//0kBv/9JAb//SQG//0
-kBv/+Ldv//rPov/6z6L/+s+i//rPov/6z6L/+s+i//rPov/6z6L/+s+i//rPov/6z6L/+s+i/6t6
-TP9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK//bKnf+MWSv/bjkK/4NQIf/6z6L/+s+i
-//rPov/6z6L/+s+i//rLmf/2pkv/9JAb//SQG//0kBv/9JAb//SQG//0kBv/2X8Y/3Q9C/9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/9J6F//0kBv/7ooZ/+aCFZH///8A////AP///wD/
-//8A6IQW2vSRG//0kRv/9JEb//SRG//0kRv/9JEb//ajQv/60KP/9cue/8qcbv+zhFb/nm0//5dl
-N/+ndkj/todZ/8udb//zyZz/+tCj//rQo/+re03/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/245Cv/2y57/jFor/245Cv+DUCH/+tCj//nKl//4unP/965a//anS//0lSX/9JEb//SRG//0kRv/
-9JEb//SRG//0kRv/9JEb//SRG//Ndxb/bzkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+g
-WhD/9JEb//SRG//ohBba////AP///wD///8A5IAUJu2KGP/0khv/9JIb//SSG//0khv/9JIb//SS
-G//1smX/wZRm/3xIGv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/cz8Q/6FwQv/swpb/q3tN
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/9syg/4xaK/9uOQr/g1Ag//i8dv/1nzj/
-9JIb//SSG//0khv/9JIb//SSG//0khv/9JIb//SSG//0khv/9JIb//SSG//0khv/9JIb/5tXEP9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/eUAL//ORG//0khv/7YoY/+SAFCb///8A////AOaF
-FYTykRr/9JMb//STG//0kxv/9JMb//STG//pjBr/hksS/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/eUUW/4xaLP9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK//fNov+MWSn/bjkK/4JHDf/0kxv/9JMb//STG//0kxv/9JMb//STG//0kxv/9JMb//STG//0
-kxv/9JMb//STG//0kxv/9JMb//STG//Ufhf/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv/XgBf/9JMb//KRGv/mhRWE////AP///wDpiBfI9JQc//SUHP/0lBz/9JQc//SUHP/sjhv/h0oN
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv/3zqT/jFMb/245Cv+CRw3/9JQc//SUHP/0
-lBz/9JQc//SUHP/0lBz/9JQc//SUHP/0lBz/9JQc//SUHP/0lBz/9JQc//SUHP/0lBz/8pMc/3c/
-C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/wXEV//SUHP/0lBz/6YgXyP///wDjjg4S7YwY
-+vSVHP/0lRz/9JUc//SVHP/ukRv/i00O/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/98uc/4tOEP9uOQr/gkcN//SVHP/0lRz/9JUc//SVHP/0lRz/9JUc//SVHP/0lRz/9JUc//SV
-HP/0lRz/9JUc//SVHP/0lRz/9JUc//SVHP+eWhD/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/65lE//0lRz/9JUc/+2MGPrjjg4S6YYWZ/OTG//1lhz/9ZYc//WWHP/1lhz/lVQP/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK//S0Z/+LTQ7/bjkK/4NHDf/1lhz/9ZYc//WW
-HP/1lhz/9ZYc//WWHP/1lhz/9ZYc//WWHP/1lhz/9ZYc//WWHP/1lhz/9ZYc//WWHP/1lhz/u24U
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+cWBD/9ZYc//WWHP/zkxv/6YYWZ+2NGIL1lxz/
-9Zcc//WXHP/1lxz/zHoW/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv/xlBz/kVEP/245Cv+DRw3/9Zcc//WXHP/1lxz/9Zcc//WXHP/1lxz/9Zcc//WXHP/1lxz/9Zcc
-//WXHP/1lxz/9Zcc//WXHP/1lxz/9Zcc/8d3Fv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-ilMf//nEhf/4u3D/9qI2/+2NGILukBmX9Zgc//WYHP/1mBz/85cc/4JHDf9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/75Qb//CUG/+yaRP/iUwO//WYHP/1mBz/9Zgc
-//WYHP/1mBz/9Zgc//WYHP/1mBz/9Zgc//WYHP/1mBz/9Zgc//WYHP/1mBz/9Zgc//WYHP/Gdxb/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/4BNH//717D/+9ew//vXsP/0u3vW8JMZrfWZHP/1
-mRz/9Zkc/9aDGP9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9xPA3/r4NY/9y1
-jf/00ar/8Myl/8iedf98SRv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/4RIDf/Pfhf/9Zkc/+6UG//1mRz/9Zkc//WZHP/1mRz/9Zkc//WZHP/1mRz/9Zkc//WZHP/1mRz/
-9Zkc//WZHP/1mRz/9Zkc//WZHP/1mRz/wHMV/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+A
-TR//+9iy//vYsv/72LL/9sSJ6vKUGsT1mhz/9Zoc//WaHP+waRP/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/245Cv9xPQ3/3LaO//vZs//72LD/+9mz//vZs//72bP/9dKs/7GGW/9yPg//bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/5ZWD//hjBn/9Zoc//WaHP/1mhz/
-9Zoc//WaHP/1mhz/9Zoc//WaHP/1mhz/9Zoc//WaHP/1mhz/9Zoc//WaHP/1mhz/9Zoc/7pwFP9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/iFYp//vZs//72bP/+9mz//fIkfTxlxvc9Zsc//Wb
-HP/1mxz/i04O/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/s3Ag//vVq//72bX/+9ew
-//vZtf/72bX/+cWE//i9cP/3r03/57Fv/5pgIv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/cTsK/6tlEv/tlRv/9Zsc//WbHP/1mxz/9Zsc//WbHP/1mxz/9Zsc//WbHP/1
-mxz/9Zsc//WbHP/1mxz/9Zsc//WbHP+rcTD/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/5Zn
-O//72bX/+9m1//vZtf/3zJv78Zkb9PWcHP/1nBz/9Jsc/3A6Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/245Cv9uOQr/hUoN//KaHP/1nB3/96xE//i8a//3rET/961F//WcHP/1nBz/9Zwc//WcHP/1nBz/
-04MX/4ZLDf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/ekIM/8B1Ff/0
-mxz/9Zwc//WcHP/1nBz/9Zwc//WcHP/1nBz/9Zwc//WcHP/1nBz/9Zwc//WcHP/3tVn/g1Ek/245
-Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv+kd0z/+9u3//vbt//727f/99Kn//WbHfP2nB3/9pwe
-/+ygOv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/7FqE//2nB3/9pwd//acHf/2nB3/
-9pwd//acHf/2nB3/9pwd//acHf/2nB3/9pwd//acHf/0mx3/vnMV/3lBC/9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/iEwO/9WEGP/2nB3/9pwd//acHf/2nB3/9pwd//ac
-Hf/2nB3/9pwd//acHf/2nB7/5sGd/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/s4hf
-//zbuf/827n//Nu5//rWr//2nR3Z+LJQ//zXr//lwZ7/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv/Nfxf/9p0d//adHf/2nR3/9p0d//adHf/2nR3/9p0d//adHf/2nR3/9p0d//adHf/2
-nR3/9p0d//adHf/tlhz/qWUS/3A7Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/m1oQ/+WRG//2nR3/9p0d//adHf/2nR3/9p0d//adHf/2nR3/96Uy/5hqP/9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/86ngf/83Lv//Ny7//zcu//71q37+cN84fzcuv/83bz/
-2LSP/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/6ZQb//aeHf/2nh3/9p4d//aeHf/2
-nh3/9p4d//aeHf/2nh3/9p4d//aeHf/2nh3/9p4d//aeHf/2nh3/9p4d//KbHP/gjhr/lFUP/245
-Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9yPAv/sGoT//CaHP/2nh3/9p4d
-//aeHf/2nh3/9p4d/8F2Fv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/286C//x0K7/
-/N28//zdvP/83bz/+9Sm9Pzbtff83r7//N6+/8ymgf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/ekIM//afHf/2nx3/9p8d//afHf/2nx3/9p8d//afHf/2nx3/9p8d//afHf/2nx3/9p8d//af
-Hf/2nx3/9p8d//afHf+OUQ7/wHYV//WeHf/NgRf/cTsK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv98RAz/xXoW//WfHf/2nx3/6ZUb/5tbEP9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv+HVir//N6+//zevv/83r7//N6+//vToun5wne5+siD//vWqf/I
-on7/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39GDP/2oB3/9qAd//agHf/2oB3/9qAd//ag
-Hf/2oB3/9qAd//agHf/2oB3/9qAd//agHf/2oB3/9qAd//agHf/2oB3/g0kN/245Cv+SVA//9qAd
-/3Y/C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9zPQv/
-f0YM/3E7Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/upJr//zfwP/8
-38D//N/A//zfwP/70p/Z9qAdcfahHf/2pCT/3LF//245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv93QAv/9qEd//ahHf/2oR3/9qEd//ahHf/2oR3/9qEd//ahHf/2oR3/9qEd//ahHf/2oR3/9qEd
-//ahHf/2oR3/9qEd/4NJDf9uOQr/f0YM//ahHf92Pwv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/fkse//favP/84ML//ODC//zgwv/84ML/+cyPuPWhHU/2oh3/9qId/+6i
-Lf9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/+aWG//2oh3/9qId//aiHf/2oh3/9qId
-//aiHf/2oh3/9qId//aiHf/2oh3/9qId//aiHf/2oh3/9qId//aiHf+DSQ3/bjkK/39GDP/2oh3/
-dj8L/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/8ahff/84cT//OHE//zh
-xP/84cT//OHE//nEd37/nRQN96Md+fejHf/3ox3/f0YM/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/245Cv/Nghf/96Md//ejHf/3ox3/96Md//ejHf/3ox3/96Md//ejHf/3ox3/96Md//ejHf/3ox3/
-96Md//ejHf/3ox3/g0kN/245Cv9/Rgz/96Md/3Y/C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/4dWKv/74cT//OLF//zixf/84sX//OLF//zhw///v2oY////APekHbj3pB3/96Qd
-/6ZlEv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/sW0T//ekHf/3pB3/96Qd//ekHf/3pB3/
-96Qd//ekHf/3pB3/96Qd//ekHf/3pB3/96Qd//ekHf/3pB3/96Qd/4NJDf9uOQr/f0YM//ekHf92
-Pwv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/3VBE//bu5v//OPH//zjx//848f//OPH
-//zjx//72q7x////AP///wD4pR1p96Ue//elHv/PhRj/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/39HDf/2pB7/96Ue//elHv/3pR7/96Ue//elHv/3pR7/96Ue//elHv/3pR7/96Ue//elHv/3
-pR7/96Ue//elHv+DSg3/bjkK/39GDP/3pR7/dj8L/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv99RQz/qmgT/286Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/3xKHf/hw6T//OTJ//zkyf/85Mn//OTJ//zkyf/85Mn/+9Odu////wD///8A9qocG/emHv/3ph7/
-8qId/3dAC/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/yoMX//emHv/3ph7/96Ye//emHv/3
-ph7/96Ye//emHv/3ph7/96Ye//emHv/3ph7/96Ye//emHv/3ph7/g0oN/245Cv9/Rgz/96Ye/3Y/
-C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/f0YM//emHv/glBv/mFsQ/245Cv9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/cDsM/5xwSP/s0bT//eXL//3ly//95cv//eXL//3ly//95cv/
-/eXL//vRk0L///8A////AP///wD4qB7M96ce//enHv+xbhT/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/3tEDP/tnx3/96ce//enHv/3px7/96ce//enHv/3px7/96ce//enHv/3px7/96ce//en
-Hv/3px7/96ce/4NKDf9uOQr/f0YM//enHv92Pwv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/39GDP/3px7/96ce//enHv/snhz/0YkZ/7dzFf+cXhH/lVgQ/55fEf+taxP/zoYY/++iIP/71Zz/
-/ebM//3mzP/95sz//ebM//3mzP/95sz//ebM//3br/T///8A////AP///wD///8A9qgfdfeoHv/4
-sjr/7KQo/3M9C/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/llkQ//OlHf/3qB7/96ge//eo
-Hv/3qB7/96ge//eoHv/3qB7/96ge//eoHv/3qB7/96ge//eoHv+CSg3/bjkK/39GDP/3qB7/dkAL
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/Rgz/96ge//eoHv/3qB7/96ge//eoHv/3qB7/
-96ge//eoHv/3qB7/96ge//eoHv/3qB7/96ge//nAYv/95sv//efO//3nzv/9587//efO//3nzv/7
-zYit////AP///wD///8A////AP/Ykxr947/8/ejQ//3lyP+rdjf/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/245Cv+NUg//7KAc//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3qR7/96ke
-//epHv/Sixn/bzkK/245Cv9/Rwz/96ke/3ZAC/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-f0cM//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3qR7/96ke//epHv/3
-qR7/+cBg//3o0P/96ND//ejQ//3o0P/95sn+/9WKGP///wD///8A////AP///wD///8A+9unvf3p
-0v/96dL/9N7F/4BPI/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/3pDDP+3dBX/76Md
-//iqHv/4qh7/+Koe//iqHv/4qh7/+Koe//iqHv/PiBj/cz0L/245Cv9uOQr/f0cM//iqHv92QAv/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39HDP/4qh7/+Koe//iqHv/4qh7/+Koe//iqHv/4
-qh7/+Koe//iqHv/4qh7/+Koe//iqHv/4qh7/+Koe//itJv/96M7//enS//3p0v/96dL//Neesv//
-/wD///8A////AP///wD///8A////AP/grRn958z9/erU//3q1P/exKj/cTwO/245Cv9uOQr/bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/3U/C/+YXBD/q2sT/716Ff/PiRj/25Ma/7V0FP+HTg7/
-bjkK/245Cv9uOQr/bjkK/39HDP/4qx7/dkAL/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/
-Rwz/+Kse//irHv/4qx7/+Kse//irHv/4qx7/+Kse//irHv/4qx7/+Kse//irHv/4qx7/+Kse//ir
-Hv/4qx7/+sdu//3q1P/96tT//OTC+//bkg7///8A////AP///wD///8A////AP///wD///8A/Nyo
-p/3r1f/969X//evV/72bef9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/Rwz/+Kwe/3ZAC/9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/f0cM//isHv/4rB7/+Kwe//isHv/4rB7/+Kwe//is
-Hv/4rB7/+Kwe//isHv/4rB7/+Kwe//isHv/4rB7/+Kwe//isHv/6wFf//ebF//vVk5D///8A////
-AP///wD///8A////AP///wD///8A////AP/b2wf84rv1/ezX//3s1//869b/pH1Y/245Cv9uOQr/
-bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/f0cM//itHv92QAv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39H
-DP/4rR7/+K0e//itHv/4rR7/+K0e//itHv/4rR7/+K0e//itHv/4rR7/+K0e//itHv/4rR7/+K0e
-//itHv/4rR7/+K0e//q/U9T///8B////AP///wD///8A////AP///wD///8A////AP///wD///8A
-+9WKSP3r0/797dn//e3Z//3t2f+/n4D/cDwN/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9u
-OQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39HDf/4rh//dkAL/245
-Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/Rw3/+K4f//iuH//4rh//+K4f//iuH//4rh//+K4f
-//iuH//4rh//+K4f//iuH//4rh//+K4f//iuH//4rh//+K8j//m6RPH4sRwk////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wD93qmS/u7b//7u2//+7tv//u7b/9rBp/96
-SBv/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/245Cv9/Rw3/+K8f/3ZAC/9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/f0cN
-//ivH//4rx//+K8f//ivH//4rx//+K8f//ivH//4rx//+K8f//ivH//4rx//+K8f//ivH//4rx//
-+K8f//nBU/372JuE////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP7juMr+793//u/d//7v3f/+793/7drE/6J7Vv9yPhD/bjkK/245Cv9uOQr/bjkK/245
-Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/gUoN//iwH/92QAv/bjkK
-/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/39HDf/4sB//+LAf//iwH//4sB//+LAf//iwH//4sB//
-+LAf//iwH//4sB//+LAf//iwH//4sB//+LAf//iwH//5vkl9////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD//78E/eS24f7w3v/+8N7//vDe//7w
-3v/+8N7/8+LO/72dfv+DVCn/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9uOQr/bjkK
-/245Cv9uOQr/cz4L/9eUGv/5sR//w4IX/4hPDv9uOQr/bjkK/245Cv9uOQr/bjkK/245Cv9/SA3/
-+bEf//mxH//5sR//+bEf//mxH//5sR//+bEf//mxH//5sR//+bEf//mxH//5sR//+bEf//mxH//4
-sh+b////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP/EnQ395Lvv/vDd//3fqv/+8eD//vDb//vRfv/83aP//fDd/9jBqP+tiWf/nXZQ
-/49jO/+AUCX/cj0N/245Cv9uOQr/bjkK/3M+C/+KUg7/uHkV/+qlHf/5sh//+bIf//myH//5sh//
-2ZYa/59kEf9xPAr/bjkK/245Cv9uOQr/f0gN//myH//5sh//+bIf//myH//5sh//+bIf//myH//5
-sh//+bIf//myH//5sh//+bIf//myH//6sh+8/5kzBf///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A/+SuE/3lu+L6v0P//eO1
-//7y4v/968z//ejD//7y4v/95Lf//eGt//7y4v/+8uL//vLi//7u1v/wuk7/4J0b/+ikHP/5wEn/
-+bMf//mzH//5sx//+bMf//mzH//5sx//+bMf//mzH//5sx//7agd/7d5Ff9/SA3/bjkK/39IDf/5
-sx//+bMf//mzH//5sx//+bMf//mzH//5sx//+bMf//mzH//5sx//+bMf//mzH//4sx+b/8wzBf//
-/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
-AP///wD///8A////AP///wD///8D/N2dq/rCSv3+79j//eCp//m5MP/825r//vPk//7z5P/+8+T/
-/vPk//7z5P/+8+T//vPk//3ry//82I///efA//3ktv/70Xn/+r49//m0H//5tB//+bQf//m0H//5
-tB//+bQf//m0H//5tB//+LMf/8+PGf+laRL/+bQf//m0H//5tB//+bQf//m0H//5tB//+bQf//m0
-H//5tB//+bQf//m0H/z4tB5t////AP///wD///8A////AP///wD///8A////AP///wD///8A////
-AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD72JF2
-/eKt+v3tzv/82Y///eSz//705f/+9OX//vTl//705f/+9OX//vTl//705f/+9OX//vTl//705f/+
-9OT//NiN//vSev/6yFr/+bUf//m1H//5tR//+bUf//m1H//5tR//+bUf//m1H//5tR//+bUf//m1
-H//5tR//+bUf//m1H//5tR//+bUf//m1H//5tR//+bUf//m1H+74tB5E////AP///wD///8A////
-AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////APi4HCT81X7e/vXn//715//+9ef//vXn//715//+
-9ef//vXn//715//+9ef//vXn//715//+9ef//vPg//m6LP/5th//+bYf//m2H//6xEr/+81q//zY
-jP/84KX/+bYf//m2H//5th//+bYf//m2H//5th//+bYf//m2H//5th//+bYf//m2H//5th//+bYf
-//m2H8f4uBwk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////A/3ippX98NX7/vbp//726f/+9un//vbp//726f/+9un//vbp//726f/+9un//vbp//7w
-1f/7z27/+boq//m6Kf/5tyD/+9V///726f/+9un//eSv//m3IP/5tyD/+bcg//m3IP/5tyD/+bcg
-//m3IP/5tyD/+bcg//m3IP/5tyD/+bcg2Pm3H1L///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A/+qqDPzhqKz+8979/vfr//73
-6//+9+v//vfr//736//+9+v//vfr//736//96sL//NV+//3ou//82Yv//NN4//vBPv/82Yv//evE
-//q7Kv/6uCD/+rgg//q4IP/6uCD/+rgg//q4IP/6uCD/+rgg//q4IP/5uCDm+rcgZ/+/QAT///8A
-////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A/96bF/7hprX+8NT4//jt///47f//+O3///jt///47f//+O3///jt
-///47f//+O3///jt///47f//+Ov//uWx///25//7w0D/+rkg//q5IP/6uSD/+rkg//q5IP/6uSD/
-+rkg//q5Icz7uSF1/7MaCv///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
-APvjoj/+5Ker/uvB6//36P//+e7///nu///57v//+e7///nu///57v//+e7///nu///57v//+e7/
-/NmF//q6IP/6uiD/+rog//q6IPn5uiC4+rsgafa9HBv///8A////AP///wD///8A////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////
-AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD/0XQW/d+Wgf7nrbX+57XO
-/uu/4v7vyvD+89f6/vfo///46///9+X8/vTb9/vFQq/5ux+L+rsgcfm7IE//xCcN////AP///wD/
-//8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
-/wD///8A////AP///wD///8A////AP///wD///8A////AAD///////gAAB//////wAAAA/////8A
-AAAA/////gAAAAB////4AAAAAB////AAAAAAD///4AAAAAAH//+AAAAAAAH//wAAAAAAAP//AAAA
-AAAA//4AAAAAAAB//AAAAAAAAD/4AAAAAAAAH/gAAAAAAAAf8AAAAAAAAA/gAAAAAAAAB+AAAAAA
-AAAHwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADgAAAAAAAAAGAAAAAAAAAAYAAAAAAAAABAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAACAAAAAAAAAAYAAAAAAAAABgAAAAAAAAAHAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPg
-AAAAAAAAB+AAAAAAAAAH8AAAAAAAAA/wAAAAAAAAD/gAAAAAAAAf/AAAAAAAAD/+AAAAAAAAf/4A
-AAAAAAD//wAAAAAAAP//gAAAAAAB///AAAAAAAf///AAAAAAD///+AAAAAAf///8AAAAAH////8A
-AAAA/////8AAAAP/////+AAAH///////AAD///8=
+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
+rkJggg==
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/image.gif
 MIME-Version: 1.0
 Content-Type: image/gif
@@ -689,7 +472,7 @@ Sn3aREkRHjZVrlyp0WAAw6BlzZ4VWmBBhxtAnpxRYyfPIEh1NWmixOjMmSty8GChIqMBWbSFDR+W
 SMAABBM8mDipQiaNnD2V7dhhQ+YIDhBiCSNABh26cIAABh5k+KBjSBIjSowMkZFhQYHPom3fPsuQ
 9O7auH3/Bh5c+HDixY0fR55c+XLmzZ0/hx5d+nTq1R0GBAA7
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/inline.png
 MIME-Version: 1.0
 Content-Type: image/png
@@ -778,7 +561,7 @@ ZWF0ZQAyMDE1LTExLTEyVDEyOjE5OjAwKzAxOjAw+wc6YwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx
 NS0xMS0xMlQxMjoxOTowMCswMTowMIpagt8AAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v
 cmeb7jwaAAAAAElFTkSuQmCC
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384
 Content-Location: http://localhost:1234/data/downloads/mhtml/complex/script.js
 MIME-Version: 1.0
 Content-Type: application/javascript
@@ -786,4 +569,4 @@ Content-Transfer-Encoding: base64
 
 ZnVuY3Rpb24gbm9vcCgpIHt9Cm5vb3AoKTsK
 
------=_qute-e6103319-e76c-4b6a-bcae-c568a6307a42--
+-----=_qute-986aec6d-ef0d-4d36-8a81-0b9c0f826384--
diff --git a/tests/integration/data/downloads/mhtml/complex/favicon.ico b/tests/integration/data/downloads/mhtml/complex/favicon.ico
deleted file mode 100644
index 73e4f62da420680448ec62095065c960be5722bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16958
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
M#SD0vy@0>|7lpqHW&i*H

diff --git a/tests/integration/data/downloads/mhtml/complex/favicon.png b/tests/integration/data/downloads/mhtml/complex/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f609565726af96b5dffe7bbc99297be4db6626a
GIT binary patch
literal 4564
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

literal 0
HcmV?d00001

diff --git a/tests/integration/data/downloads/mhtml/complex/requests b/tests/integration/data/downloads/mhtml/complex/requests
index 97dab9e23..9cc83327f 100644
--- a/tests/integration/data/downloads/mhtml/complex/requests
+++ b/tests/integration/data/downloads/mhtml/complex/requests
@@ -9,8 +9,8 @@ extern-css.css
 extern-css.css
 external-in-external.css
 external-in-external.css
-favicon.ico
-favicon.ico
+favicon.png
+favicon.png
 image.gif
 image.gif
 inline.png

From 0d6d276592befcdebcb43f07532e2ce5d97c654b Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Wed, 18 Nov 2015 19:15:18 +0100
Subject: [PATCH 078/104] mhtml: remove non-existing ftp asset

This could be the cause of failing tests, depending on the OS.
---
 tests/integration/data/downloads/mhtml/complex/complex.html | 2 --
 tests/integration/data/downloads/mhtml/complex/complex.mht  | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/tests/integration/data/downloads/mhtml/complex/complex.html b/tests/integration/data/downloads/mhtml/complex/complex.html
index 9249a9d6b..0a7e4c22c 100644
--- a/tests/integration/data/downloads/mhtml/complex/complex.html
+++ b/tests/integration/data/downloads/mhtml/complex/complex.html
@@ -30,8 +30,6 @@ var l = 1+1;
     <body>
         <!-- include a normal image -->
         <img src="image.gif">
-        <!-- make sure only http(s) assets are loaded -->
-        <img src="ftp://localhost/image.png">
         <!-- make sure inline styles are parsed -->
         <p style="background-image: url('inline.png')">foobar</p>
         <!-- make sure inline.png is only be requested once -->
diff --git a/tests/integration/data/downloads/mhtml/complex/complex.mht b/tests/integration/data/downloads/mhtml/complex/complex.mht
index eba652818..1bce2f10a 100644
--- a/tests/integration/data/downloads/mhtml/complex/complex.mht
+++ b/tests/integration/data/downloads/mhtml/complex/complex.mht
@@ -43,9 +43,6 @@ var=20l=20=3D=201+1;
 =20=20=20=20<body>
 =20=20=20=20=20=20=20=20<!--=20include=20a=20normal=20image=20-->
 =20=20=20=20=20=20=20=20<img=20src=3D"image.gif">
-=20=20=20=20=20=20=20=20<!--=20make=20sure=20only=20http(s)=20assets=20are=
-=20loaded=20-->
-=20=20=20=20=20=20=20=20<img=20src=3D"ftp://localhost/image.png">
 =20=20=20=20=20=20=20=20<!--=20make=20sure=20inline=20styles=20are=20parsed=
 =20-->
 =20=20=20=20=20=20=20=20<p=20style=3D"background-image:=20url('inline.png')=

From 4060fd5e905ac4acb3493311ad06b6c64be9e5cb Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Wed, 18 Nov 2015 19:56:49 +0100
Subject: [PATCH 079/104] Fix mhtml tests

---
 tests/integration/test_mhtml_e2e.py |  5 ++++-
 tests/integration/webserver.py      | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/integration/test_mhtml_e2e.py b/tests/integration/test_mhtml_e2e.py
index fedf6bd69..4fa0654c6 100644
--- a/tests/integration/test_mhtml_e2e.py
+++ b/tests/integration/test_mhtml_e2e.py
@@ -97,7 +97,10 @@ def test_mhtml(test_name, download_dir, quteproc, httpbin):
             if line.startswith('#'):
                 continue
             path = '/{}/{}'.format(test_path, line.strip())
-            expected_requests.append(httpbin.Request('GET', path))
+            expected_requests.append(httpbin.ExpectedRequest('GET', path))
 
     actual_requests = httpbin.get_requests()
+    # Requests are unorderable, we need to convert to ExpectedRequests
+    actual_requests = map(httpbin.ExpectedRequest.from_request,
+                          actual_requests)
     assert sorted(actual_requests) == sorted(expected_requests)
diff --git a/tests/integration/webserver.py b/tests/integration/webserver.py
index 5932e9042..fa8ba0a88 100644
--- a/tests/integration/webserver.py
+++ b/tests/integration/webserver.py
@@ -26,6 +26,7 @@ import re
 import sys
 import socket
 import os.path
+import functools
 
 import pytest
 from PyQt5.QtCore import pyqtSignal
@@ -89,6 +90,7 @@ class Request(testprocess.Line):
         return NotImplemented
 
 
+@functools.total_ordering
 class ExpectedRequest:
 
     """Class to compare expected requests easily."""
@@ -97,6 +99,11 @@ class ExpectedRequest:
         self.verb = verb
         self.path = path
 
+    @classmethod
+    def from_request(cls, request):
+        """Create an ExpectedRequest from a Request."""
+        return cls(request.verb, request.path)
+
     def __eq__(self, other):
         if isinstance(other, (Request, ExpectedRequest)):
             return (self.verb == other.verb and
@@ -104,6 +111,12 @@ class ExpectedRequest:
         else:
             return NotImplemented
 
+    def __lt__(self, other):
+        if isinstance(other, (Request, ExpectedRequest)):
+            return (self.verb, self.path) < (other.verb, other.path)
+        else:
+            return NotImplemented
+
 
 class HTTPBin(testprocess.Process):
 

From 452c6f5310b49e13839a26c1cdfb67579d57b7d5 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Thu, 19 Nov 2015 00:30:16 +0100
Subject: [PATCH 080/104] Add __str__ method to ExpectedRequest

Better for reading test logs.
---
 tests/integration/webserver.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/integration/webserver.py b/tests/integration/webserver.py
index fa8ba0a88..a27d7d185 100644
--- a/tests/integration/webserver.py
+++ b/tests/integration/webserver.py
@@ -117,6 +117,11 @@ class ExpectedRequest:
         else:
             return NotImplemented
 
+    def __str__(self):
+        return '<ExpectedRequest {} "{}">'.format(self.verb, self.path)
+
+    __repr__ = __str__
+
 
 class HTTPBin(testprocess.Process):
 

From 3466ee03f60d1f949a9e40271854806987e6a260 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 13:24:38 +0100
Subject: [PATCH 081/104] Change development server to cherrypy.wsgiserver

The Flask/Werkzeug development servers had some issues which lead to
failing tests (together with some Qt bugs).
---
 tests/integration/webserver_sub.py | 49 ++++++++++++++++++++++++++++--
 tox.ini                            |  1 +
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index b8d75b041..a39e079cc 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -24,12 +24,17 @@ This script gets called as a QProcess from integration/conftest.py.
 
 import sys
 import time
-import os.path
+import signal
+import os
+import threading
+from datetime import datetime
 
 from httpbin.core import app
 from httpbin.structures import CaseInsensitiveDict
+import cherrypy.wsgiserver
 import flask
 
+server = None
 
 @app.route('/data/<path:path>')
 def send_data(path):
@@ -51,11 +56,51 @@ def redirect_later():
     return flask.redirect('/')
 
 
+@app.after_request
+def log_request(response):
+    request = flask.request
+    template = '127.0.0.1 - - [{date}] "{verb} {path} {http}" {status} -'
+    print(template.format(
+        date=datetime.now().strftime('%d/%b/%Y %H:%M:%S'),
+        verb=request.method,
+        path=request.full_path if request.query_string else request.path,
+        http=request.environ['SERVER_PROTOCOL'],
+        status=response.status_code,
+    ), file=sys.stderr, flush=True)
+    return response
+
+
+def ready_checker(server):
+    """Wait until the server is ready and display the ready message."""
+    while not server.ready:
+        time.sleep(0.2)
+    print(' * Running on http://127.0.0.1:{}/ (Press CTRL+C to quit)'
+          .format(server.bind_addr[1]), file=sys.stderr, flush=True)
+
+
+def shutdown(*args):
+    """Stop the server."""
+    if server is None:
+        return
+    server.stop()
+
+
 def main():
+    global server
     if hasattr(sys, 'frozen'):
         basedir = os.path.realpath(os.path.dirname(sys.executable))
         app.template_folder = os.path.join(basedir, 'integration', 'templates')
-    app.run(port=int(sys.argv[1]), debug=True, use_reloader=False)
+    port = int(sys.argv[1])
+    server = cherrypy.wsgiserver.CherryPyWSGIServer(('0.0.0.0', port), app)
+
+    checker = threading.Thread(target=ready_checker, args=[server])
+    checker.start()
+    signal.signal(signal.SIGTERM, shutdown)
+
+    try:
+        server.start()
+    except KeyboardInterrupt:
+        shutdown()
 
 
 if __name__ == '__main__':
diff --git a/tox.ini b/tox.ini
index d96e7d202..4f21edd1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,6 +42,7 @@ deps =
     Werkzeug==0.11.2
     wheel==0.26.0
     xvfbwrapper==0.2.5
+    cherrypy==3.8.0
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -m py.test --strict -rfEsw --faulthandler-timeout=70 --cov --cov-report xml --cov-report=html --cov-report= {posargs:tests}

From a991a8c43cfe879195530fd2e5f368bf0b2b98ed Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 13:42:32 +0100
Subject: [PATCH 082/104] Don't compare requests triggered by loading a page

---
 .../integration/data/downloads/mhtml/complex/requests  | 10 ----------
 tests/integration/data/downloads/mhtml/simple/requests |  1 -
 tests/integration/test_mhtml_e2e.py                    |  1 +
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/tests/integration/data/downloads/mhtml/complex/requests b/tests/integration/data/downloads/mhtml/complex/requests
index 9cc83327f..2c1efd144 100644
--- a/tests/integration/data/downloads/mhtml/complex/requests
+++ b/tests/integration/data/downloads/mhtml/complex/requests
@@ -1,19 +1,9 @@
 background.png
-background.png
 base.css
-base.css
-complex.html
-# There are no divs, so this image is only loaded when saving as mhtml
 div-image.png
 extern-css.css
-extern-css.css
-external-in-external.css
 external-in-external.css
 favicon.png
-favicon.png
-image.gif
 image.gif
 inline.png
-inline.png
-script.js
 script.js
diff --git a/tests/integration/data/downloads/mhtml/simple/requests b/tests/integration/data/downloads/mhtml/simple/requests
index aff865ec9..e69de29bb 100644
--- a/tests/integration/data/downloads/mhtml/simple/requests
+++ b/tests/integration/data/downloads/mhtml/simple/requests
@@ -1 +0,0 @@
-simple.html
diff --git a/tests/integration/test_mhtml_e2e.py b/tests/integration/test_mhtml_e2e.py
index 4fa0654c6..f8f7389ef 100644
--- a/tests/integration/test_mhtml_e2e.py
+++ b/tests/integration/test_mhtml_e2e.py
@@ -83,6 +83,7 @@ def test_mhtml(test_name, download_dir, quteproc, httpbin):
     quteproc.open_path('{}/{}.html'.format(test_path, test_name))
     download_dest = os.path.join(download_dir.location,
                                  '{}-downloaded.mht'.format(test_name))
+    httpbin.after_test()
     quteproc.send_cmd(':download --mhtml --dest "{}"'.format(download_dest))
     quteproc.wait_for(category='downloads', module='mhtml',
                       function='finish_file',

From cb40b1020c08a5acc9f2de87bb7cfdcaa356d8bb Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 14:00:17 +0100
Subject: [PATCH 083/104] Add cherrypy.wsgiserver to frozen tests

---
 scripts/dev/freeze_tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/dev/freeze_tests.py b/scripts/dev/freeze_tests.py
index 309e00357..232787809 100755
--- a/scripts/dev/freeze_tests.py
+++ b/scripts/dev/freeze_tests.py
@@ -55,7 +55,8 @@ def get_build_exe_options():
     opts = freeze.get_build_exe_options(skip_html=True)
     opts['includes'] += pytest.freeze_includes()  # pylint: disable=no-member
     opts['includes'] += ['unittest.mock', 'PyQt5.QtTest', 'hypothesis', 'bs4',
-                         'httpbin', 'jinja2.ext', 'xvfbwrapper']
+                         'httpbin', 'jinja2.ext', 'xvfbwrapper',
+                         'cherrypy.wsgiserver']
 
     httpbin_dir = os.path.dirname(httpbin.__file__)
     opts['include_files'] += [

From 097a14d5f3782afc4601eb7a2b60735c3040a60d Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 14:03:51 +0100
Subject: [PATCH 084/104] Disable pylint no-member for cherrypy.wsgiserver

---
 tests/integration/webserver_sub.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index a39e079cc..8bd584004 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -91,7 +91,8 @@ def main():
         basedir = os.path.realpath(os.path.dirname(sys.executable))
         app.template_folder = os.path.join(basedir, 'integration', 'templates')
     port = int(sys.argv[1])
-    server = cherrypy.wsgiserver.CherryPyWSGIServer(('0.0.0.0', port), app)
+    server = cherrypy.wsgiserver.CherryPyWSGIServer(
+        ('0.0.0.0', port), app)  # pylint: disable=no-member
 
     checker = threading.Thread(target=ready_checker, args=[server])
     checker.start()

From fe1c8ee4e84452f68891f42f223c0e086aa17324 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 15:27:17 +0100
Subject: [PATCH 085/104] Also add cherrypy.wsgiserver.wsgiserver3 to freeze

---
 scripts/dev/freeze_tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/dev/freeze_tests.py b/scripts/dev/freeze_tests.py
index 232787809..e8e3e6f78 100755
--- a/scripts/dev/freeze_tests.py
+++ b/scripts/dev/freeze_tests.py
@@ -56,7 +56,8 @@ def get_build_exe_options():
     opts['includes'] += pytest.freeze_includes()  # pylint: disable=no-member
     opts['includes'] += ['unittest.mock', 'PyQt5.QtTest', 'hypothesis', 'bs4',
                          'httpbin', 'jinja2.ext', 'xvfbwrapper',
-                         'cherrypy.wsgiserver']
+                         'cherrypy.wsgiserver',
+                         'cherrypy.wsgiserver.wsgiserver3']
 
     httpbin_dir = os.path.dirname(httpbin.__file__)
     opts['include_files'] += [

From 613faf84efc52b7be721b785909ec382b0ea11a6 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 15:30:27 +0100
Subject: [PATCH 086/104] Move pylint comment

---
 tests/integration/webserver_sub.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index 8bd584004..9a4ae30fa 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -91,8 +91,8 @@ def main():
         basedir = os.path.realpath(os.path.dirname(sys.executable))
         app.template_folder = os.path.join(basedir, 'integration', 'templates')
     port = int(sys.argv[1])
-    server = cherrypy.wsgiserver.CherryPyWSGIServer(
-        ('0.0.0.0', port), app)  # pylint: disable=no-member
+    server = cherrypy.wsgiserver.CherryPyWSGIServer(  # pylint: disable=no-member
+        ('0.0.0.0', port), app)
 
     checker = threading.Thread(target=ready_checker, args=[server])
     checker.start()

From fb8f20029178c9147eb00a6e0c39573d15ed7fd3 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 16:11:13 +0100
Subject: [PATCH 087/104] Remove polling in webserver, use property instead

---
 tests/integration/webserver_sub.py | 32 ++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index 9a4ae30fa..81efa9c6e 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -26,7 +26,6 @@ import sys
 import time
 import signal
 import os
-import threading
 from datetime import datetime
 
 from httpbin.core import app
@@ -70,12 +69,26 @@ def log_request(response):
     return response
 
 
-def ready_checker(server):
-    """Wait until the server is ready and display the ready message."""
-    while not server.ready:
-        time.sleep(0.2)
-    print(' * Running on http://127.0.0.1:{}/ (Press CTRL+C to quit)'
-          .format(server.bind_addr[1]), file=sys.stderr, flush=True)
+class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
+    """A custom WSGIServer that prints a line on stderr when it's ready."""
+    # pylint: disable=no-member
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._ready = False
+        self._printed_ready = False
+
+    @property
+    def ready(self):
+        return self._ready
+
+    @ready.setter
+    def ready(self, value):
+        if value and not self._printed_ready:
+            print(' * Running on http://127.0.0.1:{}/ (Press CTRL+C to quit)'
+                  .format(self.bind_addr[1]), file=sys.stderr, flush=True)
+            self._printed_ready = True
+        self._ready = value
 
 
 def shutdown(*args):
@@ -91,11 +104,8 @@ def main():
         basedir = os.path.realpath(os.path.dirname(sys.executable))
         app.template_folder = os.path.join(basedir, 'integration', 'templates')
     port = int(sys.argv[1])
-    server = cherrypy.wsgiserver.CherryPyWSGIServer(  # pylint: disable=no-member
-        ('0.0.0.0', port), app)
+    server = WSGIServer(('0.0.0.0', port), app)
 
-    checker = threading.Thread(target=ready_checker, args=[server])
-    checker.start()
     signal.signal(signal.SIGTERM, shutdown)
 
     try:

From 09e310277d66e46dc61b1a921fde293c33887edd Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 16:13:30 +0100
Subject: [PATCH 088/104] Remove server global, use lambda instead

---
 tests/integration/webserver_sub.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index 81efa9c6e..a15ac4df5 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -33,7 +33,6 @@ from httpbin.structures import CaseInsensitiveDict
 import cherrypy.wsgiserver
 import flask
 
-server = None
 
 @app.route('/data/<path:path>')
 def send_data(path):
@@ -91,27 +90,19 @@ class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
         self._ready = value
 
 
-def shutdown(*args):
-    """Stop the server."""
-    if server is None:
-        return
-    server.stop()
-
-
 def main():
-    global server
     if hasattr(sys, 'frozen'):
         basedir = os.path.realpath(os.path.dirname(sys.executable))
         app.template_folder = os.path.join(basedir, 'integration', 'templates')
     port = int(sys.argv[1])
     server = WSGIServer(('0.0.0.0', port), app)
 
-    signal.signal(signal.SIGTERM, shutdown)
+    signal.signal(signal.SIGTERM, lambda *args: server.stop())
 
     try:
         server.start()
     except KeyboardInterrupt:
-        shutdown()
+        server.stop()
 
 
 if __name__ == '__main__':

From 729d29b8a7bd510caab8e000410342ba16292702 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 16:17:34 +0100
Subject: [PATCH 089/104] webserver: listen on 127.0.0.1 instead of 0.0.0.0

---
 tests/integration/webserver_sub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index a15ac4df5..4bf72bf58 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -95,7 +95,7 @@ def main():
         basedir = os.path.realpath(os.path.dirname(sys.executable))
         app.template_folder = os.path.join(basedir, 'integration', 'templates')
     port = int(sys.argv[1])
-    server = WSGIServer(('0.0.0.0', port), app)
+    server = WSGIServer(('127.0.0.1', port), app)
 
     signal.signal(signal.SIGTERM, lambda *args: server.stop())
 

From cd78086d10502664448ed49c7c1fa1d2e58bb3df Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 16:23:46 +0100
Subject: [PATCH 090/104] Fix pep257

---
 tests/integration/webserver_sub.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index 4bf72bf58..cd9a98803 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -69,7 +69,9 @@ def log_request(response):
 
 
 class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
+
     """A custom WSGIServer that prints a line on stderr when it's ready."""
+
     # pylint: disable=no-member
 
     def __init__(self, *args, **kwargs):

From b38a3caa4c74ff0c48b792a89013f96ca3fbb4e6 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 16:34:27 +0100
Subject: [PATCH 091/104] Hide dest-old in the documentation of download

---
 qutebrowser/browser/commands.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index bbc04089b..d14c07ac9 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1139,7 +1139,8 @@ class CommandDispatcher:
                 cur.inspector.show()
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def download(self, url=None, dest_old=None, *, mhtml_=False, dest=None):
+    def download(self, url=None, dest_old: {'hide': True}=None, *,
+                 mhtml_=False, dest=None):
         """Download a given URL, or current page if no URL given.
 
         The form `:download [url] [dest]` is deprecated, use `:download --dest

From 7f8c118991e9c781012a4b45fcd8e17d0a39cfd5 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 16:57:27 +0100
Subject: [PATCH 092/104] Fix pylint

---
 tests/integration/webserver_sub.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index cd9a98803..c6ac8b2cd 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -93,6 +93,10 @@ class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
 
 
 def main():
+    # pylint: disable=no-member
+    # "Instance of 'WSGIServer' has no 'start' member (no-member)"
+    # "Instance of 'WSGIServer' has no 'stop' member (no-member)"
+
     if hasattr(sys, 'frozen'):
         basedir = os.path.realpath(os.path.dirname(sys.executable))
         app.template_folder = os.path.join(basedir, 'integration', 'templates')

From d5bc962046689537f084c5df063e55b658b2bf59 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 18:15:03 +0100
Subject: [PATCH 093/104] mhtml: Current index != Current tab_id

---
 qutebrowser/browser/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index d14c07ac9..d039bc291 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1184,7 +1184,7 @@ class CommandDispatcher:
         Args:
             dest: The file path to write the download to.
         """
-        tab_id = self._current_index()
+        tab_id = self._current_widget().tab_id
         if dest is None:
             suggested_fn = self._current_title() + ".mht"
             suggested_fn = utils.sanitize_filename(suggested_fn)

From 0c2a285fef1af75a8cb0cb8ffcf8520466508b58 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 18:30:08 +0100
Subject: [PATCH 094/104] Convert to QUrl before waiting for the logline

webview uses QUrl to output the url and thus might convert some escape
sequences to their unicode characters. If we don't do the same
conversions here, we will "miss" the log message and fail the test.
---
 tests/integration/quteprocess.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration/quteprocess.py b/tests/integration/quteprocess.py
index d99665e41..8f664ad82 100644
--- a/tests/integration/quteprocess.py
+++ b/tests/integration/quteprocess.py
@@ -31,7 +31,7 @@ import tempfile
 
 import yaml
 import pytest
-from PyQt5.QtCore import pyqtSignal
+from PyQt5.QtCore import pyqtSignal, QUrl
 
 import testprocess  # pylint: disable=import-error
 from qutebrowser.misc import ipc
@@ -229,6 +229,7 @@ class QuteProc(testprocess.Process):
     def wait_for_load_finished(self, path, timeout=15000):
         """Wait until any tab has finished loading."""
         url = self._path_to_url(path)
+        url = QUrl(url).toString()
         pattern = re.compile(
             r"(load status for <qutebrowser.browser.webview.WebView "
             r"tab_id=\d+ url='{url}'>: LoadStatus.success|fetch: "

From 0a9a75c3372865ed5d6535ca9b3a541443a040ba Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 18:31:39 +0100
Subject: [PATCH 095/104] Add more tests for the :download command

---
 tests/integration/features/downloads.feature | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/integration/features/downloads.feature b/tests/integration/features/downloads.feature
index f81b5677d..0b89ece20 100644
--- a/tests/integration/features/downloads.feature
+++ b/tests/integration/features/downloads.feature
@@ -42,3 +42,26 @@ Feature: Downloading things from a website.
     Scenario: Retrying with no downloads
         When I run :download-retry
         Then the error "No failed downloads!" should be shown.
+
+    Scenario: :download with deprecated dest-old argument
+        When I run :download http://localhost:(port)/ deprecated-argument
+        Then the warning ":download [url] [dest] is deprecated - use download --dest [dest] [url]" should be shown.
+
+    Scenario: Two destinations given
+        When I run :download --dest destination2 http://localhost:(port)/ destination1
+        Then the warning ":download [url] [dest] is deprecated - use download --dest [dest] [url]" should be shown.
+        Then the error "Can't give two destinations for the download." should be shown.
+
+    Scenario: :download --mhtml with an URL given
+        When I run :download --mhtml http://foobar/
+        Then the error "Can only download the current page as mhtml." should be shown.
+
+    Scenario: Downloading as mhtml is available
+        When I open html
+        And I run :download --mhtml
+        Then no crash should happen
+
+    Scenario: Downloading as mhtml with non-ASCII headers
+        When I open response-headers?Content-Type=text%2Fpl%C3%A4in
+        And I run :download --dest mhtml-response-headers.mht
+        Then no crash should happen

From b776aeac84bd926673612102b6a2fd10dc10bd3d Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Fri, 20 Nov 2015 19:10:14 +0100
Subject: [PATCH 096/104] Use same representation in webview and quteprocess

Otherwise the "page loaded" message will not be recognized.

Also use percent-encoding to avoid unicode-related bugs on different
systems.
---
 qutebrowser/browser/webview.py   | 2 +-
 tests/integration/quteprocess.py | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/webview.py b/qutebrowser/browser/webview.py
index 54620a0fd..ede9f9a88 100644
--- a/qutebrowser/browser/webview.py
+++ b/qutebrowser/browser/webview.py
@@ -159,7 +159,7 @@ class WebView(QWebView):
         return page
 
     def __repr__(self):
-        url = utils.elide(self.url().toDisplayString(), 100)
+        url = utils.elide(self.url().toDisplayString(QUrl.EncodeUnicode), 100)
         return utils.get_repr(self, tab_id=self.tab_id, url=url)
 
     def __del__(self):
diff --git a/tests/integration/quteprocess.py b/tests/integration/quteprocess.py
index 8f664ad82..910f73950 100644
--- a/tests/integration/quteprocess.py
+++ b/tests/integration/quteprocess.py
@@ -35,7 +35,7 @@ from PyQt5.QtCore import pyqtSignal, QUrl
 
 import testprocess  # pylint: disable=import-error
 from qutebrowser.misc import ipc
-from qutebrowser.utils import log
+from qutebrowser.utils import log, utils
 
 
 def is_ignored_qt_message(message):
@@ -229,7 +229,9 @@ class QuteProc(testprocess.Process):
     def wait_for_load_finished(self, path, timeout=15000):
         """Wait until any tab has finished loading."""
         url = self._path_to_url(path)
-        url = QUrl(url).toString()
+        # We really need the same representation that the webview uses in its
+        # __repr__
+        url = utils.elide(QUrl(url).toDisplayString(QUrl.EncodeUnicode), 100)
         pattern = re.compile(
             r"(load status for <qutebrowser.browser.webview.WebView "
             r"tab_id=\d+ url='{url}'>: LoadStatus.success|fetch: "

From c12011c84d1bd8f5e150b0169027353ed4a8f3b7 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Sat, 21 Nov 2015 00:10:49 +0100
Subject: [PATCH 097/104] Style fixes

---
 qutebrowser/browser/commands.py              |  13 +--
 qutebrowser/browser/downloads.py             |   4 +-
 qutebrowser/browser/mhtml.py                 | 102 +++++++++----------
 tests/integration/features/downloads.feature |   2 +-
 tests/integration/test_mhtml_e2e.py          |   5 +-
 tests/integration/testprocess.py             |   8 +-
 tests/integration/webserver.py               |   7 +-
 tests/integration/webserver_sub.py           |   2 +
 tests/unit/browser/test_mhtml.py             |  21 ++++
 9 files changed, 93 insertions(+), 71 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index d039bc291..d2f157c78 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1184,24 +1184,21 @@ class CommandDispatcher:
         Args:
             dest: The file path to write the download to.
         """
-        tab_id = self._current_widget().tab_id
+        web_view = self._current_widget()
         if dest is None:
             suggested_fn = self._current_title() + ".mht"
             suggested_fn = utils.sanitize_filename(suggested_fn)
             filename, q = downloads.ask_for_filename(
-                suggested_fn, self._win_id, parent=self,
+                suggested_fn, self._win_id, parent=web_view,
             )
             if filename is not None:
-                mhtml.start_download_checked(filename, win_id=self._win_id,
-                                             tab_id=tab_id)
+                mhtml.start_download_checked(filename, web_view=web_view)
             else:
                 q.answered.connect(functools.partial(
-                    mhtml.start_download_checked, win_id=self._win_id,
-                    tab_id=tab_id))
+                    mhtml.start_download_checked, web_view=web_view))
                 q.ask()
         else:
-            mhtml.start_download_checked(dest, win_id=self._win_id,
-                                         tab_id=tab_id)
+            mhtml.start_download_checked(dest, web_view=web_view)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        deprecated="Use :download instead.")
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 8e88f0826..7d2202301 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -139,7 +139,7 @@ def ask_for_filename(suggested_filename, win_id, *, parent=None,
                                                'prompt-download-directory')
 
     if not prompt_download_directory:
-        return DownloadPath(download_dir(), None)
+        return DownloadPath(filename=download_dir(), question=None)
 
     encoding = sys.getfilesystemencoding()
     suggested_filename = utils.force_encoding(suggested_filename,
@@ -154,7 +154,7 @@ def ask_for_filename(suggested_filename, win_id, *, parent=None,
     message_bridge = objreg.get('message-bridge', scope='window',
                                 window=win_id)
     q.ask = lambda: message_bridge.ask(q, blocking=False)
-    return DownloadPath(None, q)
+    return DownloadPath(filename=None, question=q)
 
 
 class DownloadItemStats(QObject):
diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 066686614..a202b5639 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -146,7 +146,7 @@ E_BASE64 = email.encoders.encode_base64
 E_QUOPRI = email.encoders.encode_quopri
 
 
-class MHTMLWriter():
+class MHTMLWriter:
 
     """A class for outputting multiple files to a MHTML document.
 
@@ -217,7 +217,7 @@ class MHTMLWriter():
         return msg
 
 
-class _Downloader():
+class _Downloader:
 
     """A class to download whole websites.
 
@@ -227,20 +227,21 @@ class _Downloader():
         writer: The MHTMLWriter object which is used to save the page.
         loaded_urls: A set of QUrls of finished asset downloads.
         pending_downloads: A set of unfinished (url, DownloadItem) tuples.
-        _finished: A flag indicating if the file has already been written.
+        _finished_file: A flag indicating if the file has already been
+                        written.
         _used: A flag indicating if the downloader has already been used.
         _win_id: The window this downloader belongs to.
     """
 
-    def __init__(self, web_view, dest, win_id):
+    def __init__(self, web_view, dest):
         self.web_view = web_view
         self.dest = dest
         self.writer = None
         self.loaded_urls = {web_view.url()}
         self.pending_downloads = set()
-        self._finished = False
+        self._finished_file = False
         self._used = False
-        self._win_id = win_id
+        self._win_id = web_view.win_id
 
     def run(self):
         """Download and save the page.
@@ -280,31 +281,36 @@ class _Downloader():
                 # Might be a local <script> tag or something else
                 continue
             absolute_url = web_url.resolved(QUrl(element_url))
-            self.fetch_url(absolute_url)
+            self._fetch_url(absolute_url)
 
         styles = web_frame.findAllElements('style')
         for style in styles:
             style = webelem.WebElementWrapper(style)
+            # The Mozilla Developer Network says:
+            # type: This attribute defines the styling language as a MIME type
+            # (charset should not be specified). This attribute is optional and
+            # default to text/css if it's missing.
+            # https://developer.mozilla.org/en/docs/Web/HTML/Element/style
             if 'type' in style and style['type'] != 'text/css':
                 continue
             for element_url in _get_css_imports(str(style)):
-                self.fetch_url(web_url.resolved(QUrl(element_url)))
+                self._fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Search for references in inline styles
         for element in web_frame.findAllElements('[style]'):
             element = webelem.WebElementWrapper(element)
             style = element['style']
             for element_url in _get_css_imports(style, inline=True):
-                self.fetch_url(web_url.resolved(QUrl(element_url)))
+                self._fetch_url(web_url.resolved(QUrl(element_url)))
 
         # Shortcut if no assets need to be downloaded, otherwise the file would
         # never be saved. Also might happen if the downloads are fast enough to
         # complete before connecting their finished signal.
-        self.collect_zombies()
-        if not self.pending_downloads and not self._finished:
-            self.finish_file()
+        self._collect_zombies()
+        if not self.pending_downloads and not self._finished_file:
+            self._finish_file()
 
-    def fetch_url(self, url):
+    def _fetch_url(self, url):
         """Download the given url and add the file to the collection.
 
         Args:
@@ -317,7 +323,7 @@ class _Downloader():
             return
         self.loaded_urls.add(url)
 
-        log.downloads.debug("loading asset at %s", url)
+        log.downloads.debug("loading asset at {}".format(url))
 
         # Using the download manager to download host-blocked urls might crash
         # qute, see the comments/discussion on
@@ -325,7 +331,7 @@ class _Downloader():
         # and https://github.com/The-Compiler/qutebrowser/issues/1053
         host_blocker = objreg.get('host-blocker')
         if host_blocker.is_blocked(url):
-            log.downloads.debug("Skipping %s, host-blocked", url)
+            log.downloads.debug("Skipping {}, host-blocked".format(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.
@@ -333,18 +339,18 @@ class _Downloader():
             return
 
         download_manager = objreg.get('download-manager', scope='window',
-                                      window='current')
+                                      window=self._win_id)
         item = download_manager.get(url, fileobj=_NoCloseBytesIO(),
                                     auto_remove=True)
         self.pending_downloads.add((url, item))
         item.finished.connect(
-            functools.partial(self.finished, url, item))
+            functools.partial(self._finished, url, item))
         item.error.connect(
-            functools.partial(self.error, url, item))
+            functools.partial(self._error, url, item))
         item.cancelled.connect(
-            functools.partial(self.error, url, item))
+            functools.partial(self._error, url, item))
 
-    def finished(self, url, item):
+    def _finished(self, url, item):
         """Callback when a single asset is downloaded.
 
         Args:
@@ -375,12 +381,12 @@ class _Downloader():
             try:
                 css_string = item.fileobj.getvalue().decode('utf-8')
             except UnicodeDecodeError:
-                log.downloads.warning("Invalid UTF-8 data in %s", url)
+                log.downloads.warning("Invalid UTF-8 data in {}".format(url))
                 css_string = item.fileobj.getvalue().decode('utf-8', 'ignore')
             import_urls = _get_css_imports(css_string)
             for import_url in import_urls:
                 absolute_url = url.resolved(QUrl(import_url))
-                self.fetch_url(absolute_url)
+                self._fetch_url(absolute_url)
 
         encode = E_QUOPRI if mime.startswith('text/') else E_BASE64
         # Our MHTML handler refuses non-ASCII headers. This will replace every
@@ -392,9 +398,9 @@ class _Downloader():
         item.fileobj.actual_close()
         if self.pending_downloads:
             return
-        self.finish_file()
+        self._finish_file()
 
-    def error(self, url, item, *_args):
+    def _error(self, url, item, *_args):
         """Callback when a download error occurred.
 
         Args:
@@ -406,40 +412,33 @@ class _Downloader():
         except KeyError:
             # This might happen if .collect_zombies() calls .finished() and the
             # error handler will be called after .collect_zombies
-            log.downloads.debug("Oops! Download already gone: %s", item)
+            log.downloads.debug("Oops! Download already gone: {}".format(item))
             return
         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'')
         if self.pending_downloads:
             return
-        self.finish_file()
+        self._finish_file()
 
-    def finish_file(self):
+    def _finish_file(self):
         """Save the file to the filename given in __init__."""
-        if self._finished:
+        if self._finished_file:
             log.downloads.debug("finish_file called twice, ignored!")
             return
-        self._finished = True
+        self._finished_file = True
         log.downloads.debug("All assets downloaded, ready to finish off!")
         try:
-            file_output = open(self.dest, 'wb')
+            with open(self.dest, 'wb') as file_output:
+                self.writer.write_to(file_output)
         except OSError as error:
             message.error(self._win_id,
                           "Could not save file: {}".format(error))
             return
-        else:
-            # Yes, ugly nesting of try-blocks, but necessary because there's
-            # no way to let the try block only affect the with-statement-
-            # entry-code and not the with-statement-body.
-            try:
-                self.writer.write_to(file_output)
-            finally:
-                file_output.close()
         log.downloads.debug("File successfully written.")
         message.info(self._win_id, "Page saved as {}".format(self.dest))
 
-    def collect_zombies(self):
+    def _collect_zombies(self):
         """Collect done downloads and add their data to the MHTML file.
 
         This is needed if a download finishes before attaching its
@@ -447,9 +446,9 @@ class _Downloader():
         """
         items = set((url, item) for url, item in self.pending_downloads
                     if item.done)
-        log.downloads.debug("Zombie downloads: %s", items)
+        log.downloads.debug("Zombie downloads: {}".format(items))
         for url, item in items:
-            self.finished(url, item)
+            self._finished(url, item)
 
 
 class _NoCloseBytesIO(io.BytesIO):  # pylint: disable=no-init
@@ -469,7 +468,7 @@ class _NoCloseBytesIO(io.BytesIO):  # pylint: disable=no-init
         super().close()
 
 
-def _start_download(dest, win_id, tab_id):
+def _start_download(dest, web_view):
     """Start downloading the current page and all assets to a MHTML file.
 
     This will overwrite dest if it already exists.
@@ -478,21 +477,19 @@ def _start_download(dest, win_id, tab_id):
         dest: The filename where the resulting file should be saved.
         win_id, tab_id: Specify the tab whose page should be loaded.
     """
-    web_view = objreg.get('webview', scope='tab', window=win_id, tab=tab_id)
-    loader = _Downloader(web_view, dest, win_id)
+    loader = _Downloader(web_view, dest)
     loader.run()
 
 
-def start_download_checked(dest, win_id, tab_id):
+def start_download_checked(dest, web_view):
     """First check if dest is already a file, then start the download.
 
     Args:
         dest: The filename where the resulting file should be saved.
-        win_id, tab_id: Specify the tab whose page should be loaded.
+        web_view: Specify the webview whose page should be loaded.
     """
     # The default name is 'page title.mht'
-    title = (objreg.get('webview', scope='tab', window=win_id, tab=tab_id)
-             .title())
+    title = web_view.title()
     default_name = utils.sanitize_filename(title + '.mht')
 
     # Remove characters which cannot be expressed in the file system encoding
@@ -516,11 +513,12 @@ def start_download_checked(dest, win_id, tab_id):
     # saving the file anyway.
     if not os.path.isdir(os.path.dirname(path)):
         folder = os.path.dirname(path)
-        message.error(win_id, "Directory {} does not exist.".format(folder))
+        message.error(web_view.win_id,
+                      "Directory {} does not exist.".format(folder))
         return
 
     if not os.path.isfile(path):
-        _start_download(path, win_id=win_id, tab_id=tab_id)
+        _start_download(path, web_view=web_view)
         return
 
     q = usertypes.Question()
@@ -528,7 +526,7 @@ def start_download_checked(dest, win_id, tab_id):
     q.text = "{} exists. Overwrite?".format(path)
     q.completed.connect(q.deleteLater)
     q.answered_yes.connect(functools.partial(
-        _start_download, path, win_id=win_id, tab_id=tab_id))
+        _start_download, path, web_view=web_view))
     message_bridge = objreg.get('message-bridge', scope='window',
-                                window=win_id)
+                                window=web_view.win_id)
     message_bridge.ask(q, blocking=False)
diff --git a/tests/integration/features/downloads.feature b/tests/integration/features/downloads.feature
index 0b89ece20..3cb54252e 100644
--- a/tests/integration/features/downloads.feature
+++ b/tests/integration/features/downloads.feature
@@ -50,7 +50,7 @@ Feature: Downloading things from a website.
     Scenario: Two destinations given
         When I run :download --dest destination2 http://localhost:(port)/ destination1
         Then the warning ":download [url] [dest] is deprecated - use download --dest [dest] [url]" should be shown.
-        Then the error "Can't give two destinations for the download." should be shown.
+        And the error "Can't give two destinations for the download." should be shown.
 
     Scenario: :download --mhtml with an URL given
         When I run :download --mhtml http://foobar/
diff --git a/tests/integration/test_mhtml_e2e.py b/tests/integration/test_mhtml_e2e.py
index f8f7389ef..a11cf5e3a 100644
--- a/tests/integration/test_mhtml_e2e.py
+++ b/tests/integration/test_mhtml_e2e.py
@@ -83,10 +83,11 @@ def test_mhtml(test_name, download_dir, quteproc, httpbin):
     quteproc.open_path('{}/{}.html'.format(test_path, test_name))
     download_dest = os.path.join(download_dir.location,
                                  '{}-downloaded.mht'.format(test_name))
-    httpbin.after_test()
+    # Discard all requests that were necessary to display the page
+    httpbin.clear_data()
     quteproc.send_cmd(':download --mhtml --dest "{}"'.format(download_dest))
     quteproc.wait_for(category='downloads', module='mhtml',
-                      function='finish_file',
+                      function='_finish_file',
                       message='File successfully written.')
 
     expected_file = os.path.join(test_dir, '{}.mht'.format(test_name))
diff --git a/tests/integration/testprocess.py b/tests/integration/testprocess.py
index e6ead16c6..325383932 100644
--- a/tests/integration/testprocess.py
+++ b/tests/integration/testprocess.py
@@ -182,13 +182,17 @@ class Process(QObject):
             time.sleep(1)
             # Exit the process to make sure we're in a defined state again
             self.terminate()
-            self._data.clear()
+            self.clear_data()
             raise InvalidLine(self._invalid)
 
-        self._data.clear()
+        self.clear_data()
         if not self.is_running():
             raise ProcessExited
 
+    def clear_data(self):
+        """Clear the collected data."""
+        self._data.clear()
+
     def terminate(self):
         """Clean up and shut down the process."""
         self.proc.terminate()
diff --git a/tests/integration/webserver.py b/tests/integration/webserver.py
index a27d7d185..7c9e378be 100644
--- a/tests/integration/webserver.py
+++ b/tests/integration/webserver.py
@@ -117,10 +117,9 @@ class ExpectedRequest:
         else:
             return NotImplemented
 
-    def __str__(self):
-        return '<ExpectedRequest {} "{}">'.format(self.verb, self.path)
-
-    __repr__ = __str__
+    def __repr__(self):
+        return ('ExpectedRequest(verb={!r}, path={!r})'
+                .format(self.verb, self.path))
 
 
 class HTTPBin(testprocess.Process):
diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index c6ac8b2cd..27e052e81 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -73,6 +73,7 @@ class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
     """A custom WSGIServer that prints a line on stderr when it's ready."""
 
     # pylint: disable=no-member
+    # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/702
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -94,6 +95,7 @@ class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
 
 def main():
     # pylint: disable=no-member
+    # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/702
     # "Instance of 'WSGIServer' has no 'start' member (no-member)"
     # "Instance of 'WSGIServer' has no 'stop' member (no-member)"
 
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 7b5fed7be..5a6912863 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -1,7 +1,28 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015 Daniel Schadt
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for qutebrowser.browser.mhtml."""
+
 import io
 import textwrap
 import re
+
 import pytest
 
 from qutebrowser.browser import mhtml

From c7294781f56b0974362d5e978cd8d45b2d801f78 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Sat, 21 Nov 2015 00:20:09 +0100
Subject: [PATCH 098/104] Don't make ExpectedRequest orderable

Instead, make it hashable and use collections.Counter instead of sorted
lists. This actually produces a nicer output for differences between
the counters.
---
 tests/integration/test_mhtml_e2e.py | 6 ++++--
 tests/integration/webserver.py      | 9 ++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/integration/test_mhtml_e2e.py b/tests/integration/test_mhtml_e2e.py
index a11cf5e3a..41f5e15f6 100644
--- a/tests/integration/test_mhtml_e2e.py
+++ b/tests/integration/test_mhtml_e2e.py
@@ -22,6 +22,7 @@
 import os
 import re
 import os.path
+import collections
 
 import pytest
 
@@ -102,7 +103,8 @@ def test_mhtml(test_name, download_dir, quteproc, httpbin):
             expected_requests.append(httpbin.ExpectedRequest('GET', path))
 
     actual_requests = httpbin.get_requests()
-    # Requests are unorderable, we need to convert to ExpectedRequests
+    # Requests are not hashable, we need to convert to ExpectedRequests
     actual_requests = map(httpbin.ExpectedRequest.from_request,
                           actual_requests)
-    assert sorted(actual_requests) == sorted(expected_requests)
+    assert (collections.Counter(actual_requests) ==
+            collections.Counter(expected_requests))
diff --git a/tests/integration/webserver.py b/tests/integration/webserver.py
index 7c9e378be..9afb575e8 100644
--- a/tests/integration/webserver.py
+++ b/tests/integration/webserver.py
@@ -26,7 +26,6 @@ import re
 import sys
 import socket
 import os.path
-import functools
 
 import pytest
 from PyQt5.QtCore import pyqtSignal
@@ -90,7 +89,6 @@ class Request(testprocess.Line):
         return NotImplemented
 
 
-@functools.total_ordering
 class ExpectedRequest:
 
     """Class to compare expected requests easily."""
@@ -111,11 +109,8 @@ class ExpectedRequest:
         else:
             return NotImplemented
 
-    def __lt__(self, other):
-        if isinstance(other, (Request, ExpectedRequest)):
-            return (self.verb, self.path) < (other.verb, other.path)
-        else:
-            return NotImplemented
+    def __hash__(self):
+        return hash(('ExpectedRequest', self.verb, self.path))
 
     def __repr__(self):
         return ('ExpectedRequest(verb={!r}, path={!r})'

From 59c9c6ccb0b448271e2e2f25ea3e5d5eeef43636 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Sat, 21 Nov 2015 12:37:26 +0100
Subject: [PATCH 099/104] Actually test :download --mhtml, not :download

---
 tests/integration/features/downloads.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/features/downloads.feature b/tests/integration/features/downloads.feature
index 3cb54252e..02653db8e 100644
--- a/tests/integration/features/downloads.feature
+++ b/tests/integration/features/downloads.feature
@@ -63,5 +63,5 @@ Feature: Downloading things from a website.
 
     Scenario: Downloading as mhtml with non-ASCII headers
         When I open response-headers?Content-Type=text%2Fpl%C3%A4in
-        And I run :download --dest mhtml-response-headers.mht
+        And I run :download --mhtml --dest mhtml-response-headers.mht
         Then no crash should happen

From 7d6327873a0cba2eb93f026da5d621b42e3a6b26 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Sat, 21 Nov 2015 12:45:57 +0100
Subject: [PATCH 100/104] Pass test only when mhtml file is written

Otherwise we might spill data to tests that come after the mhtml ones.
---
 tests/integration/features/downloads.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/integration/features/downloads.feature b/tests/integration/features/downloads.feature
index 02653db8e..6c5bbac58 100644
--- a/tests/integration/features/downloads.feature
+++ b/tests/integration/features/downloads.feature
@@ -59,9 +59,11 @@ Feature: Downloading things from a website.
     Scenario: Downloading as mhtml is available
         When I open html
         And I run :download --mhtml
+        And I wait for "File successfully written." in the log
         Then no crash should happen
 
     Scenario: Downloading as mhtml with non-ASCII headers
         When I open response-headers?Content-Type=text%2Fpl%C3%A4in
         And I run :download --mhtml --dest mhtml-response-headers.mht
+        And I wait for "File successfully written." in the log
         Then no crash should happen

From 86eda2843de85a894d5e616cdd5d7657941e4900 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Sat, 21 Nov 2015 16:17:20 +0100
Subject: [PATCH 101/104] Normalize application/x-javascript

Should be just application/javascript
---
 tests/integration/test_mhtml_e2e.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/integration/test_mhtml_e2e.py b/tests/integration/test_mhtml_e2e.py
index 41f5e15f6..090937186 100644
--- a/tests/integration/test_mhtml_e2e.py
+++ b/tests/integration/test_mhtml_e2e.py
@@ -40,6 +40,12 @@ def normalize_line(line):
                   'boundary="---=_qute-UUID"', line)
     line = re.sub('^-----=_qute-[0-9a-f-]+$', '-----=_qute-UUID', line)
     line = re.sub(r'localhost:\d{1,5}', 'localhost:(port)', line)
+
+    # Depending on Python's mimetypes module/the system's mime files, .js
+    # files could be either identified as x-javascript or just javascript
+    line = line.replace('Content-Type: application/x-javascript',
+                        'Content-Type: application/javascript')
+
     return line
 
 

From 89c9b5959e7e18ddb7794b8b3cfb1286fda07275 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Mon, 23 Nov 2015 12:32:58 +0100
Subject: [PATCH 102/104] Don't ask the user twice for a filename

Fixes a bug where the user would be asked twice for a filename when
using :download without a dest-argument.

The problem was that we unconditionally overwrote filename, even if one
was given, thus discarding any "filename-finding-process" that we had
and asking the user again.
---
 qutebrowser/browser/downloads.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 7d2202301..7a321eae7 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -776,7 +776,8 @@ class DownloadManager(QAbstractListModel):
                              QNetworkRequest.AlwaysNetwork)
         suggested_fn = urlutils.filename_from_url(request.url())
 
-        if fileobj is None:
+        # We won't need a question if a filename or fileobj is already given
+        if fileobj is None and filename is None:
             filename, q = ask_for_filename(
                 suggested_fn, self._win_id, parent=self,
                 prompt_download_directory=prompt_download_directory
@@ -873,14 +874,22 @@ class DownloadManager(QAbstractListModel):
             download.autoclose = False
             return download
 
-        filename, q = ask_for_filename(
-            suggested_filename, self._win_id, parent=self,
-            prompt_download_directory=prompt_download_directory,
-        )
         if filename is not None:
             download.set_filename(filename)
             return download
 
+        # Neither filename nor fileobj were given, prepare a question
+        filename, q = ask_for_filename(
+            suggested_filename, self._win_id, parent=self,
+            prompt_download_directory=prompt_download_directory,
+        )
+
+        # User doesn't want to be asked, so just use the download_dir
+        if filename is not None:
+            download.set_filename(filename)
+            return download
+
+        # Ask the user for a filename
         self._postprocess_question(q)
         q.answered.connect(download.set_filename)
         q.cancelled.connect(download.cancel)

From 0d60ec43ed861fac3b4773bbb412091d34178475 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 23 Nov 2015 13:26:32 +0100
Subject: [PATCH 103/104] Regenerate docs.

---
 README.asciidoc             | 2 +-
 doc/help/commands.asciidoc  | 1 -
 scripts/dev/src2asciidoc.py | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.asciidoc b/README.asciidoc
index 449945971..0a5c580f1 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -140,6 +140,7 @@ Contributors, sorted by the number of commits in descending order:
 
 // QUTE_AUTHORS_START
 * Florian Bruhin
+* Daniel Schadt
 * Antoni Boucher
 * Lamar Pavel
 * Bruno Oliveira
@@ -147,7 +148,6 @@ Contributors, sorted by the number of commits in descending order:
 * Martin Tournoij
 * Raphael Pierzina
 * Joel Torstensson
-* Daniel
 * Claude
 * meles5
 * Nathan Isom
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 6d4787528..68653e844 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -154,7 +154,6 @@ The form `:download [url] [dest]` is deprecated, use `:download --dest [dest] [u
 
 ==== positional arguments
 * +'url'+: The URL to download. If not given, download the current page.
-* +'dest-old'+: (deprecated) Same as dest.
 
 ==== optional arguments
 * +*-m*+, +*--mhtml*+: Download the current page and all assets as mhtml file.
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index af0c76730..94719fb61 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -392,6 +392,7 @@ def _get_authors():
         'Michael': 'Halfwit',
         'Error 800': 'error800',
         'larryhynes': 'Larry Hynes',
+        'Daniel': 'Daniel Schadt',
     }
     commits = subprocess.check_output(['git', 'log', '--format=%aN'])
     authors = [corrections.get(author, author)

From ae00dac0be3878eb362d5ea35ef0466b9d66689e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 23 Nov 2015 13:27:52 +0100
Subject: [PATCH 104/104] Update changelog.

---
 CHANGELOG.asciidoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 51a90d33a..064aa5456 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -53,6 +53,8 @@ Added
 - qutebrowser now uses `~/.netrc` if available to authenticate via HTTP.
 - New `:fake-key` command to send a fake keypress to a website or to
   qutebrowser.
+- New `--mhtml` argument for `:download` to download a page including all
+  ressources as MHTML file.
 
 Changed
 ~~~~~~~
@@ -79,6 +81,8 @@ Deprecated
 
 - `:download-remove --all` is now deprecated and `:download-clear` should be
   used instead.
+- `:download <url> <destination>` is now deprecated and
+  `:download --dest <destination> <url>` should be used instead.
 
 Fixed
 ~~~~~