Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-15 21:14:19 +01:00
Code Issues Projects Releases Wiki Activity

restore command_output() implementation as of 0ec285f

Browse source
This commit is contained in:
Fabrice Laporte 2014-09-22 13:49:23 +02:00
parent a0c38a07a6
commit d2cf41fc70
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
beets/util/__init__.py
View file

@ -633,14 +633,13 @@ def command_output(cmd, shell=False):
Python 2.6 and which can have problems if lots of output is sent to
stderr.
"""
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
close_fds=platform.system() != 'Windows',
shell=shell)
stdout, stderr = proc.communicate()
with open(os.devnull, 'wb') as devnull:
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=devnull,
close_fds=platform.system() != 'Windows',
shell=shell)
stdout, _ = proc.communicate()
if proc.returncode:
raise subprocess.CalledProcessError(proc.returncode, cmd, stderr)
raise subprocess.CalledProcessError(proc.returncode, cmd)
return stdout

22
beetsplug/embedart.py
View file

@ -17,6 +17,7 @@ import os.path
import logging
import imghdr
import subprocess
import platform
from tempfile import NamedTemporaryFile
from beets.plugins import BeetsPlugin
@ -25,7 +26,7 @@ from beets import ui
from beets.ui import decargs
from beets.util import syspath, normpath, displayable_path
from beets.util.artresizer import ArtResizer
from beets import config, util
from beets import config
log = logging.getLogger('beets')
@ -159,15 +160,20 @@ def check_art_similarity(item, imagepath, compare_threshold):
'compare -metric PHASH - null:'.format(syspath(imagepath),
syspath(art))
try:
phashDiff = util.command_output(cmd, shell=True)
except subprocess.CalledProcessError, e:
if e.returncode != 1:
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
close_fds=platform.system() != 'Windows',
shell=True)
stdout, stderr = proc.communicate()
if proc.returncode:
if proc.returncode != 1:
log.warn(u'embedart: IM phashes compare failed for {0}, \
{1}'.format(displayable_path(imagepath),
displayable_path(art)))
{1}'.format(displayable_path(imagepath),
displayable_path(art)))
return
phashDiff = float(e.output)
phashDiff = float(stderr)
else:
phashDiff = float(stdout)
log.info(u'embedart: compare PHASH score is {0}'.format(phashDiff))
if phashDiff > compare_threshold: