Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: support nested/recursive config-file keys

Browse Source
This commit is contained in:
Paul Jimenez
2023-11-08 09:57:34 -05:00
parent 3113f9d8af
commit b8bfb66ad8
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/config/Config.zig
View File

@ -1136,44 +1136,45 @@ pub fn loadCliArgs(self: *Config, alloc_gpa: Allocator) !void {
/// Load and parse the config files that were added in the "config-file" key. /// Load and parse the config files that were added in the "config-file" key.
pub fn loadRecursiveFiles(self: *Config, alloc: Allocator) !void { pub fn loadRecursiveFiles(self: *Config, alloc: Allocator) !void {
// TODO(mitchellh): support nesting (config-file in a config file)
// TODO(mitchellh): detect cycles when nesting
if (self.@"config-file".list.items.len == 0) return; if (self.@"config-file".list.items.len == 0) return;
const arena_alloc = self._arena.?.allocator(); const arena_alloc = self._arena.?.allocator();
var loaded = std.StringHashMap(void).init(alloc);
defer loaded.deinit();
const cfgdir = getConfigDir(alloc); const cfgdir = getConfigDir(alloc);
const len = self.@"config-file".list.items.len; more_found: while (true) {
for (self.@"config-file".list.items) |path| { const len = self.@"config-file".list.items.len;
var file = cfgdir.openFile(path, .{}) catch |err| { for (self.@"config-file".list.items) |path| {
const cfgpath = cfgdir.realpathAlloc(arena_alloc, path) catch path; const cfgpath = cfgdir.realpathAlloc(arena_alloc, path) catch path;
try self._errors.add(arena_alloc, .{
.message = try std.fmt.allocPrintZ(
arena_alloc,
"error opening config-file {s}: {}",
.{ cfgpath, err },
),
});
continue;
};
defer file.close();
var buf_reader = std.io.bufferedReader(file.reader()); if (loaded.contains(cfgpath)) continue;
var iter = cli.args.lineIterator(buf_reader.reader()); try loaded.put(cfgpath, {});
try cli.args.parse(Config, alloc, self, &iter);
// We don't currently support adding more config files to load var file = cfgdir.openFile(path, .{}) catch |err| {
// from within a loaded config file. This can be supported try self._errors.add(arena_alloc, .{
// later. .message = try std.fmt.allocPrintZ(
if (self.@"config-file".list.items.len > len) { arena_alloc,
try self._errors.add(arena_alloc, .{ "error opening config-file {s}: {}",
.message = try std.fmt.allocPrintZ( .{ cfgpath, err },
arena_alloc, ),
"config-file cannot be used in a config-file. Found in {s}", });
.{path}, continue;
), };
}); defer file.close();
log.info("loading config-file path={s}", .{cfgpath});
var buf_reader = std.io.bufferedReader(file.reader());
var iter = cli.args.lineIterator(buf_reader.reader());
try cli.args.parse(Config, alloc, self, &iter);
// Added more config files, so the list's backing array might have
// been resized, so start the iteration over
if (self.@"config-file".list.items.len > len) {
continue :more_found;
}
} }
break;
} }
} }