authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-05-02 21:52:02 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-05-02 21:52:02 -07:00
log2a1a595dec91552d05b2f0c6c666f14dbb301e70
tree14ceb194133c989917b190333834bc14a83614aa
parenta9298362417cf023f783440343374ed212ada707

add aq.server_root decl

will make this a dynamic list of instances in the future

2 files changed, 5 insertions(+), 2 deletions(-)

src/cmd/aq.zig+2
...@@ -10,6 +10,8 @@ pub const commands = struct {...@@ -10,6 +10,8 @@ pub const commands = struct {
10 pub const add = @import("./aquila/add.zig");10 pub const add = @import("./aquila/add.zig");
11};11};
1212
13pub const server_root = "https://aquila.red";
14
13pub fn execute(args: [][]u8) !void {15pub fn execute(args: [][]u8) !void {
14 if (args.len == 0) {16 if (args.len == 0) {
15 std.debug.warn("{s}\n", .{17 std.debug.warn("{s}\n", .{
src/cmd/aquila/add.zig+3-2
...@@ -5,6 +5,7 @@ const zfetch = @import("zfetch");...@@ -5,6 +5,7 @@ const zfetch = @import("zfetch");
5const json = @import("json");5const json = @import("json");
66
7const u = @import("./../../util/index.zig");7const u = @import("./../../util/index.zig");
8const aq = @import("./../aq.zig");
89
9//10//
10//11//
...@@ -12,7 +13,7 @@ const u = @import("./../../util/index.zig");...@@ -12,7 +13,7 @@ const u = @import("./../../util/index.zig");
12pub fn execute(args: [][]u8) !void {13pub fn execute(args: [][]u8) !void {
13 const pkg_id = args[0];14 const pkg_id = args[0];
1415
15 const url = try std.mem.join(gpa, "/", &.{ "https://aquila.red", pkg_id });16 const url = try std.mem.join(gpa, "/", &.{ aq.server_root, pkg_id });
1617
17 const req = try zfetch.Request.init(gpa, url, null);18 const req = try zfetch.Request.init(gpa, url, null);
18 defer req.deinit();19 defer req.deinit();
...@@ -58,7 +59,7 @@ pub fn execute(args: [][]u8) !void {...@@ -58,7 +59,7 @@ pub fn execute(args: [][]u8) !void {
5859
59 const file_w = file.writer();60 const file_w = file.writer();
60 try file_w.print("\n", .{});61 try file_w.print("\n", .{});
61 try file_w.print(" - src: http https://aquila.red/{s}/v{d}.{d}.tar.gz _ {d} {d}\n", .{ pkg_id, v_maj, v_min, v_maj, v_min });62 try file_w.print(" - src: http {s}/{s}/v{d}.{d}.tar.gz _ {d} {d}\n", .{ aq.server_root, pkg_id, v_maj, v_min, v_maj, v_min });
62 try file_w.print(" version: {s}\n", .{v_hash});63 try file_w.print(" version: {s}\n", .{v_hash});
6364
64 std.log.info("Successfully added package {s}", .{pkg_id});65 std.log.info("Successfully added package {s}", .{pkg_id});