NEF and HEIC files upload correctly

Author: Logan Endes

gallery/file_modules/__init__.py

@@ -98,6 +98,12 @@ def generate_thumbnail(self):
 # classism
 def parse_file_info(file_path: str, dir_path: str) -> Tuple[str, Optional[FileModule]]:
     print("entering parse_file_info")
+    ext = os.path.splitext(file_path)[-1].lower()
+    # .nef is a RAW file
+    if ext == ".nef": # .nef is a special case, magic reads it as .tiff, but it is not processed correctly by the tiff module
+        print("image/x-nikon-nef")
+        print(file_path)
+        return "image/x-nikon-nef", NEFFile(file_path, dir_path)
     mime_type = magic.from_file(file_path, mime=True)
     print(mime_type)
     print(file_path)

gallery/file_modules/heic.py

@@ -1,10 +1,11 @@
 import os
-from wand.image import Image
-from wand.color import Color
+from PIL import Image as PILImage
+import pillow_heif
 
 from gallery.file_modules import FileModule
 from gallery.util import hash_file
 
+pillow_heif.register_heif_opener()
 
 class HEICFile(FileModule):
     def __init__(self, file_path, dir_path):
@@ -16,20 +17,14 @@ def __init__(self, file_path, dir_path):
     def generate_thumbnail(self):
         self.thumbnail_uuid = hash_file(self.file_path) + ".jpg"
 
-        with Image(filename=self.file_path) as img:
-            with Image(width=img.width, height=img.height, background=Color("#EEEEEE")) as bg:
-                # Fix orientation from EXIF
-                img.auto_orient()
-                # Force proper colorspace conversion
-                img.transform_colorspace('srgb')
-                # Remove alpha if present
-                img.alpha_channel = 'remove'
-                # Strip ICC/HDR metadata (prevents weird color shifts)
-                img.strip()
-                # Same process as other image types
-                bg.composite(img, 0, 0)
-                size = img.width if img.width < img.height else img.height
-                bg.crop(width=size, height=size, gravity='center')
-                bg.resize(256, 256)
-                bg.format = 'jpeg'
-                bg.save(filename=os.path.join(self.dir_path, self.thumbnail_uuid))
+        thumb_path = os.path.join(self.dir_path, self.thumbnail_uuid)
+
+        img = PILImage.open(self.file_path).convert("RGB")
+
+        size = min(img.width, img.height)
+        left = (img.width - size) // 2
+        top = (img.height - size) // 2
+        img = img.crop((left, top, left + size, top + size))
+
+        img = img.resize((256, 256))
+        img.save(thumb_path, "JPEG")

gallery/file_modules/nef.py

@@ -1,6 +1,6 @@
 import os
-from wand.image import Image
-from wand.color import Color
+import rawpy
+import imageio
 
 from gallery.file_modules import FileModule
 from gallery.util import hash_file
@@ -15,12 +15,15 @@ def __init__(self, file_path, dir_path):
 
     def generate_thumbnail(self):
         self.thumbnail_uuid = hash_file(self.file_path) + ".jpg"
+        thumb_path = os.path.join(self.dir_path, self.thumbnail_uuid)
 
-        with Image(filename=self.file_path) as img:
-            with Image(width=img.width, height=img.height, background=Color("#EEEEEE")) as bg:
-                bg.composite(img, 0, 0)
-                size = img.width if img.width < img.height else img.height
-                bg.crop(width=size, height=size, gravity='center')
-                bg.resize(256, 256)
-                bg.format = 'jpeg'
-                bg.save(filename=os.path.join(self.dir_path, self.thumbnail_uuid))
+        with rawpy.imread(self.file_path) as raw:
+            rgb = raw.postprocess(output_bps=8)
+
+            h, w, _ = rgb.shape
+            size = min(h, w)
+            y = (h - size) // 2
+            x = (w - size) // 2
+            rgb = rgb[y:y+size, x:x+size]
+
+            imageio.imwrite(thumb_path, rgb)

requirements.txt

@@ -70,3 +70,8 @@ Werkzeug==3.1.3
 wrapt==1.17.2
 xmltodict==0.14.2
 zipp==3.19.1
+# NEF and HEIC support
+pillow 
+pillow-heif 
+rawpy 
+imageio