always show album directory in tagger output

This commit is contained in:
Adrian Sampson 2011-03-23 14:06:14 -07:00
parent c698868bf0
commit ecf2da1b6f
2 changed files with 6 additions and 3 deletions

1
NEWS
View file

@ -18,6 +18,7 @@
* When importing with the "delete" option and importing files that are
already at their destination, files could be deleted (leaving zero
copies afterward). This is fixed.
* Always show album directory in tagger output.
* "import -l" now logs duplicate albums.
* Fix a bug where some files would be erroneously interpreted as MP4.
* Fix permission bits applied to album art files.

View file

@ -211,7 +211,7 @@ def choose_match(path, items, cur_artist, cur_album, candidates,
show_change(cur_artist, cur_album, items, info, dist, color)
return info, items
else:
print_('Skipping: %s' % path)
print_('Skipping.')
return CHOICE_SKIP
# Loop until we have a choice.
@ -222,7 +222,7 @@ def choose_match(path, items, cur_artist, cur_album, candidates,
color)
else:
# Fallback: if either an error ocurred or no matches found.
print_("No match found for:", path)
print_("No match found.")
sel = ui.input_options(
"[U]se as-is, Skip, Enter manual search, or aBort?",
('u', 's', 'e', 'b'), 'u',
@ -330,7 +330,7 @@ def read_albums(paths, progress):
resume_dir = progress_get(path)
if resume_dir:
resume = ui.input_yn("Import of the directory:\n%s"
"\nwas interrupted. Resume (Y/n)? " %
"\nwas interrupted. Resume (Y/n)?" %
path)
if resume:
resume_dirs[path] = resume_dir
@ -403,6 +403,8 @@ def user_query(lib, logfile=None, color=True, quiet=False):
if not first:
print_()
first = False
# Show current album path.
print_(path)
# Ask the user for a choice.
choice = choose_match(path, items, cur_artist, cur_album, candidates,