diff --git a/src/cmd/aquila/showjson.zig b/src/cmd/aquila/showjson.zig index 64c2d96b4cf05007a89f5c9bb22baf4c86ecdd54..b4f5eb8b0ae8e767318a105ec812816e47054981 100644 --- a/src/cmd/aquila/showjson.zig +++ b/src/cmd/aquila/showjson.zig @@ -1,6 +1,5 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const out = std.io.getStdOut().writer(); const u = @import("./../../util/index.zig"); const aq = @import("./../aq.zig"); @@ -9,6 +8,8 @@ const aq = @import("./../aq.zig"); // pub fn execute(args: [][]u8) !void { + const out = std.io.getStdOut().writer(); + const url = try std.mem.join(gpa, "/", &.{ aq.server_root, args[0] }); const val = try aq.server_fetch(url); diff --git a/src/cmd/zpm/search.zig b/src/cmd/zpm/search.zig index b75106a0df671487dea985c8c983806e079d86bb..8ca76a27d10b08b27d2c3331f1dd81a9cbe9bb0c 100644 --- a/src/cmd/zpm/search.zig +++ b/src/cmd/zpm/search.zig @@ -1,6 +1,5 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const out = std.io.getStdOut().writer(); const zfetch = @import("zfetch"); const json = @import("json"); @@ -13,6 +12,8 @@ const zpm = @import("./../zpm.zig"); // pub fn execute(args: [][]u8) !void { + const out = std.io.getStdOut().writer(); + const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, "packages" }); const val = try zpm.server_fetch(url); @@ -57,24 +58,24 @@ pub fn execute(args: [][]u8) !void { }; try out.writeAll("NAME"); - try print_c_n(' ', name_col_width - 4); + try print_c_n(out, ' ', name_col_width - 4); try out.writeAll("AUTHOR"); - try print_c_n(' ', author_col_width - 6); + try print_c_n(out, ' ', author_col_width - 6); try out.writeAll("DESCRIPTION\n"); for (list) |pkg| { try out.writeAll(pkg.name); - try print_c_n(' ', name_col_width - pkg.name.len); + try print_c_n(out, ' ', name_col_width - pkg.name.len); try out.writeAll(pkg.author); - try print_c_n(' ', author_col_width - pkg.author.len); + try print_c_n(out, ' ', author_col_width - pkg.author.len); try out.writeAll(pkg.description); try out.writeAll("\n"); } } -fn print_c_n(c: u8, n: usize) !void { +fn print_c_n(out: anytype, c: u8, n: usize) !void { for (range(n)) |_| { try out.writeAll(&.{c}); } diff --git a/src/cmd/zpm/showjson.zig b/src/cmd/zpm/showjson.zig index 603e088beff0c7c3e03a91cfaa6d9104a673d7d6..8a4ca2518d38e95c2ce5c3845452526a6647447c 100644 --- a/src/cmd/zpm/showjson.zig +++ b/src/cmd/zpm/showjson.zig @@ -11,9 +11,10 @@ const zpm = @import("./../zpm.zig"); // pub fn execute(args: [][]u8) !void { + const out = std.io.getStdOut().writer(); + const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, args[0] }); const val = try zpm.server_fetch(url); - const out = std.io.getStdOut().writer(); try out.print("{}\n", .{val}); } diff --git a/src/cmd/zpm/tags.zig b/src/cmd/zpm/tags.zig index 62376621ae708e6432728a5f6454ac02325a8981..fc95cdd65560c47bb2355d9d125da4de0dba66d1 100644 --- a/src/cmd/zpm/tags.zig +++ b/src/cmd/zpm/tags.zig @@ -1,6 +1,5 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const out = std.io.getStdOut().writer(); const zfetch = @import("zfetch"); const json = @import("json"); @@ -13,6 +12,8 @@ const zpm = @import("./../zpm.zig"); // pub fn execute(args: [][]u8) !void { + const out = std.io.getStdOut().writer(); + const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, "tags" }); const val = try zpm.server_fetch(url); @@ -28,19 +29,19 @@ pub fn execute(args: [][]u8) !void { }; try out.writeAll("NAME"); - try print_c_n(' ', name_col_width - 4); + try print_c_n(out, ' ', name_col_width - 4); try out.writeAll("DESCRIPTION\n"); for (val.Array) |tag| { const name = tag.get("name").?.String; try out.writeAll(name); - try print_c_n(' ', name_col_width - name.len); + try print_c_n(out, ' ', name_col_width - name.len); try out.writeAll(tag.get("description").?.String); try out.writeAll("\n"); } } -fn print_c_n(c: u8, n: usize) !void { +fn print_c_n(out: anytype, c: u8, n: usize) !void { for (range(n)) |_| { try out.writeAll(&.{c}); }