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

merge GH-33: more flexibility for -f arguments

Browse source
This commit is contained in:
Adrian Sampson 2012-04-30 21:17:20 -07:00
commit 928730e0ed
2 changed files with 48 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
beets/library.py
View file

@ -831,6 +831,50 @@ class Library(BaseLibrary):
self.conn.executescript(setup_sql)
self.conn.commit()
def substitute_template(self, item, template, pathmod=None):
"""Runs functions and substitutes fields in template. If a pathmod is
specified, all values are path-sanitized.
"""
# Get the item's Album if it has one.
album = self.get_album(item)
# Build the mapping for substitution in the template,
# beginning with the values from the database.
mapping = {}
for key in ITEM_KEYS_META:
# Get the values from either the item or its album.
if key in ALBUM_KEYS_ITEM and album is not None:
# From album.
value = getattr(album, key)
else:
# From Item.
value = getattr(item, key)
if pathmod is not None:
mapping[key] = util.sanitize_for_path(value, pathmod, key)
else:
mapping[key] = value
# Use the album artist if the track artist is not set and
# vice-versa.
if not mapping['artist']:
mapping['artist'] = mapping['albumartist']
if not mapping['albumartist']:
mapping['albumartist'] = mapping['artist']
# Get values from plugins.
for key, value in plugins.template_values(item).iteritems():
if pathmod is not None:
mapping[key] = util.sanitize_for_path(value, pathmod, key)
else:
mapping[key] = value
# Get template functions.
funcs = DefaultTemplateFunctions(self, item, pathmod).functions()
funcs.update(plugins.template_funcs())
# Perform substitution.
return template.substitute(mapping, funcs)
def destination(self, item, pathmod=None, fragment=False,
basedir=None, platform=None):
"""Returns the path in the library directory designated for item
@ -865,39 +909,7 @@ class Library(BaseLibrary):
else:
subpath_tmpl = Template(path_format)
# Get the item's Album if it has one.
album = self.get_album(item)
# Build the mapping for substitution in the path template,
# beginning with the values from the database.
mapping = {}
for key in ITEM_KEYS_META:
# Get the values from either the item or its album.
if key in ALBUM_KEYS_ITEM and album is not None:
# From album.
value = getattr(album, key)
else:
# From Item.
value = getattr(item, key)
mapping[key] = util.sanitize_for_path(value, pathmod, key)
# Use the album artist if the track artist is not set and
# vice-versa.
if not mapping['artist']:
mapping['artist'] = mapping['albumartist']
if not mapping['albumartist']:
mapping['albumartist'] = mapping['artist']
# Get values from plugins.
for key, value in plugins.template_values(item).iteritems():
mapping[key] = util.sanitize_for_path(value, pathmod, key)
# Get template functions.
funcs = DefaultTemplateFunctions(self, item, pathmod).functions()
funcs.update(plugins.template_funcs())
# Perform substitution.
subpath = subpath_tmpl.substitute(mapping, funcs)
subpath = self.substitute_template(item, subpath_tmpl, pathmod=pathmod)
# Prepare path for output: normalize Unicode characters.
if platform == 'darwin':

4
beets/ui/commands.py
View file

@ -809,6 +809,7 @@ def list_items(lib, query, album, path, fmt):
fmt = u'$albumartist - $album'
else:
fmt = u'$artist - $album - $title'
template = Template(fmt)
if album:
@ -816,13 +817,14 @@ def list_items(lib, query, album, path, fmt):
if path:
print_(album.item_dir())
elif fmt is not None:
#TODO: Support functions and plugin fields in album mode.
print_(template.substitute(album._record))
else:
for item in lib.items(query):
if path:
print_(item.path)
elif fmt is not None:
print_(template.substitute(item.record))
print_(lib.substitute_template(item, template))
list_cmd = ui.Subcommand('list', help='query the library', aliases=('ls',))
list_cmd.parser.add_option('-a', '--album', action='store_true',