Skip to content

Lightpanda: the headless browser designed for AI and automation

cli: read a url-like --dump argument as the url, keep --log-filter's sign

Adrià Arrufatcafe31649a93
diff --git a/src/Config.zig b/src/Config.zig
index e1e83e1c6..264bcfa88 100644
--- a/src/Config.zig
+++ b/src/Config.zig
@@ -69,7 +69,7 @@ fn logFilterValidator(allocator: Allocator, args: *std.process.Args.Iterator, li
}
const v = std.meta.stringToEnum(log.Scope, name) orelse {
- return cli.invalidChoice("--log-filter", name, comptime tagNames(log.Scope) ++ &[_][]const u8{"all"});
+ return cli.invalidChoice("--log-filter", part[0 .. part.len - name.len], name, comptime tagNames(log.Scope) ++ &[_][]const u8{"all"});
};
try list.append(allocator, .{ .scope = v, .enable = enable });
@@ -84,7 +84,7 @@ fn logLevelValidator(_: Allocator, args: *std.process.Args.Iterator, target: *?l
return;
}
- target.* = std.meta.stringToEnum(log.Level, str) orelse return cli.invalidChoice("--log-level", str, tagNames(log.Level));
+ target.* = std.meta.stringToEnum(log.Level, str) orelse return cli.invalidChoice("--log-level", "", str, tagNames(log.Level));
log.opts.level = target.*.?;
}
@@ -97,7 +97,7 @@ fn mcpLogDefaults() void {
fn logFormatValidator(_: Allocator, args: *std.process.Args.Iterator, target: *?log.Format) !void {
const str = args.next() orelse return error.MissingArgument;
- const format = std.meta.stringToEnum(log.Format, str) orelse return cli.invalidChoice("--log-format", str, tagNames(log.Format));
+ const format = std.meta.stringToEnum(log.Format, str) orelse return cli.invalidChoice("--log-format", "", str, tagNames(log.Format));
target.* = format;
log.opts.format = format;
}
@@ -316,8 +316,10 @@ fn dumpValidator(_: Allocator, args: *std.process.Args.Iterator, target: *?DumpF
if (peek_args.next()) |next_arg| {
const mode = std.meta.stringToEnum(DumpFormat, next_arg) orelse {
// Anything else is the positional url, unless it is a misspelt format.
- if (string.closest(next_arg, tagNames(DumpFormat)) != null) {
- return cli.invalidChoice("--dump", next_arg, tagNames(DumpFormat));
+ // No format has a `.`, `/` or `:`, so `markdown.com` is a url.
+ const url_like = std.mem.indexOfAny(u8, next_arg, ".:/") != null;
+ if (!url_like and string.closest(next_arg, tagNames(DumpFormat)) != null) {
+ return cli.invalidChoice("--dump", "", next_arg, tagNames(DumpFormat));
}
target.* = .html;
return;
@@ -1360,6 +1362,25 @@ test "Config: parseArgs --http-session-timeout" {
}
}
+test "Config: parseArgs --dump tells a url from a misspelt format" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+
+ {
+ const argv = [_][*:0]const u8{ "lightpanda", "fetch", "--dump", "markdown.com" };
+ const proc_args: std.process.Args = .{ .vector = &argv };
+ const config = try parseArgs(arena.allocator(), proc_args);
+ try std.testing.expectEqual(.html, config.mode.fetch.dump);
+ try std.testing.expectEqualStrings("markdown.com", config.mode.fetch.url.items[0]);
+ }
+ {
+ log.expectLog(&.{.app});
+ const argv = [_][*:0]const u8{ "lightpanda", "fetch", "--dump", "markdwon", "https://example.com" };
+ const proc_args: std.process.Args = .{ .vector = &argv };
+ try std.testing.expectError(error.InvalidArgument, parseArgs(arena.allocator(), proc_args));
+ }
+}
+
test "Config: validateUserAgent" {
try validateUserAgent("Lightpanda/1.0");
try std.testing.expectError(error.Reserved, validateUserAgent("mozilla/1.0"));
diff --git a/src/cli.zig b/src/cli.zig
index 734cb97d9..bcf0afe9f 100644
--- a/src/cli.zig
+++ b/src/cli.zig
@@ -200,11 +200,16 @@ pub fn tagNames(comptime E: type) []const []const u8 {
};
}
-pub fn invalidChoice(arg: []const u8, value: []const u8, choices: []const []const u8) error{InvalidArgument} {
+/// `prefix` was stripped from `value` before matching, like `--log-filter`'s sign.
+pub fn invalidChoice(arg: []const u8, prefix: []const u8, value: []const u8, choices: []const []const u8) error{InvalidArgument} {
+ var value_buf: [128]u8 = undefined;
+ const typed = std.fmt.bufPrint(&value_buf, "{s}{s}", .{ prefix, value }) catch value;
if (string.closest(value, choices)) |near| {
- log.fatal(.app, "invalid option choice", .{ .arg = arg, .value = log.red(value), .did_you_mean = log.green(near) });
+ var near_buf: [128]u8 = undefined;
+ const suggestion = std.fmt.bufPrint(&near_buf, "{s}{s}", .{ prefix, near }) catch near;
+ log.fatal(.app, "invalid option choice", .{ .arg = arg, .value = log.red(typed), .did_you_mean = log.green(suggestion) });
} else {
- log.fatal(.app, "invalid option choice", .{ .arg = arg, .value = log.red(value) });
+ log.fatal(.app, "invalid option choice", .{ .arg = arg, .value = log.red(typed) });
}
return error.InvalidArgument;
}
@@ -697,7 +702,7 @@ pub fn Builder(comptime commands: anytype) type {
};
const str = args.next() orelse return error.MissingArgument;
- const v = std.meta.stringToEnum(E, str) orelse return invalidChoice(kebab_cased, str, tagNames(E));
+ const v = std.meta.stringToEnum(E, str) orelse return invalidChoice(kebab_cased, "", str, tagNames(E));
if (is_multiple) {
try target.append(allocator, v);