refactor: changes for Zig v0.14

Author: AMythicDev

build.zig

@@ -5,8 +5,6 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const zip = b.dependency("zip", .{});
-
     const common = b.createModule(.{ .root_source_file = b.path("src/common/root.zig") });
     const default_os = target.result.os.tag;
     if (default_os.isBSD() or default_os.isDarwin() or default_os == std.Target.Os.Tag.linux) {
@@ -31,7 +29,7 @@ pub fn build(b: *std.Build) !void {
     });
 
     zigverm.root_module.addImport("common", common);
-    zigverm.root_module.addImport("zip", zip.module("zip"));
+    // zigverm.root_module.addImport("zip", zip.module("zip"));
     zig.root_module.addImport("common", common);
     b.installArtifact(zigverm);
     b.installArtifact(zig);

build.zig.zon

@@ -1,14 +1,8 @@
 .{
-    .name = "zigverm",
+    .name = .zigverm,
     .version = "0.6.2",
     .minimum_zig_version = "0.11.0",
-
-    .dependencies = .{
-        .zip = .{
-            .url = "git+https://github.com/AMythicDev/zip.zig#b1f8fe858943cb14eb333c7424bb23ae002ee7a1",
-            .hash = "1220130f0297f2c4cca318c6383758e5c1632467556147347af2c6a1214cab7a6ba4",
-        },
-    },
+    .fingerprint = 0xffdf55ceb1c7efde,
 
     .paths = .{
         "build.zig",

src/main.zig

@@ -211,21 +211,21 @@ fn installed_versions(alloc: Allocator, cp: CommonPaths) ![][]const u8 {
     return versions.items;
 }
 
-fn get_version_from_exe(alloc: Allocator, release_name: []const u8) !std.ArrayList(u8) {
+fn get_version_from_exe(alloc: Allocator, release_name: []const u8) !std.ArrayListUnmanaged(u8) {
     var executable = [2][]const u8{ undefined, "version" };
     executable[0] = try std.fs.path.join(alloc, &.{
         common.paths.CommonPaths.get_zigverm_root(),
         "installs/",
         release_name,
         "zig",
     });
-    var version = std.ArrayList(u8).init(alloc);
-    var stderr = std.ArrayList(u8).init(alloc);
+    var version: std.ArrayListUnmanaged(u8) = .empty;
+    var stderr: std.ArrayListUnmanaged(u8) = .empty;
     var child = std.process.Child.init(&executable, alloc);
     child.stdout_behavior = .Pipe;
     child.stderr_behavior = .Pipe;
     try child.spawn();
-    try child.collectOutput(&version, &stderr, 256);
+    try child.collectOutput(alloc, &version, &stderr, 256);
     _ = try child.wait();
     _ = version.pop();
 

src/update-self.zig

@@ -12,7 +12,6 @@ const File = std.fs.File;
 const BufferedReader = std.io.BufferedReader;
 const BufferedWriter = std.io.BufferedWriter;
 const Allocator = std.mem.Allocator;
-const ZipArchive = @import("zip").read.ZipArchive;
 
 const DownloadTarball = struct {
     filename: []const u8,
@@ -72,20 +71,19 @@ pub fn update_self(alloc: Allocator, cp: CommonPaths) !void {
         try install.download_tarball(alloc, &client, download_tarball.url, &download_tarball.writer.?, download_tarball.file_size, download_tarball.actual_size);
     try download_tarball.file_handle.?.seekTo(0);
     const bin_dir = try cp.zigverm_root.openDir("bin/", .{});
-
-    const zipfile = try ZipArchive.openFromStreamSource(alloc, @constCast(&std.io.StreamSource{ .file = download_tarball.file_handle.? }));
-
-    var m_iter = zipfile.members.iterator();
-    while (m_iter.next()) |i| {
-        var entry = i.value_ptr.*;
-        if (entry.is_dir) continue;
-
-        const filename = std.fs.path.basename(i.key_ptr.*);
-        const file = try bin_dir.createFile(filename, .{ .truncate = true, .lock = .shared });
-        var file_writer = std.io.bufferedWriter(file.writer());
-        defer file.close();
-
-        _ = try entry.decompressWriter(&file_writer.writer());
+    _ = bin_dir;
+
+    var src = @constCast(&std.io.StreamSource{ .file = download_tarball.file_handle.? }).seekableStream();
+    var m_iter = try std.zip.Iterator(@TypeOf(&src)).init(&src);
+
+    while (try m_iter.next()) |i| {
+        std.debug.print("{any}", .{i});
+        // const filename = std.fs.path.basename(i.key_ptr.*);
+        // const file = try bin_dir.createFile(filename, .{ .truncate = true, .lock = .shared });
+        // var file_writer = std.io.bufferedWriter(file.writer());
+        // defer file.close();
+        //
+        // _ = try entry.decompressWriter(&file_writer.writer());
     }
     std.debug.print("zigverm updated successfully", .{});
 }