feat: support for m4a and mov, with some heic files supported, and nef in progress

Author: Logan Endes

Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Computer Science House <rtp@csh.rit.edu>
 ENV IMAGEIO_USERDIR /var/lib/gallery
 
 RUN apt-get update && \
-    apt-get install -y libldap-dev libsasl2-dev libmagic-dev ghostscript libldap-common && \
+    apt-get install -y libldap-dev libsasl2-dev libmagic-dev ghostscript libldap-common imagemagick libheif1 libheif-dev libraw-dev libraw20 dcraw && \ 
     apt-get autoremove --yes && \
     apt-get clean autoclean && \
     sed -i \

gallery/file_modules/__init__.py

@@ -65,6 +65,10 @@ def generate_thumbnail(self):
 from gallery.file_modules.txt import TXTFile
 from gallery.file_modules.mp3 import MP3File
 from gallery.file_modules.wav import WAVFile
+from gallery.file_modules.heic import HEICFile
+from gallery.file_modules.nef import NEFFile
+from gallery.file_modules.mov import MOVFile
+from gallery.file_modules.m4a import M4AFile
 
 file_mimetype_relation = {
     "image/jpeg": JPEGFile,
@@ -76,13 +80,18 @@ def generate_thumbnail(self):
     "image/x-windows-bmp": BMPFile,
     "image/tiff": TIFFFile,
     "image/x-tiff": TIFFFile,
+    "image/heic": HEICFile,
+    "image/x-nikon-nef": NEFFile,
     "video/mp4": MP4File,
     "video/webm": WebMFile,
     "video/ogg": OggFile,
+    "video/quicktime": MOVFile,
     "application/pdf": PDFFile,
     "text/plain": TXTFile,
     "audio/mpeg": MP3File,
-    "audio/x-wav": WAVFile
+    "audio/x-wav": WAVFile,
+    "audio/mp4": M4AFile,
+    "audio/x-m4a": M4AFile,
 }
 
 

gallery/file_modules/heic.py

@@ -0,0 +1,35 @@
+import os
+from wand.image import Image
+from wand.color import Color
+
+from gallery.file_modules import FileModule
+from gallery.util import hash_file
+
+
+class HEICFile(FileModule):
+    def __init__(self, file_path, dir_path):
+        FileModule.__init__(self, file_path, dir_path)
+        self.mime_type = "image/heic"
+
+        self.generate_thumbnail()
+
+    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))

gallery/file_modules/m4a.py

@@ -0,0 +1,18 @@
+import os
+from wand.image import Image
+
+from gallery.file_modules import FileModule
+from gallery.util import hash_file
+
+class M4AFile(FileModule):
+    def __init__(self, file_path, dir_path):
+        FileModule.__init__(self, file_path, dir_path)
+        self.mime_type = "audio/mp4"
+
+        self.generate_thumbnail()
+
+    def generate_thumbnail(self):
+        self.thumbnail_uuid = hash_file(self.file_path) + ".jpg"
+
+        with Image(filename="thumbnails/reedphoto.jpg") as bg:
+                bg.save(filename=os.path.join(self.dir_path, self.thumbnail_uuid))

gallery/file_modules/mov.py

@@ -0,0 +1,33 @@
+from moviepy.editor import VideoFileClip
+import os
+from wand.image import Image
+from wand.color import Color
+
+from gallery.file_modules import FileModule
+from gallery.util import hash_file
+
+
+class MOVFile(FileModule):
+
+    def __init__(self, file_path, dir_path):
+        FileModule.__init__(self, file_path, dir_path)
+        self.mime_type = "video/quicktime"
+
+        self.generate_thumbnail()
+
+    def generate_thumbnail(self):
+        self.thumbnail_uuid = hash_file(self.file_path) + ".jpg"
+        thumbnail_loc = os.path.join(self.dir_path, self.thumbnail_uuid)
+
+        clip = VideoFileClip(self.file_path)
+        time_mark = clip.duration * 0.05
+        clip.save_frame(thumbnail_loc, t=time_mark)
+
+        with Image(filename=thumbnail_loc) as img:
+            with img.clone() as image:
+                size = image.width if image.width < image.height else image.height
+                image.crop(width=size, height=size, gravity='center')
+                image.resize(256, 256)
+                image.background_color = Color("#EEEEEE")
+                image.format = 'jpeg'
+                image.save(filename=thumbnail_loc)

gallery/file_modules/nef.py

@@ -0,0 +1,26 @@
+import os
+from wand.image import Image
+from wand.color import Color
+
+from gallery.file_modules import FileModule
+from gallery.util import hash_file
+
+
+class NEFFile(FileModule):
+    def __init__(self, file_path, dir_path):
+        FileModule.__init__(self, file_path, dir_path)
+        self.mime_type = "image/x-nikon-nef"
+
+        self.generate_thumbnail()
+
+    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:
+                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))