Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-27 10:33:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix whitespace for flake8 compliance

Browse source 
Fixed various whitespace issues and a global variable reference to
comply with flake8 linting.
This commit is contained in:
ababyduck 2019-04-24 06:18:43 -07:00
parent f15f8a08f9
commit 1a6e0a7a29
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
beets/util/artresizer.py
View file

@ -93,11 +93,11 @@ def im_resize(maxwidth, path_in, path_out=None):
# than the given width while maintaining the aspect ratio # than the given width while maintaining the aspect ratio
# with regards to the height. # with regards to the height.
try: try:
cmds = (['magick'],['convert']) cmds = (['magick'], ['convert'])
cmd = cmds[0] if not im_legacy else cmds[1] cmd = cmds[0] if not im_legacy else cmds[1]
args = [util.syspath(path_in, prefix=False), args = [util.syspath(path_in, prefix=False),
'-resize', '{0}x>'.format(maxwidth), '-resize', '{0}x>'.format(maxwidth),
util.syspath(path_out, prefix=False)] util.syspath(path_out, prefix=False)]
util.command_output(cmd + args) util.command_output(cmd + args)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@ -124,7 +124,7 @@ def pil_getsize(path_in):
def im_getsize(path_in): def im_getsize(path_in):
cmds = (['magick', 'identify'],['identify']) cmds = (['magick', 'identify'], ['identify'])
cmd = cmds[0] if not im_legacy else cmds[1] cmd = cmds[0] if not im_legacy else cmds[1]
args = ['-format', '%w %h', util.syspath(path_in, prefix=False)] args = ['-format', '%w %h', util.syspath(path_in, prefix=False)]
@ -234,13 +234,16 @@ class ArtResizer(six.with_metaclass(Shareable, object)):
return WEBPROXY, (0) return WEBPROXY, (0)
im_legacy = None im_legacy = None
def get_im_version(): def get_im_version():
"""Return Image Magick version or None if it is unavailable """Return Image Magick version or None if it is unavailable
Try invoking ImageMagick's "magick". If "magick" is unavailable, Try invoking ImageMagick's "magick". If "magick" is unavailable,
as with older versions, fall back to "convert" as with older versions, fall back to "convert"
""" """
cmds = ('magick','convert') cmds = ('magick', 'convert')
for isLegacy, cmd in enumerate(cmds): for isLegacy, cmd in enumerate(cmds):
try: try:
@ -250,6 +253,7 @@ def get_im_version():
pattern = br".+ (\d+)\.(\d+)\.(\d+).*" pattern = br".+ (\d+)\.(\d+)\.(\d+).*"
match = re.search(pattern, out) match = re.search(pattern, out)
if match: if match:
global im_legacy
im_legacy = bool(isLegacy) im_legacy = bool(isLegacy)
return (int(match.group(1)), return (int(match.group(1)),
int(match.group(2)), int(match.group(2)),
@ -258,7 +262,7 @@ def get_im_version():
except (subprocess.CalledProcessError, OSError) as exc: except (subprocess.CalledProcessError, OSError) as exc:
log.debug(u'ImageMagick version check failed: {}', exc) log.debug(u'ImageMagick version check failed: {}', exc)
return None return None
return (0,) return (0,)