fixes #139, now SVG favicons can be converted into data URIs

oduwsdl · Oct 22, 2018 · 5c2a6a40b91a964d9518732c01b4b1995e771581 · 5c2a6a4
1 parent 7bf83c2
commit 5c2a6a40b91a964d9518732c01b4b1995e771581
Unified Split

Showing with 124 additions and 12 deletions.

+3 −0 Pipfile

+107 −10 Pipfile.lock

+1 −1 config/default.py

+13 −1 mementoembed/imageselection.py
diff --git a/Pipfile b/Pipfile
@@ -19,6 +19,9 @@ Pillow = "==5.1.0"
 sphinx = "*"
 sphinx-rtd-theme = "*"
 Brotli = "==1.0.4"
+  
+cairosvg = "*"
+  
+python-magic = "*"
+  
+pycairo = "*"
 [dev-packages]

diff --git a/Pipfile.lock b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-  
-            "sha256": "a9b514083104b9493f74f8bdea013d57197e86b2b28150a8d63594c9e482363a"
+  
+            "sha256": "038f19707c9aa5c07139ac2eac9f2ddda890fab69cecc4ccc59af8027a8334e1"
        },
        "pipfile-spec": 6,
        "requires": {
@@ -80,12 +80,65 @@
            ],
            "version": "==0.0.1"
        },
