From 6e1e1d12ceffc9855cd05fd4d653fb7406e9fa19 Mon Sep 17 00:00:00 2001
From: Googol Lee <i@googol.im>
Date: Mon, 2 Sep 2024 22:12:00 +0200
Subject: [PATCH] Update to magick 7 in alpine. (#1035)

---
 .../executable_worker/executable_worker.go            | 11 ++++++-----
 .../{magic_worker_test.go => magick_worker_test.go}   |  2 +-
 .../testdata/bin/{convert => magick}                  |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename api/scanner/media_encoding/executable_worker/{magic_worker_test.go => magick_worker_test.go} (95%)
 rename api/scanner/media_encoding/executable_worker/testdata/bin/{convert => magick} (64%)

diff --git a/api/scanner/media_encoding/executable_worker/executable_worker.go b/api/scanner/media_encoding/executable_worker/executable_worker.go
index c28e716b..5e9df818 100644
--- a/api/scanner/media_encoding/executable_worker/executable_worker.go
+++ b/api/scanner/media_encoding/executable_worker/executable_worker.go
@@ -37,17 +37,17 @@ func newMagickWorker() *MagickWorker {
 		return nil
 	}
 
-	path, err := exec.LookPath("convert")
+	path, err := exec.LookPath("magick")
 	if err != nil {
-		log.Println("Executable worker not found: ImageMagick convert")
+		log.Println("Executable worker not found: magick")
 	} else {
-		version, err := exec.Command(path, "--version").Output()
+		version, err := exec.Command(path, "-version").Output()
 		if err != nil {
-			log.Printf("Error getting version of ImageMagick convert: %s\n", err)
+			log.Printf("Error getting version of magick: %s\n", err)
 			return nil
 		}
 
-		log.Printf("Found executable worker: ImageMagick convert (%s)\n", strings.Split(string(version), "\n")[0])
+		log.Printf("Found executable worker: magick (%s)\n", strings.Split(string(version), "\n")[0])
 
 		return &MagickWorker{
 			path: path,
@@ -93,6 +93,7 @@ func (worker *FfmpegWorker) IsInstalled() bool {
 
 func (worker *MagickWorker) EncodeJpeg(inputPath string, outputPath string, jpegQuality int) error {
 	args := []string{
+		"convert",
 		inputPath,
 		"-quality", fmt.Sprintf("%d", jpegQuality),
 		outputPath,
diff --git a/api/scanner/media_encoding/executable_worker/magic_worker_test.go b/api/scanner/media_encoding/executable_worker/magick_worker_test.go
similarity index 95%
rename from api/scanner/media_encoding/executable_worker/magic_worker_test.go
rename to api/scanner/media_encoding/executable_worker/magick_worker_test.go
index dce9b8e0..b47c8262 100644
--- a/api/scanner/media_encoding/executable_worker/magic_worker_test.go
+++ b/api/scanner/media_encoding/executable_worker/magick_worker_test.go
@@ -49,7 +49,7 @@ func TestMagickWorker(t *testing.T) {
 		if err == nil {
 			t.Fatalf("MagickCli.EncodeJpeg(\"input\", \"output\", 0) = nil, should be an error.")
 		}
-		if got, want := err.Error(), "^encoding image with \".*?/testdata/bin/convert .*?\" error: .*$"; !regexp.MustCompile(want).MatchString(got) {
+		if got, want := err.Error(), "^encoding image with \".*?/testdata/bin/magick .*?\" error: .*$"; !regexp.MustCompile(want).MatchString(got) {
 			t.Errorf("MagickCli.EncodeJpeg(\"input\", \"output\", 0) = %q, should be as reg pattern %q", got, want)
 		}
 	})
diff --git a/api/scanner/media_encoding/executable_worker/testdata/bin/convert b/api/scanner/media_encoding/executable_worker/testdata/bin/magick
similarity index 64%
rename from api/scanner/media_encoding/executable_worker/testdata/bin/convert
rename to api/scanner/media_encoding/executable_worker/testdata/bin/magick
index 7bcd96fd..8152a4be 100755
--- a/api/scanner/media_encoding/executable_worker/testdata/bin/convert
+++ b/api/scanner/media_encoding/executable_worker/testdata/bin/magick
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 case "$1" in
-  "--version")
+  "-version")
       echo convert: version fake
       ;;
 esac
 
 echo $@
-if [ "$3" = "0" ] # quality parameter
+if [ "$4" = "0" ] # quality parameter
 then
   exit -1
 fi