From ceb8c4103f41c2ca1884e506fea5c895b1c67c17 Mon Sep 17 00:00:00 2001
From: viktorstrate <viktorstrate@gmail.com>
Date: Sat, 3 Apr 2021 21:39:32 +0200
Subject: [PATCH] Fix exiftool detection

---
 api/scanner/exif/exif.go | 25 +++++++++++++++++++------
 api/server.go            |  3 +++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/api/scanner/exif/exif.go b/api/scanner/exif/exif.go
index 2980d8a5..082f26c4 100644
--- a/api/scanner/exif/exif.go
+++ b/api/scanner/exif/exif.go
@@ -14,6 +14,22 @@ type exifParser interface {
 	ParseExif(media *models.Media) (*models.MediaEXIF, error)
 }
 
+var use_exiftool bool = false
+
+func InitializeEXIFParser() {
+	// Decide between internal or external Exif parser
+	et, err := exiftool.NewExiftool()
+
+	if err != nil {
+		use_exiftool = false
+		log.Printf("Failed to get exiftool, using internal exif parser instead: %v\n", err)
+	} else {
+		et.Close()
+		log.Println("Found exiftool")
+		use_exiftool = true
+	}
+}
+
 // SaveEXIF scans the media file for exif metadata and saves it in the database if found
 func SaveEXIF(tx *gorm.DB, media *models.Media) (*models.MediaEXIF, error) {
 
@@ -32,14 +48,11 @@ func SaveEXIF(tx *gorm.DB, media *models.Media) (*models.MediaEXIF, error) {
 		}
 	}
 
-	// Decide between internal or external Exif parser
-	et, err := exiftool.NewExiftool()
-	et.Close()
 	var parser exifParser
-	if err != nil {
-		parser = &internalExifParser{}
-	} else {
+	if use_exiftool {
 		parser = &externalExifParser{}
+	} else {
+		parser = &internalExifParser{}
 	}
 
 	exif, err := parser.ParseExif(media)
diff --git a/api/server.go b/api/server.go
index e6380aa9..c423d336 100644
--- a/api/server.go
+++ b/api/server.go
@@ -16,6 +16,7 @@ import (
 	"github.com/photoview/photoview/api/graphql/dataloader"
 	"github.com/photoview/photoview/api/routes"
 	"github.com/photoview/photoview/api/scanner"
+	"github.com/photoview/photoview/api/scanner/exif"
 	"github.com/photoview/photoview/api/scanner/face_detection"
 	"github.com/photoview/photoview/api/server"
 	"github.com/photoview/photoview/api/utils"
@@ -55,6 +56,8 @@ func main() {
 
 	scanner.InitializeExecutableWorkers()
 
+	exif.InitializeEXIFParser()
+
 	if err := face_detection.InitializeFaceDetector(db); err != nil {
 		log.Panicf("Could not initialize face detector: %s\n", err)
 	}