Merge branch 'dev'

helgeerbe · Jun 12, 2023 · 3b25036 · 3b25036
2 parents a98ccbe + b4ccc0f
commit 3b25036
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/picframe/get_image_meta.py b/src/picframe/get_image_meta.py
@@ -1,11 +1,14 @@
 import logging
 from PIL import Image
 from PIL.ExifTags import TAGS, GPSTAGS
-from pi_heif import register_heif_opener
 from fractions import Fraction
 
+try:
+    from pi_heif import register_heif_opener
 
-register_heif_opener()
+    register_heif_opener()
+except ImportError:
+    register_heif_opener = None
 
 
 class GetImageMeta:

diff --git a/src/picframe/interface_http.py b/src/picframe/interface_http.py
@@ -13,15 +13,25 @@
     from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer  # py2
     import urlparse
 
-EXTENSIONS = [".jpg", ".jpeg", ".png", ".heif", ".heic"]
+try:
+    from pi_heif import register_heif_opener
+except ImportError:
+    register_heif_opener = None
+
+EXTENSIONS = [".jpg", ".jpeg", ".png"]
+if register_heif_opener is not None:
+    EXTENSIONS += [".heif", ".heic"]
 
 
 def heif_to_jpg(fname):
     try:
         from PIL import Image
-        from pi_heif import register_heif_opener
+        try:
+            from pi_heif import register_heif_opener
+            register_heif_opener()
+        except ImportError:
+            register_heif_opener = None
 
-        register_heif_opener()
         image = Image.open(fname)
         if image.mode not in ("RGB", "RGBA"):
             image = image.convert("RGB")