Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-15 21:14:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge item_query and user_query

Browse source
This commit is contained in:
Thomas Scholtes 2014-04-19 18:12:26 +02:00
parent 07ace040fd
commit 5d7d2fe2c7
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
beets/importer.py
View file

@ -237,7 +237,7 @@ class ImportSession(object):
if config['import']['singletons']:
# Singleton importer.
if config['import']['autotag']:
stages += [lookup_candidates(self), item_query(self),
stages += [lookup_candidates(self), user_query(self),
resolve_duplicates(self)]
else:
# Whole-album importer.
@ -573,6 +573,13 @@ class ImportTask(object):
log.debug('%i of %i items replaced' % (len(self.replaced_items),
len(self.imported_items())))
def choose_match(self, session):
"""Ask the session which match should apply and apply it.
"""
choice = session.choose_match(self)
self.set_choice(choice)
session.log_choice(self)
# Utilities.
def prune(self, filename):
@ -666,6 +673,13 @@ class SingletonImportTask(ImportTask):
def infer_album_fields(self):
raise NotImplementedError
def choose_match(self, session):
"""Ask the session which match should apply and apply it.
"""
choice = session.choose_item(self)
self.set_choice(choice)
session.log_choice(self)
# FIXME The inheritance relationships are inverted. This is why there
# are so many methods which pass. We should introduce a new
@ -955,9 +969,7 @@ def user_query(session):
continue
# Ask the user for a choice.
choice = session.choose_match(task)
task.set_choice(choice)
session.log_choice(task)
task.choose_match(session)
plugins.send('import_task_choice', session=session, task=task)
# As-tracks: transition to singleton workflow.
@ -971,7 +983,7 @@ def user_query(session):
ipl = pipeline.Pipeline([
emitter(task),
lookup_candidates(session),
item_query(session),
user_query(session),
])
task = pipeline.multiple(ipl.pull())
@ -1095,24 +1107,6 @@ def finalize(session):
task.finalize(session)
# Singleton pipeline stages.
def item_query(session):
"""A coroutine that queries the user for input on single-item
lookups.
"""
task = None
while True:
task = yield task
if task.skip:
continue
choice = session.choose_item(task)
task.set_choice(choice)
session.log_choice(task)
plugins.send('import_task_choice', session=session, task=task)
def group_albums(session):
"""Group the items of a task by albumartist and album name and create a new
task for each album. Yield the tasks as a multi message.