Merge pull request #337 from brianquinlan/re_encode_bug

brendan-duncan · web-flow · commit 2606878cd4e5 · 2024-05-20T21:35:04.000-06:00
Fix a bug when zip encoding an already encoded file
diff --git a/lib/src/zip_encoder.dart b/lib/src/zip_encoder.dart
@@ -194,7 +194,8 @@ class ZipEncoder {
         crc32 = getFileCrc32(file);
       }
     } else if (file.isCompressed &&
-        file.compressionType == ArchiveFile.DEFLATE) {
+        file.compressionType == ArchiveFile.DEFLATE &&
+        file.rawContent != null) {
       // If the file is already compressed, no sense in uncompressing it and
       // compressing it again, just pass along the already compressed data.
       compressedData = file.rawContent;
diff --git a/test/tests/zip_test.dart b/test/tests/zip_test.dart
@@ -498,6 +498,27 @@ void main() {
     }
   });
 
+  test('encode already compressed file', () {
+    final testArchive = Archive();
+    testArchive.addFile(ArchiveFile('test', 3, [1, 2, 3])..compress = true);
+    final testArchiveBytes =
+        ZipEncoder().encode(testArchive, level: Deflate.BEST_COMPRESSION)!;
+
+    final decodedTestArchive = ZipDecoder().decodeBytes(testArchiveBytes);
+
+    // Verify that the archive file is already compressed and will be
+    // compressed when re-encoded.
+    expect(decodedTestArchive.files.single.isCompressed, true);
+    expect(decodedTestArchive.files.single.compressionType, 8);
+    expect(decodedTestArchive.files.single.compress, true);
+
+    final decodedTestArchiveBytes = ZipEncoder()
+        .encode(decodedTestArchive, level: Deflate.BEST_COMPRESSION)!;
+
+    final verifyArchive = ZipDecoder().decodeBytes(decodedTestArchiveBytes);
+    expect(verifyArchive.single.content, [1, 2, 3]);
+  });
+
   test('decode many files (100k)', () {
     final fp = InputFileStream(
       p.join(testDirPath, 'res/test_100k_files.zip'),
