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

Merge pull request #30 from djrtl/upstream

Browse source 
changes from @djrtl
This commit is contained in:
Adrian Sampson 2012-04-15 13:45:04 -07:00
commit d3b9d9eaf8
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
beets/ui/commands.py
View file

@ -84,6 +84,19 @@ def _showdiff(field, oldval, newval, color):
print_(u' %s: %s -> %s' % (field, oldval, newval))
# fields: Shows a list of available fields for queries and format strings.
fields_cmd = ui.Subcommand('fields',
help='show fields available for queries and format strings')
def fields_func(lib, config, opts, args):
print "Available item fields:"
print " " + "\n ".join([key for key in library.ITEM_KEYS])
print "\nAvailable album fields:"
print " " + "\n ".join([key for key in library.ALBUM_KEYS])
fields_cmd.func = fields_func
default_commands.append(fields_cmd)
# import: Autotagger and importer.
DEFAULT_IMPORT_COPY = True
@ -719,6 +732,8 @@ import_cmd.parser.add_option('-L', '--library', dest='library',
action='store_true', help='retag items matching a query')
import_cmd.parser.add_option('-i', '--incremental', dest='incremental',
action='store_true', help='skip already-imported directories')
import_cmd.parser.add_option('-I', '--no-incremental', dest='incremental',
action='store_false', help='do not skip already-imported directories')
def import_func(lib, config, opts, args):
copy = opts.copy if opts.copy is not None else \
ui.config_val(config, 'beets', 'import_copy',

4
beetsplug/bpd/__init__.py
View file

@ -793,10 +793,10 @@ class Server(BaseServer):
# Trying to list a track.
raise BPDError(ERROR_ARG, 'this is not a directory')
else:
for name, itemid in node.files.iteritems():
for name, itemid in iter(sorted(node.files.items())):
item = self.lib.get_item(itemid)
yield self._item_info(item)
for name, _ in node.dirs.iteritems():
for name, _ in iter(sorted(node.dirs.iteritems())):
dirpath = self._path_join(path, name)
if dirpath.startswith(u"/"):
# Strip leading slash (libmpc rejects this).