From ff7e09098a797483092536c22b7442f39bf6ab36 Mon Sep 17 00:00:00 2001
From: matthiasmiller <matthiasmiller@users.noreply.github.com>
Date: Mon, 25 Feb 2019 21:12:01 -0700
Subject: [PATCH 1/3] Convert <source> tags.

---
 htmlark.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htmlark.py b/htmlark.py
index 02c2918..9ddfd08 100755
--- a/htmlark.py
+++ b/htmlark.py
@@ -101,7 +101,8 @@ def make_data_uri(mimetype: str, data: bytes) -> str:
 def convert_page(page_path: str, parser: str='auto',
                  callback: Callable[[str, str, str], None]=lambda *_: None,
                  ignore_errors: bool=False, ignore_images: bool=False,
-                 ignore_css: bool=False, ignore_js: bool=False) -> str:
+                 ignore_css: bool=False, ignore_js: bool=False,
+                 ignore_source: bool=False) -> str:
     """Take an HTML file or URL and outputs new HTML with resources as data URIs.
 
     Parameters:
@@ -120,6 +121,8 @@ def convert_page(page_path: str, parser: str='auto',
             Default: ``False``
         ignore_js (bool): If ``True`` do not process ``<script>`` tags.
             Default: ``False``
+        ignore_source (bool): If ``True`` do not process ``<source>`` tags.
+            Default: ``False``
         callback (function): Called before a new resource is processed. Takes
             three parameters: message type ('INFO' or 'ERROR'), a string with
             the category of the callback (usually the tag related to the
@@ -196,6 +199,11 @@ def convert_page(page_path: str, parser: str='auto',
         for script in scripttags:
             if 'src' in script.attrs:
                 tags.append(script)
+    if not ignore_source:
+        sourcetags = soup('source')
+        for source in sourcetags:
+            if 'src' in source.attrs:
+                tags.append(source)
 
     # Convert the linked resources
     for tag in tags:

From b4d9bcf7567a7e730297c8e81f2c64886c92d0bc Mon Sep 17 00:00:00 2001
From: matthiasmiller <matthiasmiller@users.noreply.github.com>
Date: Wed, 27 Feb 2019 10:15:44 -0700
Subject: [PATCH 2/3] Add support for file: URLs.

---
 htmlark.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/htmlark.py b/htmlark.py
index 9ddfd08..27a18e2 100755
--- a/htmlark.py
+++ b/htmlark.py
@@ -11,6 +11,8 @@
 from urllib.parse import quote
 from urllib.parse import urljoin
 from urllib.parse import urlparse
+from urllib.request import pathname2url
+from urllib.request import url2pathname
 
 import bs4
 # Import requests if available, dummy it if not
@@ -41,6 +43,10 @@ def get_available_parsers():
     return available
 
 
+def path2uri(path):
+    return urljoin('file:', pathname2url(path))
+
+
 def _get_resource(resource_url: str) -> (str, bytes):
     """Download or reads a file (online or local).
 
@@ -64,11 +70,18 @@ def _get_resource(resource_url: str) -> (str, bytes):
                 mimetype = mimetypes.guess_type(resource_url)
         else:
             raise NameError("HTTP URL found but requests not available")
-    elif url_parsed.scheme == '':
-        # '' is local file
-        with open(resource_url, 'rb') as f:
+    elif url_parsed.scheme in ['', 'file']:
+        if url_parsed.scheme == 'file':
+            # Yank the scheme instead of using url_parsed.path because
+            # Windows drive letters interfere with parsing.
+            path = url2pathname(resource_url[len(url_parsed.scheme)+1:])
+        else:
+            # '' is local file.
+            path = resource_url
+
+        with open(path, 'rb') as f:
             data = f.read()
-        mimetype, _ = mimetypes.guess_type(resource_url)
+        mimetype, _ = mimetypes.guess_type(path)
     elif url_parsed.scheme == 'data':
         raise ValueError("Resource path is a data URI", url_parsed.scheme)
     else:

From e2d1b942fbef6b74aa497c1e71e675059101c67d Mon Sep 17 00:00:00 2001
From: matthiasmiller <matthiasmiller@users.noreply.github.com>
Date: Wed, 27 Feb 2019 10:38:17 -0700
Subject: [PATCH 3/3] Add a callback to support modifying resources before
 generating the data URIs.

---
 htmlark.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htmlark.py b/htmlark.py
index 27a18e2..2cf471e 100755
--- a/htmlark.py
+++ b/htmlark.py
@@ -115,7 +115,8 @@ def convert_page(page_path: str, parser: str='auto',
                  callback: Callable[[str, str, str], None]=lambda *_: None,
                  ignore_errors: bool=False, ignore_images: bool=False,
                  ignore_css: bool=False, ignore_js: bool=False,
-                 ignore_source: bool=False) -> str:
+                 ignore_source: bool=False,
+                 resource_callback: Callable[[str, str], str]=lambda m, c: c) -> str:
     """Take an HTML file or URL and outputs new HTML with resources as data URIs.
 
     Parameters:
@@ -140,6 +141,10 @@ def convert_page(page_path: str, parser: str='auto',
             three parameters: message type ('INFO' or 'ERROR'), a string with
             the category of the callback (usually the tag related to the
             message), and the message data (usually a string to be printed).
+        resource_callback (function): Callback before a new resource is processed.
+            Takes two parameters: mime_type and resource contents. Returns the
+            modified contents for the resource. This can be used to minify
+            content or compress images, for example.
     Returns:
         str: The new webpage HTML.
     Raises:
@@ -250,6 +255,7 @@ def convert_page(page_path: str, parser: str='auto',
             if not ignore_errors:
                 raise
         else:
+            tag_data = resource_callback(tag_mime, tag_data)
             encoded_resource = make_data_uri(tag_mime, tag_data)
             if tag.name == 'link':
                 tag['href'] = encoded_resource
@@ -262,7 +268,8 @@ def convert_page(page_path: str, parser: str='auto',
     soup.html.insert_after(bs4.Comment(
         "Generated by HTMLArk {}. Original URL {}".format(datetime.now(),
                                                           page_path)))
-    return str(soup)
+
+    return resource_callback('text/html', str(soup).encode()).decode()
 
 
 def _get_options():