Upgrade readers and writers in unbundle

Author: isaacvando

src/bundle/test_bundle.zig

@@ -838,7 +838,10 @@ test "unbundle with existing directory error" {
     defer bundle_file.close();
 
     // This should succeed but the CLI would error on existing directory
-    try bundle.unbundle(bundle_file.reader(), tmp_dir, &allocator, filename, null);
+    var reader_buffer: [1024]u8 = undefined;
+    var reader_interface = bundle_file.reader(&reader_buffer).interface;
+    var reader = reader_interface.adaptToOldInterface();
+    try bundle.unbundle(&reader, tmp_dir, &allocator, filename, null);
 }
 
 test "unbundle multiple archives" {
@@ -911,7 +914,10 @@ test "unbundle multiple archives" {
         const dir_name = fname[0 .. fname.len - 8]; // Remove .tar.zst
         const extract_dir = try tmp_dir.makeOpenPath(dir_name, .{});
 
-        try bundle.unbundle(bundle_file.reader(), extract_dir, &allocator, fname, null);
+        var reader_buffer: [1024]u8 = undefined;
+        var reader_interface = bundle_file.reader(&reader_buffer).interface;
+        var reader = reader_interface.adaptToOldInterface();
+        try bundle.unbundle(&reader, extract_dir, &allocator, fname, null);
     }
 
     // Verify extraction
@@ -1046,7 +1052,10 @@ test "double roundtrip bundle -> unbundle -> bundle -> unbundle" {
 
         const extract_dir = try unbundle1_dir.makeOpenPath("extracted1", .{});
 
-        try bundle.unbundle(bundle_file.reader(), extract_dir, &allocator, filename1, null);
+        var reader_buffer: [1024]u8 = undefined;
+        var reader_interface = bundle_file.reader(&reader_buffer).interface;
+        var reader = reader_interface.adaptToOldInterface();
+        try bundle.unbundle(&reader, extract_dir, &allocator, filename1, null);
     }
 
     // Second bundle (from first extraction)
@@ -1085,7 +1094,10 @@ test "double roundtrip bundle -> unbundle -> bundle -> unbundle" {
 
         const extract_dir = try unbundle2_dir.makeOpenPath("extracted2", .{});
 
-        try bundle.unbundle(bundle_file.reader(), extract_dir, &allocator, filename2, null);
+        var reader_buffer: [1024]u8 = undefined;
+        var reader_interface = bundle_file.reader(&reader_buffer).interface;
+        var reader = reader_interface.adaptToOldInterface();
+        try bundle.unbundle(&reader, extract_dir, &allocator, filename2, null);
     }
 
     // Verify all files match original content

src/unbundle/unbundle.zig

@@ -23,10 +23,8 @@ const ZSTD_WINDOW_BUFFER_SIZE: usize = 1 << 23; // 8MB
 pub const UnbundleError = error{
     DecompressionFailed,
     InvalidTarHeader,
-    UnexpectedEndOfStream,
     FileCreateFailed,
     DirectoryCreateFailed,
-    FileWriteFailed,
     HashMismatch,
     InvalidFilename,
     FileTooLarge,
@@ -36,6 +34,8 @@ pub const UnbundleError = error{
     DictionaryIdFlagUnsupported,
     MalformedBlock,
     MalformedFrame,
+    StreamError,
+    WriteFailed,
 } || std.mem.Allocator.Error;
 
 /// Context for error reporting during unbundle operations
@@ -388,7 +388,7 @@ fn HashingReader(comptime ReaderType: type) type {
 
         const Self = @This();
         pub const Error = ReaderType.Error;
-        pub const Reader = std.io.Reader(*Self, Error, read);
+        pub const Reader = std.Io.GenericReader(*Self, Error, read);
 
         pub fn read(self: *Self, buffer: []u8) Error!usize {
             const n = try self.child_reader.read(buffer);
@@ -425,12 +425,13 @@ pub fn unbundleStream(
     };
 
     var window_buffer: [ZSTD_WINDOW_BUFFER_SIZE]u8 = undefined;
-    var zstd_stream = std.compress.zstd.Decompress.init(hashing_reader.reader(), &window_buffer, .{});
-    const decompressed_reader = zstd_stream.reader();
+    var reader_buffer: [4096]u8 = undefined;
+    var reader = hashing_reader.reader().adaptToNewApi(&reader_buffer).new_interface;
+    var zstd_stream = std.compress.zstd.Decompress.init(&reader, &window_buffer, .{});
 
     var file_name_buffer: [std.fs.max_path_bytes]u8 = undefined;
     var link_name_buffer: [std.fs.max_path_bytes]u8 = undefined;
-    var tar_iterator = std.tar.iterator(decompressed_reader, .{
+    var tar_iterator = std.tar.Iterator.init(&zstd_stream.reader, .{
         .file_name_buffer = &file_name_buffer,
         .link_name_buffer = &link_name_buffer,
     });
@@ -460,18 +461,13 @@ pub fn unbundleStream(
                 data_extracted = true;
             },
             .file => {
-                const file_writer = try extract_writer.createFile(file_path);
-                defer extract_writer.finishFile(file_writer);
-
                 var buffer: [STREAM_BUFFER_SIZE]u8 = undefined;
-                var bytes_remaining = entry.size;
-                while (bytes_remaining > 0) {
-                    const to_read = @min(buffer.len, bytes_remaining);
-                    const bytes_read = entry.reader().readAll(buffer[0..to_read]) catch return error.UnexpectedEndOfStream;
-                    if (bytes_read == 0) return error.UnexpectedEndOfStream;
-                    file_writer.writeAll(buffer[0..bytes_read]) catch return error.FileWriteFailed;
-                    bytes_remaining -= bytes_read;
-                }
+                const old_writer = try extract_writer.createFile(file_path);
+                var file_writer = old_writer.adaptToNewApi(&buffer).new_interface;
+                defer extract_writer.finishFile(old_writer);
+
+                tar_iterator.streamRemaining(entry, &file_writer) catch return error.StreamError;
+                try file_writer.flush();
 
                 data_extracted = true;
             },
@@ -505,14 +501,6 @@ pub fn unbundleStream(
                 }
 
                 // TODO: Add symlink support to ExtractWriter interface
-                var buffer: [STREAM_BUFFER_SIZE]u8 = undefined;
-                var bytes_remaining = entry.size;
-                while (bytes_remaining > 0) {
-                    const to_read = @min(buffer.len, bytes_remaining);
-                    const bytes_read = entry.reader().readAll(buffer[0..to_read]) catch return error.UnexpectedEndOfStream;
-                    bytes_remaining -= bytes_read;
-                }
-
                 data_extracted = true;
             },
         }