Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-04 06:53:27 +01:00
Code Issues Projects Releases Wiki Activity

don't display difference when medium index matches

Browse source 
Regarding GC-335, the difference display was confusing when the track indices
were correct but used a per-disc numbering scheme.
This commit is contained in:
Adrian Sampson 2012-05-19 11:06:47 -07:00
parent f54f04c165
commit 427e2017d6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
beets/ui/commands.py
View file

@ -205,7 +205,8 @@ def show_change(cur_artist, cur_album, items, info, dist, color=True):
# Get displayable LHS and RHS values.
cur_track = unicode(item.track)
new_track = unicode(i+1)
new_track = unicode(i + 1)
tracks_differ = item.track not in (i + 1, track_info.medium_index)
cur_title = item.title
new_title = track_info.title
if item.length and track_info.length:
@ -218,9 +219,8 @@ def show_change(cur_artist, cur_album, items, info, dist, color=True):
# Possibly colorize changes.
if color:
cur_title, new_title = ui.colordiff(cur_title, new_title)
if cur_track != new_track:
cur_track = ui.colorize('red', cur_track)
new_track = ui.colorize('red', new_track)
cur_track = ui.colorize('red', cur_track)
new_track = ui.colorize('red', new_track)
# Show filename (non-colorized) when title is not set.
if not item.title.strip():
@ -228,14 +228,14 @@ def show_change(cur_artist, cur_album, items, info, dist, color=True):
if cur_title != new_title:
lhs, rhs = cur_title, new_title
if cur_track != new_track:
if tracks_differ:
lhs += u' (%s)' % cur_track
rhs += u' (%s)' % new_track
print_(u" * %s -> %s" % (lhs, rhs))
else:
line = u' * %s' % item.title
display = False
if cur_track != new_track:
if tracks_differ:
display = True
line += u' (%s -> %s)' % (cur_track, new_track)
if item.length and track_info.length and \