From 4c13de3183c369d6d1260e34cf32619c63526481 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Thu, 27 Jan 2022 06:19:48 -0800 Subject: [PATCH] clean up imports --- src/cmd/aq.zig | 1 - src/cmd/aquila/install.zig | 1 - src/cmd/fetch.zig | 4 +-- src/cmd/init.zig | 1 - src/cmd/license.zig | 1 - src/cmd/test.zig | 61 ++++++++++++++++++++++++++++++++++++++ src/cmd/zpm.zig | 1 - src/cmd/zpm/add.zig | 1 - src/cmd/zpm/search.zig | 1 - src/cmd/zpm/showjson.zig | 1 - src/cmd/zpm/tags.zig | 1 - src/common.zig | 3 +- src/main.zig | 1 - 13 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 src/cmd/test.zig diff --git a/src/cmd/aq.zig b/src/cmd/aq.zig index da112069e3a008a63541f54adcde03e957b1ffca..f0e77b268d32e270e3779cb4391257ce7cb1aab3 100644 --- a/src/cmd/aq.zig +++ b/src/cmd/aq.zig @@ -1,7 +1,6 @@ const std = @import("std"); const string = []const u8; const gpa = std.heap.c_allocator; - const zfetch = @import("zfetch"); const json = @import("json"); diff --git a/src/cmd/aquila/install.zig b/src/cmd/aquila/install.zig index 51abdaaa2e68286b32215cda5cb02d92bc20b99e..6d2fe1787aa949df58b80d0765055b2ebc457bad 100644 --- a/src/cmd/aquila/install.zig +++ b/src/cmd/aquila/install.zig @@ -1,7 +1,6 @@ const std = @import("std"); const string = []const u8; const gpa = std.heap.c_allocator; - const knownfolders = @import("known-folders"); const zigmod = @import("../../lib.zig"); diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index ee856ac2ba1a73a50f5670a3857f45156201a26a..d224cf56c7cd891b4b35529a73c116c6ef6727ce 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -1,12 +1,12 @@ const std = @import("std"); const string = []const u8; +const ansi = @import("ansi"); +const root = @import("root"); const zigmod = @import("../lib.zig"); const u = @import("./../util/index.zig"); const common = @import("./../common.zig"); -const ansi = @import("ansi"); -const root = @import("root"); const build_options = if (@hasDecl(root, "build_options")) root.build_options else struct {}; const bootstrap = if (@hasDecl(build_options, "bootstrap")) build_options.bootstrap else false; diff --git a/src/cmd/init.zig b/src/cmd/init.zig index 383537e91eef498d54420b98dc2369ecee1127f7..6a2aa0fcc113341f0637d33c1574ecccae9e1f5c 100644 --- a/src/cmd/init.zig +++ b/src/cmd/init.zig @@ -1,7 +1,6 @@ const std = @import("std"); const string = []const u8; const gpa = std.heap.c_allocator; - const inquirer = @import("inquirer"); const detectlicense = @import("detect-license"); const knownfolders = @import("known-folders"); diff --git a/src/cmd/license.zig b/src/cmd/license.zig index 327331a8b34ddffa2dea915db04682a2e7c9d160..d31de42d713dc9a670f05e273179f4f94d79f3c7 100644 --- a/src/cmd/license.zig +++ b/src/cmd/license.zig @@ -1,6 +1,5 @@ const std = @import("std"); const gpa = std.heap.c_allocator; - const style = @import("ansi").style; const licenses = @import("licenses"); diff --git a/src/cmd/test.zig b/src/cmd/test.zig new file mode 100644 index 0000000000000000000000000000000000000000..ad2c95710889b70161fda0a19176f37c4b85bea9 --- /dev/null +++ b/src/cmd/test.zig @@ -0,0 +1,61 @@ +const std = @import("std"); +const string = []const u8; +const gpa = std.heap.c_allocator; +const range = @import("range").range; +const zfetch = @import("zfetch"); +const ansi = @import("ansi"); + +// +// + +// https://www.thinkbroadband.com/download + +const Progress = struct { + const Item = struct { + max: usize, + current: usize, + done: bool, + }; +}; + +var progress: std.ArrayList(Progress.Item) = undefined; +var left: usize = 0; + +pub fn execute(args: [][]u8) !void { + _ = args; + // progress = std.ArrayList(Progress.Item).init(gpa); + // std.debug.print("\n", .{}); + + // for (range(3)) |_, i| { + // try progress.append(.{ .max = 1, .current = 0, .done = false }); + // left += 1; + // try download("http://ipv4.download.thinkbroadband.com/100MB.zip", i); + // } + + // while (left > 0) { + // for (progress.items) |it, i| { + // std.debug.print("{d}\t{d}\t{d}\t{d}%\n", .{ i, it.current, it.max, @divExact(it.current, it.max) }); + // } + // std.debug.print("\n", .{}); + // } + // for (progress.items) |it, i| { + // std.debug.print("{d}\t{d}\t{d}\t{d}%\n", .{ i, it.current, it.max, @divExact(it.current, it.max) }); + // } +} + +fn download(url: string, index: usize) void { + const req = zfetch.Request.init(gpa, url, null) catch {}; + defer req.deinit(); + + req.do(.GET, null, null) catch {}; + + var buf: [std.mem.page_size]u8 = undefined; + const r = req.reader(); + while (true) { + const len = r.readAll(&buf) catch {}; + progress.items[index].current += len; + if (len < buf.len) break; + } + progress.items[index].done = true; + left -= 1; +} diff --git a/src/cmd/zpm.zig b/src/cmd/zpm.zig index 09adebfc501506564913d8d3bc7f97a7d6612888..e198a000c54679406684815117b3067521a2a9ba 100644 --- a/src/cmd/zpm.zig +++ b/src/cmd/zpm.zig @@ -1,7 +1,6 @@ const std = @import("std"); const string = []const u8; const gpa = std.heap.c_allocator; - const zfetch = @import("zfetch"); const json = @import("json"); diff --git a/src/cmd/zpm/add.zig b/src/cmd/zpm/add.zig index 931056ecd00008033d37cde9ecd3a58753a075d3..b8f12f476198964a793c2e75897d0ec881da8909 100644 --- a/src/cmd/zpm/add.zig +++ b/src/cmd/zpm/add.zig @@ -1,6 +1,5 @@ const std = @import("std"); const gpa = std.heap.c_allocator; - const zfetch = @import("zfetch"); const zigmod = @import("../../lib.zig"); diff --git a/src/cmd/zpm/search.zig b/src/cmd/zpm/search.zig index 0fa942eee147d8e01a0d1b0725a8796d83dadae7..882dc79b1c1e49238b4df1efcbe0cf4b68509141 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 zfetch = @import("zfetch"); const json = @import("json"); const range = @import("range").range; diff --git a/src/cmd/zpm/showjson.zig b/src/cmd/zpm/showjson.zig index 8a4ca2518d38e95c2ce5c3845452526a6647447c..a4c288ea9cfff02bc8b80d814b16c7c0b03df071 100644 --- a/src/cmd/zpm/showjson.zig +++ b/src/cmd/zpm/showjson.zig @@ -1,6 +1,5 @@ const std = @import("std"); const gpa = std.heap.c_allocator; - const zfetch = @import("zfetch"); const json = @import("json"); diff --git a/src/cmd/zpm/tags.zig b/src/cmd/zpm/tags.zig index 6cc586a56f6acf83bccfd8f70b58c7b706d8e06e..0540ab41bcce5580ce11d8f5e0316539214efd62 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 zfetch = @import("zfetch"); const json = @import("json"); const range = @import("range").range; diff --git a/src/common.zig b/src/common.zig index 8b0eb115c4afa00bb67d60f6dd5107ac705c3393..fc3ee905dc4006ccfa19ce613249d8785e9cf828 100644 --- a/src/common.zig +++ b/src/common.zig @@ -1,14 +1,13 @@ const std = @import("std"); const string = []const u8; const builtin = @import("builtin"); - const ansi = @import("ansi"); +const root = @import("root"); const zigmod = @import("./lib.zig"); const u = @import("./util/index.zig"); const yaml = @import("./util/yaml.zig"); -const root = @import("root"); const build_options = if (@hasDecl(root, "build_options")) root.build_options else struct {}; const bootstrap = if (@hasDecl(build_options, "bootstrap")) build_options.bootstrap else false; diff --git a/src/main.zig b/src/main.zig index 444035787a2b261f2166a31092ce0aa8f9172872..d6e2680385660c51fea65f96e9b99372856cdce0 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,7 +1,6 @@ const std = @import("std"); const string = []const u8; const builtin = @import("builtin"); - pub const build_options = @import("build_options"); const zigmod = @import("zigmod"); const win32 = @import("win32"); -- 2.54.0