-  
-        "certifi": {
+  
+        "cairocffi": {
+  
+            "hashes": [
+  
+                "sha256:15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337"
+  
+            ],
+  
+            "markers": "python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.3.*' and python_version >= '2.7'",
+  
+            "version": "==0.9.0"
+  
+        },
+  
+        "cairosvg": {
            "hashes": [
-  
-                "sha256:376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638",
-  
-                "sha256:456048c7e371c089d0a77a5212fb37a2c2dce1e24146e3b7e0261736aaeaa22a"
+  
+                "sha256:93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14",
+  
+                "sha256:f331e6024ee4c7f3eca3b0caa909dd893fa4d7414f50a6b206acbe2df20d95a9"
            ],
-  
-            "version": "==2018.8.24"
+  
+            "index": "pypi",
+  
+            "version": "==2.2.1"
+  
+        },
+  
+        "certifi": {
+  
+            "hashes": [
+  
+                "sha256:339dc09518b07e2fa7eda5450740925974815557727d6bd35d319c1524a04a4c",
+  
+                "sha256:6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a"
+  
+            ],
+  
+            "version": "==2018.10.15"
+  
+        },
+  
+        "cffi": {
+  
+            "hashes": [
+  
+                "sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743",
+  
+                "sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef",
+  
+                "sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50",
+  
+                "sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f",
+  
+                "sha256:3bb6bd7266598f318063e584378b8e27c67de998a43362e8fce664c54ee52d30",
+  
+                "sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93",
+  
+                "sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257",
+  
+                "sha256:495c5c2d43bf6cebe0178eb3e88f9c4aa48d8934aa6e3cddb865c058da76756b",
+  
+                "sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3",
+  
+                "sha256:57b2533356cb2d8fac1555815929f7f5f14d68ac77b085d2326b571310f34f6e",
+  
+                "sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc",
+  
+                "sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04",
+  
+                "sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6",
+  
+                "sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359",
+  
+                "sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596",
+  
+                "sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b",
+  
+                "sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd",
+  
+                "sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95",
+  
+                "sha256:a6a5cb8809091ec9ac03edde9304b3ad82ad4466333432b16d78ef40e0cce0d5",
+  
+                "sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e",
+  
+                "sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6",
+  
+                "sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca",
+  
+                "sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31",
+  
+                "sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1",
+  
+                "sha256:ca1bd81f40adc59011f58159e4aa6445fc585a32bb8ac9badf7a2c1aa23822f2",
+  
+                "sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085",
+  
+                "sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801",
+  
+                "sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4",
+  
+                "sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184",
+  
+                "sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917",
+  
+                "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f",
+  
+                "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb"
+  
+            ],
+  
+            "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.0.*'",
+  
+            "version": "==1.11.5"
        },
        "chardet": {
            "hashes": [
@@ -110,6 +163,20 @@
            "markers": "python_version >= '2.7' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*'",
            "version": "==1.0.3"
        },
+  
+        "cssselect2": {
+  
+            "hashes": [
+  
+                "sha256:267eebc7378ade2e8be710cd0179606ad9c95ecc673138fccfcfba42c5ce153d",
+  
+                "sha256:505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab"
+  
+            ],
+  
+            "version": "==0.2.1"
+  
+        },
+  
+        "defusedxml": {
+  
+            "hashes": [
+  
+                "sha256:24d7f2f94f7f3cb6061acb215685e5125fbcdc40a857eff9de22518820b0a4f4",
+  
+                "sha256:702a91ade2968a82beb0db1e0766a6a273f33d4616a6ce8cde475d8e09853b20"
+  
+            ],
+  
+            "version": "==0.5.0"
+  
+        },
        "dicttoxml": {
            "hashes": [
                "sha256:ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45"
@@ -165,9 +232,11 @@
        },
        "itsdangerous": {
            "hashes": [
-  
-                "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"
+  
+                "sha256:a7de3201740a857380421ef286166134e10fe58846bcefbc9d6424a69a0b99ec",
+  
+                "sha256:aca4fc561b7671115a2156f625f2eaa5e0e3527e0adf2870340e7968c0a81f85"
            ],
-  
-            "version": "==0.24"
+  
+            "markers": "python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.3.*' and python_version >= '2.7'",
+  
+            "version": "==1.0.0"
        },
        "jinja2": {
            "hashes": [
@@ -267,6 +336,20 @@
            "markers": "python_version >= '2.7' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*'",
            "version": "==5.1.0"
        },
+  
+        "pycairo": {
+  
+            "hashes": [
+  
+                "sha256:0f0a35ec923d87bc495f6753b1e540fd046d95db56a35250c44089fbce03b698"
+  
+            ],
+  
+            "index": "pypi",
+  
+            "version": "==1.17.1"
+  
+        },
+  
+        "pycparser": {
+  
+            "hashes": [
+  
+                "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"
+  
+            ],
+  
+            "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.0.*'",
+  
+            "version": "==2.19"
+  
+        },
        "pygments": {
            "hashes": [
                "sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d",
@@ -282,6 +365,14 @@
            "markers": "python_version != '3.0.*' and python_version >= '2.6' and python_version != '3.2.*' and python_version != '3.1.*'",
            "version": "==2.2.2"
        },
+  
+        "python-magic": {
+  
+            "hashes": [
+  
+                "sha256:f2674dcfad52ae6c49d4803fa027809540b130db1dec928cfbb9240316831375",
+  
+                "sha256:f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5"
+  
+            ],
+  
+            "index": "pypi",
+  
+            "version": "==0.4.15"
+  
+        },
        "pytz": {
            "hashes": [
                "sha256:a061aa0a9e06881eb8b3b2b43f05b9439d6583c206d0a6c340ff72a7b6669053",
@@ -329,10 +420,9 @@
        },
        "requests-futures": {
            "hashes": [
-  
-                "sha256:a9ca2c3480b6fac29ec5de59c146742e2ab2b60f8c68581766094edb52ea7bad"
+  
+                "sha256:76a22b95723267b53d8cc50e54d00b98d95afa02fd8449501b07a3797f46a96d"
            ],
-  
-            "markers": "python_version >= '2.6' and python_version < '4' and python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.1.*'",
-  
-            "version": "==0.9.7"
+  
+            "version": "==0.9.8"
        },
        "six": {
            "hashes": [
@@ -372,6 +462,13 @@
            "markers": "python_version >= '2.7' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*'",
            "version": "==1.1.0"
        },
+  
+        "tinycss2": {
+  
+            "hashes": [
+  
+                "sha256:5e881eaa263bf4dc5c050d43cd6d2203ade1e3a3cda61f5511cf878972e83b78",
+  
+                "sha256:7c53c2c0e914c7711c295b3101bcc78e0b7eda23ff20228a936efe11cdcc7136"
+  
+            ],
+  
+            "version": "==0.6.1"
+  
+        },
        "tldextract": {
            "hashes": [
                "sha256:29797125db1f2e72ce2ee51f7a764ec8b1e6588812520795ffeae93bcd46bab4",

diff --git a/config/default.py b/config/default.py
@@ -1,5 +1,5 @@
 CACHEENGINE = 'SQLite'
-  
-LOGLEVEL = "DEBUG"
+  
+APPLICATION_LOGLEVEL = "DEBUG"
 REQUEST_TIMEOUT = 15
 APPLICATION_LOGFILE = '/tmp/mementoembed/mementoembed-application.log'
 ACCESS_LOGFILE = "/tmp/mementoembed/mementoembed-access.log"

diff --git a/mementoembed/imageselection.py b/mementoembed/imageselection.py
@@ -3,6 +3,9 @@
 import traceback
 import io
+  
+import cairosvg
+  
+import magic
+  
+
 from base64 import binascii
 from urllib.parse import urljoin, urlparse
@@ -20,7 +23,16 @@ def convert_imageuri_to_pngdata_uri(imageuri, httpcache, width, height=None):
    response = httpcache.get(imageuri)
    imagedata = response.content
-  
-    ifp = io.BytesIO(imagedata)
+  
+    module_logger.debug("image detected as {}".format(magic.from_buffer( imagedata) ))
+  
+
+  
+    if magic.from_buffer( imagedata ) == 'SVG Scalable Vector Graphics image':
+  
+        module_logger.debug("converting image at {} from SVG to PNG".format(imageuri))
+  
+        imagedata = cairosvg.svg2png( imagedata )
+  
+        ifp = io.BytesIO( imagedata )
+  
+    else:
+  
+        ifp = io.BytesIO(imagedata)
+  
+
+  
+    module_logger.debug("CONVERTING IMAGEURI TO PNGDATA URI")
    im = Image.open(ifp)