diff options
| author | bptato <nincsnevem662@gmail.com> | 2024-10-28 20:08:09 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2024-10-28 20:08:09 +0100 |
| commit | 6c5922d5f0b2d9d7b6e4c39593c6892a65f74e54 (patch) | |
| tree | 2485ae5f313f0dd017ba85e86404393e5945b470 /src | |
| parent | bd4386923056c53e97f0865d846ef52d0666ca56 (diff) | |
| download | chawan-6c5922d5f0b2d9d7b6e4c39593c6892a65f74e54.tar.gz | |
config: refactor, accept more possible config dirs
I'm starting to favor dotfiles over XDG basedirs, but there's no reason
why we couldn't have both. So now the search path is:
0. if config was set through -C, use that
1. $CHA_CONFIG_DIR is set -> $CHA_CONFIG_DIR/config.toml
2. $XDG_CONFIG_HOME is set -> $XDG_CONFIG_HOME/chawan/config.toml
3. ~/.config/chawan/config.toml exists -> use that
4. ~/.chawan/config.toml exists -> use that
Notably, this makes it so the default directory is ~/.chawan *if* you
don't have an existing config.toml file. So in that case known_hosts
will be placed in ~/.chawan/known_hosts. However, configurations with a
config in ~/.config/chawan/config.toml continue to work as expected, as
for those the known_hosts file remains inside ~/.config/chawan/.
Finally, I've added a default user CGI directory to reduce friction in
setting CGI up. (Like known_hosts, it's also relative to whatever config
dir you have.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/config.nim | 106 | ||||
| -rw-r--r-- | src/local/pager.nim | 3 | ||||
| -rw-r--r-- | src/main.nim | 44 | ||||
| -rw-r--r-- | src/utils/twtstr.nim | 6 |
4 files changed, 69 insertions, 90 deletions
diff --git a/src/config/config.nim b/src/config/config.nim index ad9510fb..86220fa4 100644 --- a/src/config/config.nim +++ b/src/config/config.nim @@ -160,7 +160,7 @@ type meta_refresh* {.jsgetset.}: MetaRefresh Config* = ref object - jsctx: JSContext + jsctx*: JSContext jsvfns*: seq[JSValueFunction] configdir* {.jsget.}: string `include` {.jsget.}: seq[ChaPathResolved] @@ -668,21 +668,13 @@ proc parseConfigValue(ctx: var ConfigParser; x: var CommandConfig; v: TomlValue; else: # tvtString x.init.add((kkk.substr("cmd.".len), vv.s)) -type ParseConfigResult* = object - success*: bool - warnings*: seq[string] - errorMsg*: string +proc parseConfig*(config: Config; dir, buf: string; warnings: var seq[string]; + name = "<input>"; laxnames = false): Err[string] -proc parseConfig*(config: Config; dir, buf: string; name = "<input>"; - laxnames = false; setdir = true): ParseConfigResult - -proc parseConfig(config: Config; dir: string; t: TomlValue; setdir: bool): - ParseConfigResult = +proc parseConfig(config: Config; dir: string; t: TomlValue; + warnings: var seq[string]): Err[string] = var ctx = ConfigParser(config: config, dir: dir) - if setdir: - config.configdir = dir try: - var myRes = ParseConfigResult(success: true) ctx.parseConfigValue(config[], t, "") #TODO: for omnirule/siteconf, check if substitution rules are specified? while config.`include`.len > 0: @@ -692,34 +684,19 @@ proc parseConfig(config: Config; dir: string; t: TomlValue; setdir: bool): for s in includes: let fs = openFileExpand(dir, s) if fs == nil: - return ParseConfigResult( - success: false, - warnings: ctx.warnings, - errorMsg: "include file not found: " & s - ) - let res = config.parseConfig(dir, fs.readAll()) - if not res.success: - return res - myRes.warnings.add(res.warnings) - myRes.warnings.add(ctx.warnings) - return myRes + return err("include file not found: " & s) + ?config.parseConfig(dir, fs.readAll(), warnings) + warnings.add(ctx.warnings) + return ok() except ValueError as e: - return ParseConfigResult( - success: false, - warnings: ctx.warnings, - errorMsg: e.msg - ) - -proc parseConfig*(config: Config; dir, buf: string; name = "<input>"; - laxnames = false; setdir = true): ParseConfigResult = + return err(e.msg) + +proc parseConfig*(config: Config; dir, buf: string; warnings: var seq[string]; + name = "<input>"; laxnames = false): Err[string] = let toml = parseToml(buf, dir / name, laxnames) if toml.isSome: - return config.parseConfig(dir, toml.get, setdir) - else: - return ParseConfigResult( - success: false, - errorMsg: "Fatal error: failed to parse config\n" & toml.error & '\n' - ) + return config.parseConfig(dir, toml.get, warnings) + return err("Fatal error: failed to parse config\n" & toml.error) proc getNormalAction*(config: Config; s: string): string = return config.page.getOrDefault(s) @@ -727,39 +704,26 @@ proc getNormalAction*(config: Config; s: string): string = proc getLinedAction*(config: Config; s: string): string = return config.line.getOrDefault(s) -type ReadConfigResult = tuple - config: Config - res: ParseConfigResult - -const defaultConfig = staticRead"res/config.toml" - -proc readConfig0(config: Config; dir, name: string): ParseConfigResult = - let path = if name.len > 0 and name[0] == '/': - name - else: - dir / name - let fs = newFileStream(path) - if fs != nil: - return config.parseConfig(parentDir(path), fs.readAll()) - return ParseConfigResult(success: true) - -proc readConfig*(pathOverride: Option[string]; jsctx: JSContext): - ReadConfigResult = - let config = Config(jsctx: jsctx) - var res = config.parseConfig("res", defaultConfig) - if not res.success: - return (nil, res) - if pathOverride.isNone: - when defined(debug): - res = config.readConfig0(getCurrentDir() / "res", "config.toml") - if not res.success: - return (nil, res) - res = config.readConfig0(getConfigDir() / "chawan", "config.toml") - else: - res = config.readConfig0(getCurrentDir(), pathOverride.get) - if not res.success: - return (nil, res) - return (config, res) +proc openConfig*(dir: var string; override: Option[string]): FileStream = + if override.isSome: + if override.get.len > 0 and override.get[0] == '/': + dir = parentDir(override.get) + return newFileStream(override.get) + else: + dir = getCurrentDir() + return newFileStream(dir / override.get) + dir = getEnv("CHA_CONFIG_DIR") + if dir != "": + return newFileStream(dir / "config.toml") + dir = getEnv("XDG_CONFIG_HOME") + if dir != "": + dir = dir / "chawan" + return newFileStream(dir / "config.toml") + dir = expandTilde("~/.config/chawan") + if (let fs = newFileStream(dir / "config.toml"); fs != nil): + return fs + dir = expandTilde("~/.chawan") + return newFileStream(dir / "config.toml") # called after parseConfig returns proc initCommands*(config: Config): Err[string] = diff --git a/src/local/pager.nim b/src/local/pager.nim index 44ffaa94..d41818fb 100644 --- a/src/local/pager.nim +++ b/src/local/pager.nim @@ -1168,7 +1168,8 @@ proc runCommand(pager: Pager; cmd: string; suspend, wait: bool; newPosixStream(STDERR_FILENO).safeClose() newPosixStream(STDIN_FILENO).safeClose() else: - discard dup2(pager.term.istream.fd, STDIN_FILENO) + if pager.term.istream != nil: + discard dup2(pager.term.istream.fd, STDIN_FILENO) discard execl("/bin/sh", "sh", "-c", cstring(cmd), nil) exitnow(127) else: diff --git a/src/main.nim b/src/main.nim index 4f39a5f3..f7d6a87a 100644 --- a/src/main.nim +++ b/src/main.nim @@ -3,6 +3,7 @@ import version import std/options import std/os import std/posix +import std/streams import chagashi/charset import config/chapath @@ -200,6 +201,28 @@ proc parse(ctx: var ParamParseContext) = ctx.pages.add(param) inc ctx.i +const defaultConfig = staticRead"res/config.toml" + +proc initConfig(ctx: ParamParseContext; config: Config; + warnings: var seq[string]): Err[string] = + let fs = openConfig(config.configdir, ctx.configPath) + if fs == nil and ctx.configPath.isSome: + # The user specified a non-existent config file. + return err("Failed to open config file " & ctx.configPath.get) + putEnv("CHA_CONFIG_DIR", config.configdir) + ?config.parseConfig("res", defaultConfig, warnings) + when defined(debug): + if (let fs = newFileStream(getCurrentDir() / "res/config.toml"); fs != nil): + ?config.parseConfig(getCurrentDir(), fs.readAll(), warnings) + if fs != nil: + ?config.parseConfig(config.configdir, fs.readAll(), warnings) + for opt in ctx.opts: + ?config.parseConfig(getCurrentDir(), opt, warnings, laxnames = true) + config.css.stylesheet &= ctx.stylesheet + ?config.initCommands() + isCJKAmbiguous = config.display.double_width_ambiguous + return ok() + proc main() = putEnv("CHA_LIBEXEC_DIR", ChaPath"${%CHA_LIBEXEC_DIR}".unquoteGet()) let forkserver = newForkServer() @@ -208,25 +231,10 @@ proc main() = let jsrt = newJSRuntime() let jsctx = jsrt.newJSContext() var warnings = newSeq[string]() - let (config, res) = readConfig(ctx.configPath, jsctx) - if not res.success: - stderr.writeLine(res.errorMsg) + let config = Config(jsctx: jsctx) + if (let res = ctx.initConfig(config, warnings); res.isNone): + stderr.writeLine(res.error) quit(1) - warnings.add(res.warnings) - for opt in ctx.opts: - let res = config.parseConfig(getCurrentDir(), opt, laxnames = true, - setdir = false) - if not res.success: - stderr.writeLine(res.errorMsg) - quit(1) - warnings.add(res.warnings) - config.css.stylesheet &= ctx.stylesheet - block commands: - let res = config.initCommands() - if res.isNone: - stderr.writeLine("Error parsing commands: " & res.error) - quit(1) - isCJKAmbiguous = config.display.double_width_ambiguous if ctx.pages.len == 0 and stdin.isatty(): if ctx.visual: ctx.pages.add(config.start.visual_home) diff --git a/src/utils/twtstr.nim b/src/utils/twtstr.nim index 1f43c443..99e5f6ee 100644 --- a/src/utils/twtstr.nim +++ b/src/utils/twtstr.nim @@ -717,3 +717,9 @@ func btoa*(data: openArray[uint8]): string = func btoa*(data: openArray[char]): string = return btoa(data.toOpenArrayByte(0, data.len - 1)) + +proc getEnvEmpty*(name: string; fallback = ""): string = + let res = getEnv(name, fallback) + if res != "": + return res + return fallback |