diff options
Diffstat (limited to '')
| -rw-r--r-- | src/exe.zig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/exe.zig b/src/exe.zig index d5bc239..06e7a4d 100644 --- a/src/exe.zig +++ b/src/exe.zig @@ -4,7 +4,7 @@ const log = std.log.scoped(.exe); const Context = @import("main.zig").Context; const fs = @import("fs.zig"); -pub fn run_pandoc(ctx: *Context) !void { +pub fn runPandoc(ctx: *Context) !void { ctx.progress_start("Processing markdown files"); defer ctx.progress_end(); @@ -21,7 +21,7 @@ pub fn run_pandoc(ctx: *Context) !void { // https://github.com/ziglang/zig/issues/18810 try pool.spawn(struct { fn worker(worker_ctx: *Context, worker_page: *const []const u8) void { - pandoc_worker(worker_ctx, worker_page.*) catch |err| std.log.err("pandoc worker failed with: {}", .{err}); + pandocWorker(worker_ctx, worker_page.*) catch |err| std.log.err("pandoc worker failed with: {}", .{err}); } }.worker, .{ ctx, page }); } @@ -29,10 +29,10 @@ pub fn run_pandoc(ctx: *Context) !void { log.info("Processed {d} markdown files.", .{ctx.markdown.items.len}); } -fn pandoc_worker(ctx: *Context, page: []const u8) !void { +fn pandocWorker(ctx: *Context, page: []const u8) !void { const source_path = try std.fs.path.join(ctx.allocator(), &.{ Context.params.PAGE_PATH, page }); defer ctx.allocator().free(source_path); - const target_path = try fs.replace_extension(ctx.allocator(), source_path, "htm"); + const target_path = try fs.replaceExtension(ctx.allocator(), source_path, "htm"); defer ctx.allocator().free(target_path); const f = try fs.FileSwapper.createAt(ctx.allocator(), target_path); @@ -46,8 +46,8 @@ fn pandoc_worker(ctx: *Context, page: []const u8) !void { ); // get mtime of the source document - const mtime = try fs.get_mtime(ctx.allocator(), source_path); - const mtime_str = try fs.format_mtime(ctx.allocator(), mtime, "%s"); + const mtime = try fs.getMtime(ctx.allocator(), source_path); + const mtime_str = try fs.formatMtime(ctx.allocator(), mtime, "%s"); defer ctx.allocator().free(mtime_str); // make pandoc runs reproducable @@ -55,7 +55,7 @@ fn pandoc_worker(ctx: *Context, page: []const u8) !void { defer env_map.deinit(); try env_map.put("SOURCE_DATE_EPOCH", mtime_str); - try capture_stdout(ctx, &.{ + try captureStdout(ctx, &.{ Context.params.PANDOC, "--from", "markdown+wikilinks_title_after_pipe+autolink_bare_uris", @@ -70,7 +70,7 @@ fn pandoc_worker(ctx: *Context, page: []const u8) !void { }, &env_map, f.writer().any()); } -pub fn capture_stdout(ctx: *Context, argv: []const []const u8, env_map: ?*std.process.EnvMap, buf: std.io.AnyWriter) !void { +pub fn captureStdout(ctx: *Context, argv: []const []const u8, env_map: ?*std.process.EnvMap, buf: std.io.AnyWriter) !void { const command = try std.mem.join(ctx.allocator(), " ", argv); defer ctx.allocator().free(command); const label = try std.fmt.allocPrint(ctx.allocator(), "running {s}", .{command}); |