fixes #140, now corrupt original resource favicons generate blank dat…

…a URIs
oduwsdl · Oct 22, 2018 · 7d3e49df37dac08f3e09a10d22c25607baba805f · 7d3e49d
1 parent 5c2a6a4
commit 7d3e49df37dac08f3e09a10d22c25607baba805f
Unified Split

Showing with 37 additions and 10 deletions.

+1 −0 .gitignore

+1 −1 docs/source/conf.py

+0 −2 mementoembed/imageselection.py

+17 −3 mementoembed/services/memento.py

+17 −3 mementoembed/services/product.py

+1 −1 mementoembed/version.py
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ dist
 *.bak
 node_modules
 _build
+  
+working-dontcommit
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-  
-release = '0.2018.10.13.195506'
+  
+release = '0.2018.10.22.185424'
 # -- General configuration ---------------------------------------------------

diff --git a/mementoembed/imageselection.py b/mementoembed/imageselection.py
@@ -32,8 +32,6 @@ def convert_imageuri_to_pngdata_uri(imageuri, httpcache, width, height=None):
    else:
        ifp = io.BytesIO(imagedata)
-  
-    module_logger.debug("CONVERTING IMAGEURI TO PNGDATA URI")
-  
-
    im = Image.open(ifp)
    im_width, im_height = im.size

diff --git a/mementoembed/services/memento.py b/mementoembed/services/memento.py
@@ -61,9 +61,23 @@ def originaldata(urim, preferences):
    originalresource = OriginalResource(memento, httpcache)
    if preferences['datauri_favicon'].lower() == 'yes':
-  
-        original_favicon = convert_imageuri_to_pngdata_uri(
-  
-            originalresource.favicon, httpcache, 16, 16
-  
-        )
+  
+
+  
+        try:
+  
+            original_favicon = convert_imageuri_to_pngdata_uri(
+  
+                originalresource.favicon, httpcache, 16, 16
+  
+            )
+  
+        except ValueError as e:
+  
+
+  
+            module_logger.exception(
+  
+                "an error occurred while generating a data URI for an original resource favicon"
+  
+                )
+  
+
+  
+            if str(e) == "not enough image data":
+  
+                original_favicon=""
+  
+
+  
+            else:
+  
+                raise e
+  
+
    else:
        original_favicon = originalresource.favicon

diff --git a/mementoembed/services/product.py b/mementoembed/services/product.py
@@ -107,9 +107,23 @@ def generate_socialcard_response(urim, preferences):
            )
    if preferences['datauri_favicon'].lower() == 'yes':
-  
-        original_favicon_uri = convert_imageuri_to_pngdata_uri(
-  
-            original_favicon_uri, httpcache, 16, 16
-  
-        )
+  
+        try:
+  
+            original_favicon_uri = convert_imageuri_to_pngdata_uri(
+  
+                original_favicon_uri, httpcache, 16, 16
+  
+            )
+  
+        except ValueError as e:
+  
+
+  
+            module_logger.exception(
+  
+                "an error occurred while generating a data URI for an original resource favicon"
+  
+                )
+  
+
+  
+            if str(e) == "not enough image data":
+  
+                module_logger.error("the original favicon URI is being replaced with blank")
+  
+                original_favicon_uri=""
+  
+
+  
+            else:
+  
+                raise e
+  
+
        archive_favicon_uri = convert_imageuri_to_pngdata_uri(
            archive_favicon_uri, httpcache, 16, 16
        )

diff --git a/mementoembed/version.py b/mementoembed/version.py
@@ -1,3 +1,3 @@
 __appname__ = "MementoEmbed"
-  
-__appversion__ = '0.2018.10.13.195506'
+  
+__appversion__ = '0.2018.10.22.185424'
 __useragent__ = "{}/{}".format(__appname__, __appversion__)