mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-08 10:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move config file loading into loadFile

Browse Source
This commit is contained in:
Remi Gelinas
2024-07-17 15:02:03 -04:00
parent 431c99313c
commit 3350e3c848
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/cli/validate_config.zig
View File

@@ -33,26 +33,19 @@ pub fn run(alloc: std.mem.Allocator) !u8 {
const stdout = std.io.getStdOut().writer();
// If a config path is passed, validate it, otherwise validate usual config options
var cfg = try Config.default(alloc);
defer cfg.deinit();
// If a config path is passed, validate it, otherwise validate default configs
if (opts.@"config-file") |config_path| {
const cwd = std.fs.cwd();
try cfg.loadFile(alloc, config_path);
if (cwd.openFile(config_path, .{})) |file| {
defer file.close();
var cfg = try Config.default(alloc);
defer cfg.deinit();
var buf_reader = std.io.bufferedReader(file.reader());
var iter = cli.args.lineIterator(buf_reader.reader());
try cfg.loadIter(alloc, &iter);
try cfg.loadRecursiveFiles(alloc);
try cfg.finalize();
} else |err| {
try stdout.print("{any}", .{err});
if (!cfg._errors.empty()) {
try stdout.print("Config is not valid path={s}", .{config_path});
return 1;
}
} else {
_ = try Config.load(alloc);
try cfg.loadDefaultFiles(alloc);
}
return 0;