Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add truecolor tests, remove automatic truecolor greyscale -> xterm256 conversion

Browse source
This commit is contained in:
0xDEADFED5 2024-07-17 03:12:27 -07:00
parent 71fee0a3ea
commit 0f75e520e0
2 changed files with 40 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/utils/hex_colors.py
View file

@ -121,11 +121,6 @@ class HexColors:
r, g, b = self._hex_to_rgb_24_bit(tag) r, g, b = self._hex_to_rgb_24_bit(tag)
# Is it greyscale?
if r == g and g == b:
return f"{indicator}=" + self._GREYS[self._grey_int(r)]
else:
if not truecolor: if not truecolor:
# Fallback to xterm256 syntax # Fallback to xterm256 syntax
r, g, b = self._rgb_24_bit_to_256(r, g, b) r, g, b = self._rgb_24_bit_to_256(r, g, b)

37
evennia/utils/tests/test_truecolor.py
View file

@ -15,57 +15,78 @@ class TestANSIStringHex(TestCase):
def setUp(self): def setUp(self):
self.str = "test " self.str = "test "
self.output1 = "\x1b[38;5;16mtest \x1b[0m" self.output1 = "\x1b[38;5;16mtest \x1b[0m"
self.output1_truecolor = "\x1b[38;2;0;0;0mtest \x1b[0m"
self.output2 = "\x1b[48;5;16mtest \x1b[0m" self.output2 = "\x1b[48;5;16mtest \x1b[0m"
self.output2_truecolor = "\x1b[48;2;0;0;0mtest \x1b[0m"
self.output3 = "\x1b[38;5;46mtest \x1b[0m" self.output3 = "\x1b[38;5;46mtest \x1b[0m"
self.output3_truecolor = "\x1b[38;2;0;255;0mtest \x1b[0m"
self.output4 = "\x1b[48;5;46mtest \x1b[0m" self.output4 = "\x1b[48;5;46mtest \x1b[0m"
self.output4_truecolor = "\x1b[48;2;0;255;0mtest \x1b[0m"
def test_long_grayscale_fg(self): def test_long_grayscale_fg(self):
raw = f"|#000000{self.str}|n" raw = f"|#000000{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output1, "Output") self.assertEqual(ansi.raw(), self.output1_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output1, "Output xterm256")
def test_long_grayscale_bg(self): def test_long_grayscale_bg(self):
raw = f"|[#000000{self.str}|n" raw = f"|[#000000{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output2, "Output") self.assertEqual(ansi.raw(), self.output2_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output2, "Output xterm256")
def test_short_grayscale_fg(self): def test_short_grayscale_fg(self):
raw = f"|#000{self.str}|n" raw = f"|#000{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output1, "Output") self.assertEqual(ansi.raw(), self.output1_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output1, "Output xterm256")
def test_short_grayscale_bg(self): def test_short_grayscale_bg(self):
raw = f"|[#000{self.str}|n" raw = f"|[#000{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output2, "Output") self.assertEqual(ansi.raw(), self.output2_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output2, "Output xterm256")
def test_short_color_fg(self): def test_short_color_fg(self):
raw = f"|#0F0{self.str}|n" raw = f"|#0F0{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output3, "Output") self.assertEqual(ansi.raw(), self.output3_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output3, "Output xterm256")
def test_short_color_bg(self): def test_short_color_bg(self):
raw = f"|[#0f0{self.str}|n" raw = f"|[#0f0{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output4, "Output") self.assertEqual(ansi.raw(), self.output4_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output4, "Output xterm256")
def test_long_color_fg(self): def test_long_color_fg(self):
raw = f"|#00ff00{self.str}|n" raw = f"|#00ff00{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output3, "Output") self.assertEqual(ansi.raw(), self.output3_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output3, "Output xterm256")
def test_long_color_bg(self): def test_long_color_bg(self):
raw = f"|[#00FF00{self.str}|n" raw = f"|[#00FF00{self.str}|n"
ansi = AN(raw) ansi = AN(raw)
ansi_256 = parser(raw, xterm256=True)
self.assertEqual(ansi.clean(), self.str, "Cleaned") self.assertEqual(ansi.clean(), self.str, "Cleaned")
self.assertEqual(ansi.raw(), self.output4, "Output") self.assertEqual(ansi.raw(), self.output4_truecolor, "Output truecolor")
self.assertEqual(ansi_256, self.output4, "Output xterm256")
class TestANSIParser(TestCase): class TestANSIParser(TestCase):