mirror of
https://github.com/beetbox/beets.git
synced 2026-01-07 16:34:45 +01:00
ImageMagick check uses convert, not identify
See #670 for details. This reverts a change from
a0c38a07a6. This caused problems on
Windows, but the fundamental problem is more general.
This commit is contained in:
parent
9204604a7c
commit
e346c28886
2 changed files with 6 additions and 4 deletions
|
|
@ -231,9 +231,10 @@ class ArtResizer(object):
|
|||
|
||||
def get_im_version():
|
||||
"""Return Image Magick version or None if it is unavailable
|
||||
Try invoking ImageMagick's "convert"."""
|
||||
Try invoking ImageMagick's "convert".
|
||||
"""
|
||||
try:
|
||||
out = util.command_output([b'identify', b'--version'])
|
||||
out = util.command_output([b'convert', b'--version'])
|
||||
|
||||
if b'imagemagick' in out.lower():
|
||||
pattern = br".+ (\d+)\.(\d+)\.(\d+).*"
|
||||
|
|
@ -244,7 +245,8 @@ def get_im_version():
|
|||
int(match.group(3)))
|
||||
return (0,)
|
||||
|
||||
except (subprocess.CalledProcessError, OSError):
|
||||
except (subprocess.CalledProcessError, OSError) as exc:
|
||||
log.debug(u'ImageMagick check `convert --version` failed: {}', exc)
|
||||
return None
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ def require_artresizer_compare(test):
|
|||
|
||||
def wrapper(*args, **kwargs):
|
||||
if not ArtResizer.shared.can_compare:
|
||||
raise unittest.SkipTest()
|
||||
raise unittest.SkipTest("compare not available")
|
||||
else:
|
||||
return test(*args, **kwargs)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue