From a873a191b9d25236774cec82df2ceb6399ed4ce3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Jul 2023 18:19:56 +0200 Subject: [PATCH 1/3] Define colorspaces for imagemagick comparison ImageMagick 7.1.1-12 changed the default colorspaces used by the PHASH compare function from sRGB,HCLp to xyY,HSB. This breaks the current code for comparisons, so let's define the colorspaces ourselves. Signed-off-by: Sefa Eyeoglu --- beets/util/artresizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py index 225280a94..0082b1220 100644 --- a/beets/util/artresizer.py +++ b/beets/util/artresizer.py @@ -256,7 +256,7 @@ class IMBackend(LocalBackend): '-colorspace', 'gray', 'MIFF:-' ] compare_cmd = self.compare_cmd + [ - '-metric', 'PHASH', '-', 'null:', + '-define', 'phash:colorspaces=sRGB,HCLp', '-metric', 'PHASH', '-', 'null:', ] log.debug('comparing images with pipeline {} | {}', convert_cmd, compare_cmd) From 11c13a8ea031c8a9d54e8068fd55fb8a80ede190 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Jul 2023 18:33:08 +0200 Subject: [PATCH 2/3] Add imagick 7.1.1-12 support to changelog Signed-off-by: Sefa Eyeoglu --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 26c917887..30b79901e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -172,6 +172,8 @@ Bug fixes: * :doc:`plugins/lyrics`: Fixed issue with Tekstowo backend not actually checking if the found song matches. :bug:`4406` +* :doc:`plugins/embedart`: Add support for ImageMagick 7.1.1-12 + :bug:`4836` * :doc:`/plugins/fromfilename`: Fix failed detection of filename patterns. :bug:`4561` :bug:`4600` From 17b341abea44f3b6725e855ef2b3d524f13deb6a Mon Sep 17 00:00:00 2001 From: Adrian Sampson <adrian@radbox.org> Date: Wed, 5 Jul 2023 09:46:17 -0700 Subject: [PATCH 3/3] Wrap a long line --- beets/util/artresizer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py index 0082b1220..d81902315 100644 --- a/beets/util/artresizer.py +++ b/beets/util/artresizer.py @@ -256,7 +256,8 @@ class IMBackend(LocalBackend): '-colorspace', 'gray', 'MIFF:-' ] compare_cmd = self.compare_cmd + [ - '-define', 'phash:colorspaces=sRGB,HCLp', '-metric', 'PHASH', '-', 'null:', + '-define', 'phash:colorspaces=sRGB,HCLp', + '-metric', 'PHASH', '-', 'null:', ] log.debug('comparing images with pipeline {} | {}', convert_cmd, compare_cmd)