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

Colorise no-penalty text differences in a secondary colour, light grey.

Browse source
This commit is contained in:
Tai Lee 2013-06-03 01:08:35 +10:00
parent 461c3c047c
commit 2c175faa46
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
beets/ui/__init__.py
View file

@ -37,6 +37,7 @@ from beets.util.functemplate import Template
from beets import config
from beets.util import confit
from beets.autotag import mb
from beets.autotag.match import string_dist
# On Windows platforms, use colorama to support "ANSI" terminal colors.
@ -366,7 +367,7 @@ def colorize(color, text):
else:
return text
def _colordiff(a, b, highlight='red'):
def _colordiff(a, b, highlight='red', second_highlight='lightgray'):
"""Given two values, return the same pair of strings except with
their differences highlighted in the specified color. Strings are
highlighted intelligently to show differences; other values are
@ -402,9 +403,14 @@ def _colordiff(a, b, highlight='red'):
# Left only.
a_out.append(colorize(highlight, a[a_start:a_end]))
elif op == 'replace':
# Right and left differ.
a_out.append(colorize(highlight, a[a_start:a_end]))
b_out.append(colorize(highlight, b[b_start:b_end]))
# Right and left differ. Colorise with second highlight if
# there's no distance penalty.
if string_dist(a[a_start:a_end], b[b_start:b_end]):
color = highlight
else:
color = second_highlight
a_out.append(colorize(color, a[a_start:a_end]))
b_out.append(colorize(color, b[b_start:b_end]))
else:
assert(False)

4
docs/changelog.rst
View file

@ -62,7 +62,9 @@ Changelog
low similarity score.
* Display album disambiguation and disc titles in the track listing, when
available.
* More consistent format and colorization of album and track metadata.
* More consistent format and colorization of album and track metadata. Red
for actual differences, yellow to indicate that a penalty is being applied,
and light gray for no-penalty supplementary data.
* Track changes highlighted in light gray indicate a change in format to or
from :ref:`per_disc_numbering`. No penalty is applied because the track
number is still "correct", just in a different format.