lobo/pos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

warn instead of fail when replacements config missing

Browse source
This commit is contained in:
Emil Lerch 2025-10-15 11:15:16 -07:00
parent 5a38fd65c7
commit bd6e09bf50
Signed by: lobo
GPG key ID: A7B62D657EF764F8
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main.zig
View file

@ -22,7 +22,10 @@ fn loadReplacements(allocator: std.mem.Allocator) !std.StringHashMap([]const u8)
// Try XDG_CONFIG_HOME or HOME/.config // Try XDG_CONFIG_HOME or HOME/.config
const config_dir = std.posix.getenv("XDG_CONFIG_HOME") orelse blk: { const config_dir = std.posix.getenv("XDG_CONFIG_HOME") orelse blk: {
const home = std.posix.getenv("HOME") orelse return error.NoConfigFound; const home = std.posix.getenv("HOME") orelse {
std.log.warn("No replacement configuration file found", .{});
return replacements;
};
break :blk try std.fs.path.join(allocator, &.{ home, ".config" }); break :blk try std.fs.path.join(allocator, &.{ home, ".config" });
}; };
const config_path = if (std.posix.getenv("XDG_CONFIG_HOME") != null) const config_path = if (std.posix.getenv("XDG_CONFIG_HOME") != null)
@ -47,7 +50,8 @@ fn loadReplacements(allocator: std.mem.Allocator) !std.StringHashMap([]const u8)
return replacements; return replacements;
} else |_| {} } else |_| {}
return error.NoConfigFound; std.log.warn("No replacement configuration file found", .{});
return replacements;
} }
const DeviceAction = enum { const DeviceAction = enum {
@ -336,10 +340,7 @@ pub fn main() !u8 {
defer allocator.free(sentence_z); defer allocator.free(sentence_z);
var tree = if (sentence_parse_only == .command) blk: { var tree = if (sentence_parse_only == .command) blk: {
var replacements = loadReplacements(allocator) catch |err| { var replacements = try loadReplacements(allocator);
stderr.print("Failed to load replacements configuration: {}\n", .{err}) catch {};
return 1;
};
defer { defer {
var iterator = replacements.iterator(); var iterator = replacements.iterator();
while (iterator.next()) |entry| { while (iterator.next()) |entry| {
@ -375,10 +376,7 @@ pub fn main() !u8 {
devices.deinit(); devices.deinit();
} }
var replacements = loadReplacements(allocator) catch |err| { var replacements = try loadReplacements(allocator);
stderr.print("Failed to load replacements configuration: {}\n", .{err}) catch {};
return 1;
};
defer { defer {
var iterator = replacements.iterator(); var iterator = replacements.iterator();
while (iterator.next()) |entry| { while (iterator.next()) |entry| {