fix: hash mismatch after downloading Zig tarball

Author: AMythicDev

src/install.zig

@@ -89,10 +89,10 @@ fn get_correct_tarball(alloc: Allocator, io: Io, client: *Client, tarball_dw_fil
 
     if (!hash_matched) {
         if (tries < 3) {
-            std.log.warn("Hashes do match for downloaded tarball. Retrying again...", .{});
+            std.log.warn("Hashes do not match for downloaded tarball. Retrying again...", .{});
             tarball = try get_correct_tarball(alloc, io, client, tarball_dw_filename, tarball_url, total_size, shasum, cp, tries + 1);
         } else {
-            std.log.err("Hashes do match for downloaded tarball. Exitting", .{});
+            std.log.err("Hashes do not match for downloaded tarball. Exiting", .{});
             return error.BadChecksum;
         }
     }
@@ -126,27 +126,22 @@ pub fn downloadTarball(alloc: Allocator, io: Io, client: *Client, tb_url: []cons
 
     var buff: [1024]u8 = undefined;
 
-    // Convert everything into f64 for less typing in calculating % download and download speed
-    var dlnow = std.atomic.Value(f32).init(0);
-    const total_size_d: f64 = @floatFromInt(total_size);
-    const tarball_size_d: f64 = @floatFromInt(tarball_size);
+    var dlnow = std.atomic.Value(usize).init(0);
+    const tarball_size_u: usize = @intCast(tarball_size);
 
-    const progress_thread = try std.Thread.spawn(.{}, download_progress_bar, .{ io, &dlnow, tarball_size_d, total_size_d });
+    const progress_thread = try std.Thread.spawn(.{}, download_progress_bar, .{ io, &dlnow, tarball_size_u, total_size });
     const tbw_intf = &tb_writer.interface;
-    while (tarball_size_d + dlnow.load(AtomicOrder.monotonic) <= total_size_d) {
+    while (tarball_size_u + dlnow.load(AtomicOrder.monotonic) < total_size) {
         const len = try reader.readSliceShort(&buff);
-        _ = try tbw_intf.write(buff[0..len]);
-        _ = dlnow.fetchAdd(@floatFromInt(len), AtomicOrder.monotonic);
-
-        if (len < buff.len) {
-            break;
-        }
+        if (len == 0) break;
+        try tbw_intf.writeAll(buff[0..len]);
+        _ = dlnow.fetchAdd(len, AtomicOrder.monotonic);
     }
     progress_thread.join();
     try tb_writer.end();
 }
 
-pub fn download_progress_bar(io: Io, dlnow: *std.atomic.Value(f32), tarball_size: f64, total_size: f64) !void {
+pub fn download_progress_bar(io: Io, dlnow: *std.atomic.Value(usize), tarball_size: usize, total_size: usize) !void {
     const stderr = File.stderr();
     var stderrw = stderr.writer(io, &.{});
     const stderr_writer = &stderrw.interface;
@@ -158,14 +153,14 @@ pub fn download_progress_bar(io: Io, dlnow: *std.atomic.Value(f32), tarball_size
     var downloaded = dlnow.load(AtomicOrder.monotonic);
 
     while (true) {
-        const pcnt_complete: u8 = @intFromFloat((downloaded + tarball_size) * 100 / total_size);
+        const pcnt_complete: u8 = @intCast((downloaded + tarball_size) * 100 / total_size);
         const newbars: u8 = pcnt_complete / 2;
         for (bars..newbars) |i| {
             std.mem.copyForwards(u8, progress_bar[i * 3 .. i * 3 + 3], "█");
         }
         bars = newbars;
         const time_passed: f64 = @floatFromInt(start.untilNow(io, clock).toSeconds());
-        const speed = downloaded / 1024 / time_passed;
+        const speed = @as(f64, @floatFromInt(downloaded)) / 1024.0 / time_passed;
         try stderr_writer.print("\x1b[G\x1b[0K\t\x1b[33m{s}\x1b[0m{s} {d}% {d:.1}KB/s", .{ progress_bar[0 .. newbars * 3], progress_bar[newbars * 3 ..], pcnt_complete, speed });
 
         if (downloaded + tarball_size >= total_size) break;

src/zigverm-setup/main.zig

@@ -167,21 +167,16 @@ fn download_tarball(
 
     var buff: [1024]u8 = undefined;
 
-    // Convert everything into f64 for less typing in calculating % download and download speed
-    var dlnow = std.atomic.Value(f32).init(0);
-    const total_size_d: f64 = @floatFromInt(total_size);
-    const tarball_size_d: f64 = @floatFromInt(tarball_size);
+    var dlnow = std.atomic.Value(usize).init(0);
+    const tarball_size_u: usize = @intCast(tarball_size);
 
-    const progress_thread = try std.Thread.spawn(.{}, download_progress_bar, .{ io, &dlnow, tarball_size_d, total_size_d });
+    const progress_thread = try std.Thread.spawn(.{}, download_progress_bar, .{ io, &dlnow, tarball_size_u, total_size });
     const tbw_intf = &tb_writer.interface;
-    while (tarball_size_d + dlnow.load(AtomicOrder.monotonic) <= total_size_d) {
+    while (tarball_size_u + dlnow.load(AtomicOrder.monotonic) < total_size) {
         const len = try reader.readSliceShort(&buff);
+        if (len == 0) break;
         try tbw_intf.writeAll(buff[0..len]);
-        _ = dlnow.fetchAdd(@floatFromInt(len), AtomicOrder.monotonic);
-
-        if (len < buff.len) {
-            break;
-        }
+        _ = dlnow.fetchAdd(len, AtomicOrder.monotonic);
     }
     progress_thread.join();
     try tb_writer.end();
@@ -223,7 +218,7 @@ fn read_github_releases_data(alloc: std.mem.Allocator, io: Io, client: *Client)
     return try json.parseFromTokenSource(json.Value, alloc, &json_reader, .{});
 }
 
-pub fn download_progress_bar(io: Io, dlnow: *std.atomic.Value(f32), tarball_size: f64, total_size: f64) !void {
+pub fn download_progress_bar(io: Io, dlnow: *std.atomic.Value(usize), tarball_size: usize, total_size: usize) !void {
     const stderr = std.Io.File.stderr();
     var stderrw = std.Io.File.Writer.init(stderr, io, &.{});
     const stderr_writer = &stderrw.interface;
@@ -236,14 +231,14 @@ pub fn download_progress_bar(io: Io, dlnow: *std.atomic.Value(f32), tarball_size
     var downloaded = dlnow.load(AtomicOrder.monotonic);
 
     while (true) {
-        const pcnt_complete: u8 = @intFromFloat((downloaded + tarball_size) * 100 / total_size);
+        const pcnt_complete: u8 = @intCast((downloaded + tarball_size) * 100 / total_size);
         const newbars: u8 = pcnt_complete / 2;
         for (bars..newbars) |i| {
             std.mem.copyForwards(u8, progress_bar[i * 3 .. i * 3 + 3], "█");
         }
         bars = newbars;
         const time_passed: f64 = @floatFromInt(start.untilNow(io, clock).toSeconds());
-        const speed = downloaded / 1024 / time_passed;
+        const speed = @as(f64, @floatFromInt(downloaded)) / 1024.0 / time_passed;
         try stderr_writer.print("\x1b[G\x1b[0K\t\x1b[33m{s}\x1b[0m{s} {d}% {d:.1}KB/s", .{ progress_bar[0 .. newbars * 3], progress_bar[newbars * 3 ..], pcnt_complete, speed });
 
         if (downloaded + tarball_size >= total_size) break;