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

appropriate logging for duplicate resolution

Browse source
This commit is contained in:
Adrian Sampson 2012-03-20 13:13:52 -07:00
parent 71762375c9
commit 34ec25e642
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
beets/importer.py
View file

@ -59,14 +59,26 @@ def tag_log(logfile, status, path):
print >>logfile, '%s %s' % (status, path)
logfile.flush()
def log_choice(config, task):
"""Logs the task's current choice if it should be logged.
def log_choice(config, task, duplicate=False):
"""Logs the task's current choice if it should be logged. If
``duplicate``, then this is a secondary choice after a duplicate was
detected and a decision was made.
"""
path = task.path if task.is_album else task.item.path
if task.choice_flag is action.ASIS:
tag_log(config.logfile, 'asis', path)
elif task.choice_flag is action.SKIP:
tag_log(config.logfile, 'skip', path)
if duplicate:
# Duplicate: log all three choices (skip, keep both, and trump).
if task.remove_duplicates:
tag_log(config.logfile, 'duplicate-replace', path)
elif task.choice_flag in (action.ASIS, action.APPLY):
tag_log(config.logfile, 'duplicate-keep', path)
elif task.choice_flag is (action.SKIP):
tag_log(config.logfile, 'duplicate-skip', path)
else:
# Non-duplicate: log "skip" and "asis" choices.
if task.choice_flag is action.ASIS:
tag_log(config.logfile, 'asis', path)
elif task.choice_flag is action.SKIP:
tag_log(config.logfile, 'skip', path)
def _reopen_lib(lib):
"""Because of limitations in SQLite, a given Library is bound to
@ -578,8 +590,8 @@ def user_query(config):
# Check for duplicates if we have a match (or ASIS).
if _duplicate_check(lib, task, recent):
tag_log(config.logfile, 'duplicate', task.path)
config.resolve_duplicate_func(task, config)
log_choice(config, task, True)
def show_progress(config):
"""This stage replaces the initial_lookup and user_query stages
@ -777,8 +789,8 @@ def item_query(config):
# Duplicate check.
if _item_duplicate_check(lib, task, recent):
tag_log(config.logfile, 'duplicate', task.item.path)
config.resolve_duplicate_func(task, config)
log_choice(config, task, True)
def item_progress(config):
"""Skips the lookup and query stages in a non-autotagged singleton

2
beets/ui/commands.py
View file

@ -589,7 +589,7 @@ def resolve_duplicate(task, config):
pass
elif sel == 'r':
# Remove old.
task.remove_duplictes = True
task.remove_duplicates = True
else:
assert False