KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle set colors exceptions

Browse Source
This commit is contained in:
pagedown 2021-11-03 12:55:05 +08:00
parent 477baf390b
commit 40ff78b1c8
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kitty/boss.py
View File

@ -1875,7 +1875,11 @@ class Boss:
except (Exception, SystemExit) as err: except (Exception, SystemExit) as err:
self.show_error('Invalid set_colors mapping', str(err)) self.show_error('Invalid set_colors mapping', str(err))
return return
payload = c.message_to_kitty(parse_rc_args([])[0], opts, items) try:
payload = c.message_to_kitty(parse_rc_args([])[0], opts, items)
except (Exception, SystemExit) as err:
self.show_error('Failed to set colors', str(err))
return
c.response_from_kitty(self, self.active_window, PayloadGetter(c, payload if isinstance(payload, dict) else {})) c.response_from_kitty(self, self.active_window, PayloadGetter(c, payload if isinstance(payload, dict) else {}))
def _move_window_to( def _move_window_to(

3
kitty/rc/set_colors.py
View File

@ -5,6 +5,7 @@
import os import os
from typing import TYPE_CHECKING, Dict, Iterable, Optional from typing import TYPE_CHECKING, Dict, Iterable, Optional
from kitty.cli import emph
from kitty.config import parse_config from kitty.config import parse_config
from kitty.fast_data_types import patch_color_profiles, Color from kitty.fast_data_types import patch_color_profiles, Color
@ -95,6 +96,8 @@ this option, any color arguments are ignored and --configured and --all are impl
if not opts.reset: if not opts.reset:
try: try:
final_colors = parse_colors(args) final_colors = parse_colors(args)
except FileNotFoundError as err:
raise ParsingOfArgsFailed(f'The colors configuration file {emph(err.filename)} was not found.') from err
except Exception as err: except Exception as err:
raise ParsingOfArgsFailed(str(err)) from err raise ParsingOfArgsFailed(str(err)) from err
ans = { ans = {