mirror of
https://github.com/kovidgoyal/kitty.git
synced 2024-09-17 17:47:21 +03:00
Make color parsing a little more robust
Add a few tests for it
This commit is contained in:
parent
08079ad889
commit
73b501c961
47
kitty/rgb.py
generated
47
kitty/rgb.py
generated
@ -7,32 +7,43 @@
|
||||
|
||||
Color = namedtuple('Color', 'red green blue')
|
||||
|
||||
color_pat = re.compile(r'^#([a-fA-F0-9]{3}|[a-fA-F0-9]{6})$')
|
||||
color_pat2 = re.compile(
|
||||
r'rgb:([a-f0-9]{2})/([a-f0-9]{2})/([a-f0-9]{2})$', re.IGNORECASE
|
||||
)
|
||||
|
||||
def parse_single_color(c):
|
||||
if len(c) == 1:
|
||||
c += c
|
||||
return int(c[:2], 16)
|
||||
|
||||
|
||||
def parse_sharp(spec):
|
||||
if len(spec) in (3, 6, 9, 12):
|
||||
part_len = len(spec) // 3
|
||||
colors = re.findall(r'[a-fA-F0-9]{%d}' % part_len, spec)
|
||||
return Color(*map(parse_single_color, colors))
|
||||
|
||||
|
||||
def parse_rgb(spec):
|
||||
colors = spec.split('/')
|
||||
if len(colors) == 3:
|
||||
return Color(*map(parse_single_color, colors))
|
||||
|
||||
|
||||
def to_color(raw, validate=False):
|
||||
# See man XParseColor
|
||||
x = raw.strip().lower()
|
||||
ans = color_names.get(x)
|
||||
if ans is not None:
|
||||
return ans
|
||||
m = color_pat.match(x)
|
||||
val = None
|
||||
if m is not None:
|
||||
val = m.group(1)
|
||||
if len(val) == 3:
|
||||
val = ''.join(2 * s for s in val)
|
||||
else:
|
||||
m = color_pat2.match(x)
|
||||
if m is not None:
|
||||
val = m.group(1) + m.group(2) + m.group(3)
|
||||
if val is None:
|
||||
if validate:
|
||||
raise ValueError('Invalid color name: {}'.format(raw))
|
||||
return
|
||||
return Color(int(val[:2], 16), int(val[2:4], 16), int(val[4:], 16))
|
||||
try:
|
||||
if raw.startswith('#'):
|
||||
val = parse_sharp(raw[1:])
|
||||
elif raw.startswith('rgb:'):
|
||||
val = parse_rgb(raw[4:])
|
||||
except Exception:
|
||||
pass
|
||||
if val is None and validate:
|
||||
raise ValueError('Invalid color name: {}'.format(raw))
|
||||
return val
|
||||
|
||||
|
||||
# BEGIN_DATA_SECTION {{{
|
||||
|
@ -10,6 +10,7 @@
|
||||
REVERSE, ColorProfile, Cursor as C, HistoryBuf, LineBuf
|
||||
)
|
||||
from kitty.utils import sanitize_title, wcwidth
|
||||
from kitty.rgb import to_color
|
||||
|
||||
from . import BaseTest, filled_cursor, filled_history_buf, filled_line_buf
|
||||
|
||||
@ -27,6 +28,21 @@ def create_lbuf(*lines):
|
||||
|
||||
class TestDataTypes(BaseTest):
|
||||
|
||||
def test_to_color(self):
|
||||
for x in 'xxx #12 #1234 rgb:a/b'.split():
|
||||
self.assertIsNone(to_color(x))
|
||||
|
||||
def c(spec, r=0, g=0, b=0):
|
||||
self.ae(tuple(to_color(spec)), (r, g, b))
|
||||
|
||||
c('#eee', 0xee, 0xee, 0xee)
|
||||
c('#234567', 0x23, 0x45, 0x67)
|
||||
c('#abcabcdef', 0xab, 0xab, 0xde)
|
||||
c('rgb:e/e/e', 0xee, 0xee, 0xee)
|
||||
c('rgb:23/45/67', 0x23, 0x45, 0x67)
|
||||
c('rgb:abc/abc/def', 0xab, 0xab, 0xde)
|
||||
c('red', 0xff)
|
||||
|
||||
def test_linebuf(self):
|
||||
old = filled_line_buf(2, 3, filled_cursor())
|
||||
new = LineBuf(1, 3)
|
||||
|
Loading…
Reference in New Issue
Block a user