Merge pull request #2731 from beetbox/2441-search-edit-candidates

Modify task recommendation and candidates
beetbox · Jan 31, 2018 · 0f8b5b3 · 0f8b5b3
2 parents 224d782 + 0d8d1c3
commit 0f8b5b3
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
@@ -691,16 +691,15 @@ def choose_match(self, task):
             return action
 
         # Loop until we have a choice.
-        candidates, rec = task.candidates, task.rec
         while True:
             # Ask for a choice from the user. The result of
             # `choose_candidate` may be an `importer.action`, an
             # `AlbumMatch` object for a specific selection, or a
             # `PromptChoice`.
             choices = self._get_choices(task)
             choice = choose_candidate(
-                candidates, False, rec, task.cur_artist, task.cur_album,
-                itemcount=len(task.items), choices=choices
+                task.candidates, False, task.rec, task.cur_artist,
+                task.cur_album, itemcount=len(task.items), choices=choices
             )
 
             # Basic choices that require no more action here.
@@ -716,8 +715,8 @@ def choose_match(self, task):
                     return post_choice
                 elif isinstance(post_choice, autotag.Proposal):
                     # Use the new candidates and continue around the loop.
-                    candidates = post_choice.candidates
-                    rec = post_choice.recommendation
+                    task.candidates = post_choice.candidates
+                    task.rec = post_choice.recommendation
 
             # Otherwise, we have a specific match selection.
             else: