From 9cf455f699d20a3412c899b1bb008fbbe3dfb08a Mon Sep 17 00:00:00 2001
From: viktorstrate <viktorstrate@gmail.com>
Date: Sun, 2 Feb 2020 21:44:09 +0100
Subject: [PATCH] Add support for cr2 raw format

---
 api/go.mod                   | 2 ++
 api/go.sum                   | 4 ++++
 api/scanner/process_image.go | 8 ++++++++
 api/scanner/scanner.go       | 5 +++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/api/go.mod b/api/go.mod
index daccacb7..47b0366f 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -10,7 +10,9 @@ require (
 	github.com/h2non/filetype v1.0.10
 	github.com/joho/godotenv v1.3.0
 	github.com/lib/pq v1.3.0
+	github.com/nf/cr2 v0.0.0-20180623103828-4699471a17ed
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/vektah/gqlparser v1.2.0
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
+	golang.org/x/image v0.0.0-20200119044424-58c23975cae1
 )
diff --git a/api/go.sum b/api/go.sum
index 1b879df3..97cf279d 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -28,6 +28,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/nf/cr2 v0.0.0-20180623103828-4699471a17ed h1:QP63yO3XEt8tJ1DgBsNjbOyBGjy2eHy9ITK4Eisr9rg=
+github.com/nf/cr2 v0.0.0-20180623103828-4699471a17ed/go.mod h1:HazDB3gS/i//QXMMRmTAV7Ni9gAi4mDNTH2HjZ5aVgU=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -50,6 +52,8 @@ github.com/vektah/gqlparser v1.2.0/go.mod h1:bkVf0FX+Stjg/MHnm8mEyubuaArhNEqfQhF
 github.com/viktorstrate/photoview v0.0.0-20200119220544-691e4c7dc433 h1:n6jGnDctC9HI7B1rnc5ATQPYaaxQaJtS8bI6oI0QV34=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/image v0.0.0-20200119044424-58c23975cae1 h1:5h3ngYt7+vXCDZCup/HkCQgW5XwmSvR/nA2JmJ0RErg=
+golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/api/scanner/process_image.go b/api/scanner/process_image.go
index 1f8a0b08..88838ac0 100644
--- a/api/scanner/process_image.go
+++ b/api/scanner/process_image.go
@@ -11,6 +11,14 @@ import (
 	"strconv"
 
 	"github.com/nfnt/resize"
+
+	// Image decoders
+	_ "golang.org/x/image/bmp"
+	// _ "golang.org/x/image/tiff"
+	_ "github.com/nf/cr2"
+	_ "golang.org/x/image/webp"
+	_ "image/gif"
+	_ "image/png"
 )
 
 func ProcessImage(tx *sql.Tx, photoPath string, albumId int) error {
diff --git a/api/scanner/scanner.go b/api/scanner/scanner.go
index 86a85ca9..081b26ba 100644
--- a/api/scanner/scanner.go
+++ b/api/scanner/scanner.go
@@ -156,8 +156,9 @@ func directoryContainsPhotos(rootPath string) bool {
 var supported_mimetypes = [...]string{
 	"image/jpeg",
 	"image/png",
-	// "image/tiff",
-	// "image/x-canon-cr2",
+	"image/tiff",
+	"image/webp",
+	"image/x-canon-cr2",
 	"image/bmp",
 }