Implement some simple flags and runtime log-levels
I used flags.zig from Isaac Freund for parsing basic CLI arguments,
I don't need much else since most configuration is in Kdl.
e967499fb1/common/flags.zig
I also removed some of the duplicated bits for the exe_check step
since I realized I can just use the beansprout executable for all of it.
This commit is contained in:
parent
54421ef8f5
commit
ec7474c9af
8 changed files with 277 additions and 65 deletions
97
src/flags.zig
Normal file
97
src/flags.zig
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
// SPDX-FileCopyrightText: © 2023 Isaac Freund
|
||||
// SPDX-License-Identifier: 0BSD
|
||||
|
||||
//! Zero allocation argument parsing for unix-like systems.
|
||||
|
||||
const std = @import("std");
|
||||
const mem = std.mem;
|
||||
|
||||
pub const Flag = struct {
|
||||
name: [:0]const u8,
|
||||
kind: enum { boolean, arg },
|
||||
};
|
||||
|
||||
pub fn parser(comptime Arg: type, comptime flags: []const Flag) type {
|
||||
switch (Arg) {
|
||||
// TODO consider allowing []const u8
|
||||
[:0]const u8, [*:0]const u8 => {}, // ok
|
||||
else => @compileError("invalid argument type: " ++ @typeName(Arg)),
|
||||
}
|
||||
return struct {
|
||||
pub const Result = struct {
|
||||
/// Remaining args after the recognized flags
|
||||
args: []const Arg,
|
||||
/// Data obtained from parsed flags
|
||||
flags: Flags,
|
||||
|
||||
pub const Flags = flags_type: {
|
||||
var fields: []const std.builtin.Type.StructField = &.{};
|
||||
for (flags) |flag| {
|
||||
const field: std.builtin.Type.StructField = switch (flag.kind) {
|
||||
.boolean => .{
|
||||
.name = flag.name,
|
||||
.type = bool,
|
||||
.default_value_ptr = &false,
|
||||
.is_comptime = false,
|
||||
.alignment = @alignOf(bool),
|
||||
},
|
||||
.arg => .{
|
||||
.name = flag.name,
|
||||
.type = ?[:0]const u8,
|
||||
.default_value_ptr = &@as(?[:0]const u8, null),
|
||||
.is_comptime = false,
|
||||
.alignment = @alignOf(?[:0]const u8),
|
||||
},
|
||||
};
|
||||
fields = fields ++ [_]std.builtin.Type.StructField{field};
|
||||
}
|
||||
break :flags_type @Type(.{ .@"struct" = .{
|
||||
.layout = .auto,
|
||||
.fields = fields,
|
||||
.decls = &.{},
|
||||
.is_tuple = false,
|
||||
} });
|
||||
};
|
||||
};
|
||||
|
||||
pub fn parse(args: []const Arg) !Result {
|
||||
var result_flags: Result.Flags = .{};
|
||||
|
||||
var i: usize = 0;
|
||||
outer: while (i < args.len) : (i += 1) {
|
||||
const arg = switch (Arg) {
|
||||
[*:0]const u8 => mem.sliceTo(args[i], 0),
|
||||
[:0]const u8 => args[i],
|
||||
else => unreachable,
|
||||
};
|
||||
inline for (flags) |flag| {
|
||||
if (mem.eql(u8, "-" ++ flag.name, arg)) {
|
||||
switch (flag.kind) {
|
||||
.boolean => @field(result_flags, flag.name) = true,
|
||||
.arg => {
|
||||
i += 1;
|
||||
if (i == args.len) {
|
||||
std.log.err("option '-" ++ flag.name ++
|
||||
"' requires an argument but none was provided!", .{});
|
||||
return error.MissingFlagArgument;
|
||||
}
|
||||
@field(result_flags, flag.name) = switch (Arg) {
|
||||
[*:0]const u8 => mem.sliceTo(args[i], 0),
|
||||
[:0]const u8 => args[i],
|
||||
else => unreachable,
|
||||
};
|
||||
},
|
||||
}
|
||||
continue :outer;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return Result{
|
||||
.args = args[i..],
|
||||
.flags = result_flags,
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
93
src/main.zig
93
src/main.zig
|
|
@ -23,7 +23,57 @@ const Globals = struct {
|
|||
}
|
||||
};
|
||||
|
||||
const usage: []const u8 =
|
||||
\\usage: beansprout [options]
|
||||
\\
|
||||
\\ -h Print this help message and exit.
|
||||
\\ -version Print the version number and exit.
|
||||
\\ -log-level <level> Set the log level to error, warning, info, or debug.
|
||||
\\
|
||||
;
|
||||
|
||||
pub fn main() !void {
|
||||
const result = flags.parser([*:0]const u8, &.{
|
||||
.{ .name = "h", .kind = .boolean },
|
||||
.{ .name = "version", .kind = .boolean },
|
||||
.{ .name = "log-level", .kind = .arg },
|
||||
}).parse(std.os.argv[1..]) catch {
|
||||
try stderr.writeAll(usage);
|
||||
try stderr.flush();
|
||||
posix.exit(1);
|
||||
};
|
||||
if (result.flags.h) {
|
||||
try stdout.writeAll(usage);
|
||||
try stdout.flush();
|
||||
posix.exit(0);
|
||||
}
|
||||
if (result.args.len != 0) {
|
||||
log.err("unknown option '{s}'", .{result.args[0]});
|
||||
try stderr.writeAll(usage);
|
||||
try stderr.flush();
|
||||
posix.exit(1);
|
||||
}
|
||||
|
||||
if (result.flags.version) {
|
||||
try stdout.writeAll(build_options.version ++ "\n");
|
||||
try stdout.flush();
|
||||
posix.exit(0);
|
||||
}
|
||||
if (result.flags.@"log-level") |level| {
|
||||
if (mem.eql(u8, level, "error")) {
|
||||
runtime_log_level = .err;
|
||||
} else if (mem.eql(u8, level, "warning")) {
|
||||
runtime_log_level = .warn;
|
||||
} else if (mem.eql(u8, level, "info")) {
|
||||
runtime_log_level = .info;
|
||||
} else if (mem.eql(u8, level, "debug")) {
|
||||
runtime_log_level = .debug;
|
||||
} else {
|
||||
log.err("invalid log level '{s}'", .{level});
|
||||
posix.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
const wayland_display_var = try utils.allocator.dupeZ(u8, process.getEnvVarOwned(utils.allocator, "WAYLAND_DISPLAY") catch {
|
||||
fatal("Error getting WAYLAND_DISPLAY environment variable. Exiting", .{});
|
||||
});
|
||||
|
|
@ -134,9 +184,49 @@ fn registryListener(registry: *wl.Registry, event: wl.Registry.Event, globals: *
|
|||
}
|
||||
}
|
||||
|
||||
var stderr_buffer: [1024]u8 = undefined;
|
||||
var stderr_writer = fs.File.stderr().writer(&stderr_buffer);
|
||||
const stderr = &stderr_writer.interface;
|
||||
|
||||
var stdout_buffer: [1024]u8 = undefined;
|
||||
var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
|
||||
const stdout = &stdout_writer.interface;
|
||||
|
||||
/// Set the default log level based on the build mode.
|
||||
var runtime_log_level: std.log.Level = switch (builtin.mode) {
|
||||
.Debug => .debug,
|
||||
.ReleaseSafe, .ReleaseFast, .ReleaseSmall => .info,
|
||||
};
|
||||
|
||||
pub const std_options: std.Options = .{
|
||||
// Tell std.log to leave all log level filtering to us.
|
||||
.log_level = .debug,
|
||||
.logFn = logFn,
|
||||
};
|
||||
|
||||
pub fn logFn(
|
||||
comptime level: std.log.Level,
|
||||
comptime scope: @TypeOf(.EnumLiteral),
|
||||
comptime format: []const u8,
|
||||
args: anytype,
|
||||
) void {
|
||||
if (@intFromEnum(level) > @intFromEnum(runtime_log_level)) return;
|
||||
|
||||
if (scope != .default) return;
|
||||
|
||||
const scope_prefix = if (scope == .default) ": " else "(" ++ @tagName(scope) ++ "): ";
|
||||
|
||||
stderr.print(level.asText() ++ scope_prefix ++ format ++ "\n", args) catch return;
|
||||
stderr.flush() catch return;
|
||||
}
|
||||
|
||||
const build_options = @import("build_options");
|
||||
const builtin = @import("builtin");
|
||||
const std = @import("std");
|
||||
const mem = std.mem;
|
||||
const fatal = std.process.fatal;
|
||||
const fs = std.fs;
|
||||
const mem = std.mem;
|
||||
const posix = std.posix;
|
||||
const process = std.process;
|
||||
|
||||
const wayland = @import("wayland");
|
||||
|
|
@ -144,6 +234,7 @@ const river = wayland.client.river;
|
|||
const wl = wayland.client.wl;
|
||||
const zwlr = wayland.client.zwlr;
|
||||
|
||||
const flags = @import("flags.zig");
|
||||
const utils = @import("utils.zig");
|
||||
const Config = @import("Config.zig");
|
||||
const Context = @import("Context.zig");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue