Skip to content

fix: use default config if on-disk config is not found #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BrookJeynes wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −11
Open

fix: use default config if on-disk config is not found #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,21 @@ pub fn main(init: std.process.Init) !void {

defer allocator.free(config_path);

const config_file = try std.Io.Dir.cwd().readFileAllocOptions(init.io, config_path, allocator, .unlimited, .@"1", 0);
defer allocator.free(config_file);

const parsed_config = zon.parse.fromSliceAlloc(Config, allocator, config_file, null, .{ .free_on_error = true }) catch |e| {
switch (e) {
error.ParseZon => {
std.debug.print("[{s}] Could not parse config file!\n", .{err_color.format("Error")});
return;
},
error.OutOfMemory => return e,
}
const parsed_config = lbl: {
const config_file = std.Io.Dir.cwd().readFileAllocOptions(init.io, config_path, allocator, .unlimited, .@"1", 0) catch {
break :lbl Config{};
};
defer allocator.free(config_file);

break :lbl zon.parse.fromSliceAlloc(Config, allocator, config_file, null, .{ .free_on_error = true }) catch |e| {
switch (e) {
error.ParseZon => {
std.debug.print("[{s}] Could not parse config file!\n", .{err_color.format("Error")});
return;
},
error.OutOfMemory => return e,
}
};
};

program.model.config = parsed_config;
Expand Down