Merge pull request #62 from usefulness/fix_size_calculation

Author: mateuszkwiecinski

diffuse/src/test/kotlin/com/jakewharton/diffuse/FunctionalTest.kt

@@ -45,6 +45,21 @@ class FunctionalTest {
     assertThat(lines).contains("  - androidx.recyclerview.widget.RecyclerView markItemDecorInsetsDirty():0: RecyclerView\$ItemAnimator")
     assertThat(lines[7]).isEqualTo("      dex │     1 MiB │   1.2 MiB │ +164.8 KiB │   2.2 MiB │   2.6 MiB │ +380.9 KiB ")
   }
+
+  @Test
+  internal fun `diffuse diff on aar`() {
+    val output = anotherTempDir.resolve("diffuse-out")
+    val aarA = loadResource("lazythreeten/lazythreetenbp-release.aar")
+    val aarB = loadResource("lazythreeten/lazythreetenbp-release.aar")
+
+    main(
+      "diff",
+      "--aar", aarA, aarB,
+      "--text", output.path,
+    )
+
+    assertThat(output.readLines()).contains("    total │ 160.7 KiB │ 160.7 KiB │  0 B ")
+  }
 }
 
 private object Loader

diffuse/src/test/resources/lazythreeten/lazythreetenbp-release.aar

@@ -9,6 +9,8 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 import java.util.zip.ZipInputStream
 import kotlin.io.path.exists
+import kotlin.io.path.inputStream
+import kotlin.io.path.name
 import okio.ByteString
 import okio.utf8Size
 
@@ -94,8 +96,14 @@ private fun <T : Zip.Entry> ZipEntry.toZipEntry(
 internal fun Path.toZip(): Zip {
   val fs = asZipFileSystem()
   val root = fs.rootDirectories.single()!!
-  val entries = ZipFile(toFile()).mapEntries { name, size, compressedSize, zipSize, isCompressed ->
-    PathZip.Entry(root, name, size, compressedSize, zipSize, isCompressed)
+  val entries = try {
+    ZipFile(toFile()).mapEntries { name, size, compressedSize, zipSize, isCompressed ->
+      PathZip.Entry(root, name, size, compressedSize, zipSize, isCompressed)
+    }
+  } catch (ex: UnsupportedOperationException) {
+    inputStream().asZip().mapEntries { name, size, compressedSize, zipSize, isCompressed ->
+      PathZip.Entry(root, name, size, compressedSize, zipSize, isCompressed)
+    }
   }
   return PathZip(fs, entries)
 }