mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-19 15:04:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow including config files matching glob patterns in conf files

Browse Source 
Fixes #4533
This commit is contained in:
Kovid Goyal
2022-01-18 16:28:19 +05:30
parent f9a4b6bb0d
commit 6a2522452f
3 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kitty/conf/utils.py
View File

@@ -170,24 +170,30 @@ def parse_line(
log_error(f'Ignoring invalid config line: {line}')
return
key, val = m.groups()
if key == 'include':
if key in ('include', 'globinclude'):
val = os.path.expandvars(os.path.expanduser(val.strip()))
if not os.path.isabs(val):
val = os.path.join(base_path_for_includes, val)
try:
with open(val, encoding='utf-8', errors='replace') as include:
with currently_parsing.set_file(val):
_parse(include, parse_conf_item, ans, accumulate_bad_lines)
except FileNotFoundError:
log_error(
'Could not find included config file: {}, ignoring'.
format(val)
)
except OSError:
log_error(
'Could not read from included config file: {}, ignoring'.
format(val)
)
if key == 'globinclude':
from pathlib import Path
vals = tuple(map(lambda x: str(os.fspath(x)), Path(base_path_for_includes).glob(val)))
else:
if not os.path.isabs(val):
val = os.path.join(base_path_for_includes, val)
vals = (val,)
for val in vals:
try:
with open(val, encoding='utf-8', errors='replace') as include:
with currently_parsing.set_file(val):
_parse(include, parse_conf_item, ans, accumulate_bad_lines)
except FileNotFoundError:
log_error(
'Could not find included config file: {}, ignoring'.
format(val)
)
except OSError:
log_error(
'Could not read from included config file: {}, ignoring'.
format(val)
)
return
if not parse_conf_item(key, val, ans):
log_error(f'Ignoring unknown config key: {key}')