From 6d75ec60bf7f6efeb7b34f2731254280f9e25a63 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Sat, 27 Jan 2024 18:07:49 +0100 Subject: gallery: go back to ImageMagick v6 To cater to Debian. --- README.adoc | 4 +++- main.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index dbfa4a7..05696af 100644 --- a/README.adoc +++ b/README.adoc @@ -8,7 +8,9 @@ and query your collections in various ways. All media is content-addressed by its SHA-1 hash value, and at your option also perceptually hashed. Duplicate search is an essential feature. -Prerequisites: Go, ImageMagick v7, xdg-utils +Prerequisites: Go, ImageMagick, xdg-utils + +ImageMagick v7 is preferred, it doesn't shoot out of memory as often. The gallery is designed for simplicity, and easy interoperability. sqlite3, curl, jq, and the filesystem will take you a long way. diff --git a/main.go b/main.go index 5c075bd..c4f222e 100644 --- a/main.go +++ b/main.go @@ -1377,7 +1377,7 @@ func syncIsImage(path string) (bool, error) { } func syncPingImage(path string) (int, int, error) { - out, err := exec.Command("magick", "identify", "-limit", "thread", "1", + out, err := exec.Command("identify", "-limit", "thread", "1", "-ping", "-format", "%w %h", path+"[0]").Output() if err != nil { return 0, 0, err @@ -2321,7 +2321,7 @@ func makeThumbnail(load bool, pathImage, pathThumb string) ( // // TODO: See if we can optimize resulting WebP animations. // (Do -layers optimize* apply to this format at all?) - cmd := exec.Command("magick", "-limit", "thread", "1", + cmd := exec.Command("convert", "-limit", "thread", "1", // Do not invite the OOM killer, a particularly unpleasant guest. "-limit", "memory", memoryLimit, -- cgit v1.2.3-70-g09d2