Marty/topen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ref: Reformat build_config function

Browse source 
Make the internal function logic a litte clearer
This commit is contained in:
Marty Oehme 2025-11-29 10:53:10 +01:00
parent 9b2dc37279
commit 6517eb3971
Signed by: Marty
GPG key ID: 4E535BC19C61886E
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
topen.py
View file

@ -267,17 +267,16 @@ class TConf:
def build_config() -> TConf: def build_config() -> TConf:
"""Return final configuration object.""" """Return final configuration object."""
cli = parse_cli() defaults = {k: opt.default for k, opt in OPTIONS.items()}
env = parse_env() env = parse_env()
cli = parse_cli()
rc_path = Path( rc_path = Path(
cli.get("task_rc") or env.get("task_rc") or OPTIONS["task_rc"].default cli.get("task_rc") or env.get("task_rc") or OPTIONS["task_rc"].default
).expanduser() ).expanduser()
defaults["task_rc"] = rc_path # use XDG-included paths
rc = parse_rc(rc_path) if rc_path.exists() else {} rc = parse_rc(rc_path) if rc_path.exists() else {}
# we use the 'parsed' XDG-included taskrc locations for defaults
defaults = {k: opt.default for k, opt in OPTIONS.items()}
defaults["task_rc"] = rc_path
merged = defaults | rc | env | cli # later wins merged = defaults | rc | env | cli # later wins
return TConf.from_dict({k: v for k, v in merged.items() if v is not None}) return TConf.from_dict({k: v for k, v in merged.items() if v is not None})