From b02974f68f8e71d526aec16da5c1f74eaa48c7e9 Mon Sep 17 00:00:00 2001 From: Tai Lee Date: Mon, 3 Jun 2013 01:20:32 +1000 Subject: [PATCH] Don't bypass candidate selection in timid mode. Always show all candidates. Saves paranoid and interested users from having to either force all max recommendations to none or constantly go back to candidate selection from a recommendation to see if there is another slightly less similar but more preferred (by the user) candidate. --- beets/ui/commands.py | 2 +- docs/changelog.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 63d1df00d..e55068f80 100644 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -466,7 +466,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None, # Is the change good enough? bypass_candidates = False - if rec != recommendation.none: + if rec != recommendation.none and not config['import']['timid']: match = candidates[0] bypass_candidates = True diff --git a/docs/changelog.rst b/docs/changelog.rst index 1daa09ef3..362bbd5b3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -72,6 +72,7 @@ Changelog together for better readability. * Don't show potential matches that have specific penalties applied, as configured by the :ref:`ignored` setting. + * Don't bypass candidate selection in timid mode. Always show all candidates. * Improve calculation of similarity score and recommendation: