Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-24 08:12:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge commit 'ca431b0' (part of #1033)

Browse source 
This is the part of PR #1033 that fixes #1020.
This commit is contained in:
Adrian Sampson 2014-10-24 16:44:39 -07:00
commit e5fcd3f96d
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
beetsplug/embedart.py
View file

@ -41,6 +41,7 @@ class EmbedCoverArtPlugin(BeetsPlugin):
'maxwidth': 0,
'auto': True,
'compare_threshold': 0,
'ifempty': False
})
if self.config['maxwidth'].get(int) and not ArtResizer.shared.local:
@ -63,13 +64,14 @@ class EmbedCoverArtPlugin(BeetsPlugin):
)
maxwidth = config['embedart']['maxwidth'].get(int)
compare_threshold = config['embedart']['compare_threshold'].get(int)
ifempty = config['embedart']['ifempty'].get()
def embed_func(lib, opts, args):
if opts.file:
imagepath = normpath(opts.file)
for item in lib.items(decargs(args)):
embed_item(item, imagepath, maxwidth, None,
compare_threshold)
compare_threshold, ifempty)
else:
for album in lib.albums(decargs(args)):
embed_album(album, maxwidth)
@ -108,13 +110,23 @@ def album_imported(lib, album):
def embed_item(item, imagepath, maxwidth=None, itempath=None,
compare_threshold=0):
compare_threshold=0, ifempty=False):
"""Embed an image into the item's media file.
"""
if compare_threshold:
if not check_art_similarity(item, imagepath, compare_threshold):
log.warn(u'Image not similar; skipping.')
return
if ifempty:
art = get_art(item)
if not art:
pass
else:
log.debug(u'embedart: media file contained art already {0}'.format(
displayable_path(imagepath)
))
return
try:
log.debug(u'embedart: embedding {0}'.format(
displayable_path(imagepath)
@ -148,7 +160,8 @@ def embed_album(album, maxwidth=None, quiet=False):
for item in album.items():
embed_item(item, imagepath, maxwidth, None,
config['embedart']['compare_threshold'].get(int))
config['embedart']['compare_threshold'].get(int),
config['embedart']['ifempty'])
def check_art_similarity(item, imagepath, compare_threshold):
@ -199,13 +212,7 @@ def _mediafile_image(image_path, maxwidth=None):
return mediafile.Image(data, type=mediafile.ImageType.front)
# 'extractart' command.
def extract(outpath, item):
if not item:
log.error(u'No item matches query.')
return
def get_art(item):
# Extract the art.
try:
mf = mediafile.MediaFile(syspath(item.path))
@ -215,7 +222,18 @@ def extract(outpath, item):
))
return
art = mf.art
return mf.art
# 'extractart' command.
def extract(outpath, item):
if not item:
log.error(u'No item matches query.')
return
art = get_art(item)
if not art:
log.error(u'No album art present in {0} - {1}.'
.format(item.artist, item.title))