diff --git a/src/Config.zig b/src/Config.zig index 8b29ee24..e07f6b2f 100644 --- a/src/Config.zig +++ b/src/Config.zig @@ -166,7 +166,7 @@ pub const Serve = struct { pub const Fetch = struct { url: [:0]const u8, dump: bool = false, - dump_markdown: bool = false, + markdown: bool = false, common: Common = .{}, withbase: bool = false, strip: dump.Opts.Strip = .{}, @@ -309,7 +309,7 @@ pub fn printUsageAndExit(self: *const Config, success: bool) void { \\--dump Dumps document to stdout. \\ Defaults to false. \\ - \\--dump-markdown Dumps document to stdout as Markdown. + \\--markdown Dumps document to stdout as Markdown. \\ Defaults to false. \\ \\--strip_mode Comma separated list of tag groups to remove from dump @@ -414,7 +414,7 @@ fn inferMode(opt: []const u8) ?RunMode { return .fetch; } - if (std.mem.eql(u8, opt, "--dump-markdown")) { + if (std.mem.eql(u8, opt, "--markdown")) { return .fetch; } @@ -555,7 +555,7 @@ fn parseFetchArgs( args: *std.process.ArgIterator, ) !Fetch { var fetch_dump: bool = false; - var fetch_dump_markdown: bool = false; + var fetch_markdown: bool = false; var withbase: bool = false; var url: ?[:0]const u8 = null; var common: Common = .{}; @@ -567,8 +567,8 @@ fn parseFetchArgs( continue; } - if (std.mem.eql(u8, "--dump-markdown", opt)) { - fetch_dump_markdown = true; + if (std.mem.eql(u8, "--markdown", opt)) { + fetch_markdown = true; continue; } @@ -636,7 +636,7 @@ fn parseFetchArgs( return .{ .url = url.?, .dump = fetch_dump, - .dump_markdown = fetch_dump_markdown, + .markdown = fetch_markdown, .strip = strip, .common = common, .withbase = withbase, diff --git a/src/lightpanda.zig b/src/lightpanda.zig index 7a7f7341..1904c3ba 100644 --- a/src/lightpanda.zig +++ b/src/lightpanda.zig @@ -37,7 +37,7 @@ const IS_DEBUG = @import("builtin").mode == .Debug; pub const FetchOpts = struct { wait_ms: u32 = 5000, dump: dump.RootOpts, - dump_markdown: bool = false, + markdown: bool = false, writer: ?*std.Io.Writer = null, }; pub fn fetch(app: *App, url: [:0]const u8, opts: FetchOpts) !void { @@ -96,7 +96,7 @@ pub fn fetch(app: *App, url: [:0]const u8, opts: FetchOpts) !void { _ = session.wait(opts.wait_ms); const writer = opts.writer orelse return; - if (opts.dump_markdown) { + if (opts.markdown) { try markdown.dump(page.window._document.asNode(), .{}, writer, page); } else { try dump.root(page.window._document, opts.dump, writer, page); diff --git a/src/main.zig b/src/main.zig index 22f8dc39..6a648ed1 100644 --- a/src/main.zig +++ b/src/main.zig @@ -111,7 +111,7 @@ fn run(allocator: Allocator, main_arena: Allocator) !void { var fetch_opts = lp.FetchOpts{ .wait_ms = 5000, - .dump_markdown = opts.dump_markdown, + .markdown = opts.markdown, .dump = .{ .strip = opts.strip, .with_base = opts.withbase, @@ -120,7 +120,7 @@ fn run(allocator: Allocator, main_arena: Allocator) !void { var stdout = std.fs.File.stdout(); var writer = stdout.writer(&.{}); - if (opts.dump or opts.dump_markdown) { + if (opts.dump or opts.markdown) { fetch_opts.writer = &writer.interface; }