From 5a35d93b220a539a81f38d446529401a67ac5b43 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Fri, 31 Jan 2014 16:57:07 -0800 Subject: [PATCH] tiny option-choosing fixes for #518 * 'L' check needs to be lower-case * letter for 'More candidates' is M, not C --- beets/importer.py | 1 - beets/ui/commands.py | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/beets/importer.py b/beets/importer.py index 696b8b09c..3dc6c4da6 100644 --- a/beets/importer.py +++ b/beets/importer.py @@ -713,7 +713,6 @@ def user_query(session): task = pipeline.multiple(album_tasks) continue - # Check for duplicates if we have a match (or ASIS). if task.choice_flag in (action.ASIS, action.APPLY): ident = task.chosen_ident() diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 3f7b8afed..993cad9b1 100644 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -558,7 +558,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None, raise importer.ImportAbort() elif sel == 'i': return importer.action.MANUAL_ID - elif sel == 'L': + elif sel == 'l': return importer.action.ALBUMS else: # Numerical selection. match = candidates[sel - 1] @@ -583,8 +583,9 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None, opts = ('Apply', 'More candidates', 'Skip', 'Use as-is', 'Enter search', 'enter Id', 'aBort') else: - opts = ('Apply', 'more Candidates', 'Skip', 'Use as-is', - 'as Tracks', 'as aLbums', 'Enter search', 'enter Id', 'aBort') + opts = ('Apply', 'More candidates', 'Skip', 'Use as-is', + 'as Tracks', 'as aLbums', 'Enter search', 'enter Id', + 'aBort') default = config['import']['default_action'].as_choice({ 'apply': 'a', 'skip': 's',