ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make color spec parsing re-useable

Browse source
This commit is contained in:
Kovid Goyal 2021-01-31 12:10:45 +05:30
parent 35517d3e6f
commit 2af145879e
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
kitty/rc/set_colors.py
View file

@ -4,7 +4,7 @@
import os
from typing import TYPE_CHECKING, Dict, Optional, Union
from typing import TYPE_CHECKING, Dict, Iterable, Optional, Tuple, Union
from kitty.config import parse_config
from kitty.fast_data_types import patch_color_profiles
@ -19,6 +19,19 @@
from kitty.cli_stub import SetColorsRCOptions as CLIOptions
def parse_colors(args: Iterable[str]) -> Tuple[Dict[str, int], Optional[Union[int, bool]]]:
colors: Dict[str, Optional[Color]] = {}
for spec in args:
if '=' in spec:
colors.update(parse_config((spec.replace('=', ' '),)))
else:
with open(os.path.expanduser(spec), encoding='utf-8', errors='replace') as f:
colors.update(parse_config(f))
q = colors.pop('cursor_text_color', False)
ctc = color_as_int(q) if isinstance(q, Color) else (False if q is False else None)
return {k: color_as_int(v) for k, v in colors.items() if isinstance(v, Color)}, ctc
class SetColors(RemoteCommand):
'''
@ -63,19 +76,7 @@ def message_to_kitty(self, global_opts: RCOptions, opts: 'CLIOptions', args: Arg
final_colors: Dict[str, int] = {}
cursor_text_color: Optional[Union[int, bool]] = False
if not opts.reset:
colors: Dict[str, Optional[Color]] = {}
for spec in args:
if '=' in spec:
colors.update(parse_config((spec.replace('=', ' '),)))
else:
with open(os.path.expanduser(spec), encoding='utf-8', errors='replace') as f:
colors.update(parse_config(f))
ctc = colors.pop('cursor_text_color', False)
if isinstance(ctc, Color):
cursor_text_color = color_as_int(ctc)
elif ctc is None:
cursor_text_color = None
final_colors = {k: color_as_int(v) for k, v in colors.items() if isinstance(v, Color)}
final_colors, cursor_text_color = parse_colors(args)
ans = {
'match_window': opts.match, 'match_tab': opts.match_tab,
'all': opts.all or opts.reset, 'configured': opts.configured or opts.reset,