Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-26 18:15:01 +01:00
Code Issues Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
Adrian Sampson 2011-11-30 20:39:45 -08:00
commit 62a63d8673
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
beets/importer.py
View file

@ -26,7 +26,7 @@ from beets import library
import beets.autotag.art
from beets import plugins
from beets.util import pipeline
from beets.util import syspath, normpath, plurality
from beets.util import syspath, normpath, plurality, displayable_path
from beets.util.enumeration import enum
action = enum(
@ -610,7 +610,8 @@ def apply_choices(config):
dup_items = lib.items(library.MatchQuery('path', item.path))
for dup_item in dup_items:
replaced_items[item].append(dup_item)
log.debug('replacing item %i: %s' % (dup_item.id, item.path))
log.debug('replacing item %i: %s' %
(dup_item.id, displayable_path(item.path)))
log.debug('%i of %i items replaced' % (len(replaced_items),
len(items)))
@ -754,7 +755,7 @@ def item_progress(config):
if task.sentinel:
continue
log.info(task.item.path)
log.info(displayable_path(task.item.path))
task.set_null_item_match()
task.set_choice(action.ASIS)

2
beets/ui/commands.py
View file

@ -727,7 +727,7 @@ def update_items(lib, query, album, move, color, pretend):
# Did the item change since last checked?
if item.current_mtime() <= item.mtime:
log.debug(u'skipping %s because mtime is up to date (%i)' %
(item.path, item.mtime))
(displayable_path(item.path), item.mtime))
continue
# Read new data.