Read storage block offsets from the archive BlocksInfo (format version 9)

Archive/ArchiveTool.cs

@@ -163,6 +163,16 @@ public static int PrintSummary(FileInfo filename, OutputFormat format)
             uncompressedDataSize += block.UncompressedSize;
         }
 
+        // The data section can be larger than the sum of the blocks, because the writer may leave
+        // padding between them. Only version 9 and later record where each block starts, so this is
+        // the only version where padding is detectable (and where it is currently written).
+        long paddingSize = 0;
+        if (blocks.Length > 0)
+        {
+            var lastBlock = blocks[blocks.Length - 1];
+            paddingSize = lastBlock.Offset + lastBlock.CompressedSize - dataSize;
+        }
+
         // Determine the compression algorithm by finding the first block that uses compression.
         // Individual blocks may be stored uncompressed even when compression is enabled, because
         // compression is skipped when it provides no size reduction. So the first compressed block
@@ -193,6 +203,7 @@ public static int PrintSummary(FileInfo filename, OutputFormat format)
                 unityVersion = header.UnityVersion,
                 fileSize = header.Size,
                 dataSize = dataSize,
+                blockPaddingSize = paddingSize,
                 uncompressedDataSize = uncompressedDataSize,
                 compressionRatio = Math.Round(compressionRatio, 2),
                 compression = compression,
@@ -208,6 +219,8 @@ public static int PrintSummary(FileInfo filename, OutputFormat format)
             Console.WriteLine($"{"Unity Version",-30} {header.UnityVersion}");
             Console.WriteLine($"{"File Size",-30} {header.Size:N0} bytes");
             Console.WriteLine($"{"Data Size",-30} {dataSize:N0} bytes");
+            if (paddingSize > 0)
+                Console.WriteLine($"{"Block Padding Size",-30} {paddingSize:N0} bytes");
             Console.WriteLine($"{"Uncompressed Data Size",-30} {uncompressedDataSize:N0} bytes");
             Console.WriteLine($"{"Compression Ratio",-30} {compressionRatio:F2}x");
             Console.WriteLine($"{"Compression",-30} {compression}");
@@ -263,10 +276,10 @@ static string FormatCompressionType(int compressionType)
 
     static readonly (uint bit, string name)[] KnownArchiveFlags =
     {
-        (0x40,  "BlocksAndDirectoryInfoCombined"),
-        (0x80,  "BlocksInfoAtTheEnd"),
-        (0x100, "OldWebPluginCompatibility"),
-        (0x200, "BlockInfoNeedPaddingAtStart"),
+        (ArchiveFlags.BlocksAndDirectoryInfoCombined, "BlocksAndDirectoryInfoCombined"),
+        (ArchiveFlags.BlocksInfoAtTheEnd,             "BlocksInfoAtTheEnd"),
+        (ArchiveFlags.OldWebPluginCompatibility,      "OldWebPluginCompatibility"),
+        (ArchiveFlags.BlockInfoNeedPaddingAtStart,    "BlockInfoNeedPaddingAtStart"),
     };
 
     static string[] GetArchiveFlagNames(uint flagBits)

TestCommon/Data/LeadingEdgeBuilds/AGENTS.md

@@ -6,7 +6,8 @@ The LeadingEdge build scripts regenerate this folder directly, so to update it,
 
 ## Layout
 
-* `AssetBundles/` - the AssetBundle build: one bundle per asset (named after the asset) plus the `AssetBundles` manifest bundle.
+* `AssetBundles/` - the AssetBundle build: one bundle per asset (named after the asset) plus the `AssetBundles` manifest bundle. LZMA compressed, so each archive has a single data block.
+* `AssetBundlesLz4/` - the same bundle layout built with chunk-based (LZ4) compression, giving archives with multiple data blocks. The writer leaves padding between the blocks, so these exercise the `StorageBlock.Offset` field added in archive format version 9.
 * `ContentDirectory/` - the Content Directory build: content (`.cf`) files, `.resource` files and the build manifest.
 * `BuildReport-AssetBundles/LastBuild.buildreport` - the AssetBundle build report.
 * `BuildReport-ContentDirectory/` - the Content Directory build report folder, including `ContentLayout.json`.

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/6.manifest

@@ -0,0 +1,21 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 2778854771
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: a19e41b950fe653a3177d32160af00b9
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 9a2ca7bdbd1871f7131daf57de908e0c
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: 929d8f9d46e767e1fc66294cd024c1fa
+HashAppended: 0
+ClassTypes:
+- Class: 83
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/Audio/6.mp3
+Dependencies: []

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/AssetBundlesLz4.manifest

@@ -0,0 +1,33 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 318228433
+HashAppended: 0
+AssetBundleManifest:
+  AssetBundleInfos:
+    Info_0:
+      Name: assetbundleroot
+      Dependencies:
+        Dependency_0: directaudioclipreference
+        Dependency_1: singleaudioclipdirectreference
+        Dependency_2: serializationdemo
+    Info_1:
+      Name: directaudioclipreference
+      Dependencies:
+        Dependency_0: 6
+        Dependency_1: a
+    Info_2:
+      Name: singleaudioclipdirectreference
+      Dependencies:
+        Dependency_0: a
+    Info_3:
+      Name: serializationdemo
+      Dependencies: {}
+    Info_4:
+      Name: 6
+      Dependencies: {}
+    Info_5:
+      Name: a
+      Dependencies: {}
+    Info_6:
+      Name: scenes
+      Dependencies: {}

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/a.manifest

@@ -0,0 +1,21 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 3846767907
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: a408b749397654c01bfaa7832600a856
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 9a2ca7bdbd1871f7131daf57de908e0c
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: aeb2216eeb5ccfe1cb3f81e62f704746
+HashAppended: 0
+ClassTypes:
+- Class: 83
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/Audio/a.mp3
+Dependencies: []

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/assetbundleroot.manifest

@@ -0,0 +1,34 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 408809727
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: f0b4981a1d1b8cf8a1bb7d53527a4e07
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 819240184df2798191fd853444ad58c4
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: cf13ad57198a935f56c518df40c037d0
+HashAppended: 0
+ClassTypes:
+- Class: 114
+  Script: {fileID: 11500000, guid: d6330d3e9b8e5a0439e4dd147cec19dd, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 8623c5efbb626994da80931050f0aba0, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: f44aeb02ae06dd84bb3ef76e1df8d525, type: 3}
+- Class: 115
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers:
+- AssemblyName: Assembly-CSharp
+  ClassName: SerializationDemo/SerializedData
+- AssemblyName: UnityEngine.CoreModule
+  ClassName: UnityEngine.DictionarySerialization/SerializedKeyValue`2
+Assets:
+- Assets/ScriptableObjects/AssetBundleRoot.asset
+Dependencies:
+- C:/UnitySrc/UnityDataTools/UnityProjects/LeadingEdge/../../TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/directaudioclipreference
+- C:/UnitySrc/UnityDataTools/UnityProjects/LeadingEdge/../../TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/serializationdemo
+- C:/UnitySrc/UnityDataTools/UnityProjects/LeadingEdge/../../TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/singleaudioclipdirectreference

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/directaudioclipreference.manifest

@@ -0,0 +1,29 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 3870990589
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: ba2d63b18f0c278121a49435b585c703
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 4c88c857f41d6968a1090f557f31c5ed
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: 7b9a02ffb784fe748e77e41e9e934187
+HashAppended: 0
+ClassTypes:
+- Class: 83
+  Script: {instanceID: 0}
+- Class: 114
+  Script: {fileID: 11500000, guid: d6330d3e9b8e5a0439e4dd147cec19dd, type: 3}
+- Class: 115
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers:
+- AssemblyName: UnityEngine.CoreModule
+  ClassName: UnityEngine.DictionarySerialization/SerializedKeyValue`2
+Assets:
+- Assets/ScriptableObjects/DirectAudioClipReference.asset
+Dependencies:
+- C:/UnitySrc/UnityDataTools/UnityProjects/LeadingEdge/../../TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/6
+- C:/UnitySrc/UnityDataTools/UnityProjects/LeadingEdge/../../TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/a

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/scenes.manifest

@@ -0,0 +1,42 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 2529189112
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 6065d3cb8b4bef9ba301ab70514653b1
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 62ed4bb4a9e4f0abaa38cfea31ee7bca
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: e0ff4bc9af5bb69181585c505b429585
+HashAppended: 0
+ClassTypes:
+- Class: 1
+  Script: {instanceID: 0}
+- Class: 4
+  Script: {instanceID: 0}
+- Class: 21
+  Script: {instanceID: 0}
+- Class: 28
+  Script: {instanceID: 0}
+- Class: 48
+  Script: {instanceID: 0}
+- Class: 89
+  Script: {instanceID: 0}
+- Class: 104
+  Script: {instanceID: 0}
+- Class: 157
+  Script: {instanceID: 0}
+- Class: 196
+  Script: {instanceID: 0}
+- Class: 212
+  Script: {instanceID: 0}
+- Class: 213
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/Scenes/Scene1.unity
+- Assets/Scenes/Scene2.unity
+Dependencies: []

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/serializationdemo.manifest

@@ -0,0 +1,25 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 2011437194
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 379f68b39b6bf066e0f11fd2e4be68c5
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: fc9cbcabf595bb240394111e433d9cd2
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: 8b1b2638a68e5b09acfce1a73c16f6e4
+HashAppended: 0
+ClassTypes:
+- Class: 114
+  Script: {fileID: 11500000, guid: f44aeb02ae06dd84bb3ef76e1df8d525, type: 3}
+- Class: 115
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers:
+- AssemblyName: Assembly-CSharp
+  ClassName: SerializationDemo/SerializedData
+Assets:
+- Assets/ScriptableObjects/SerializationDemo.asset
+Dependencies: []

TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/singleaudioclipdirectreference.manifest

@@ -0,0 +1,28 @@
+ManifestFileVersion: 0
+UnityVersion: 6000.7.0b1
+CRC: 2956055036
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 58b80138f3f51447bc34f00041a3c4b1
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 4c88c857f41d6968a1090f557f31c5ed
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: f286e63fa9c6774d5dffd02de8e71a2c
+HashAppended: 0
+ClassTypes:
+- Class: 83
+  Script: {instanceID: 0}
+- Class: 114
+  Script: {fileID: 11500000, guid: d6330d3e9b8e5a0439e4dd147cec19dd, type: 3}
+- Class: 115
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers:
+- AssemblyName: UnityEngine.CoreModule
+  ClassName: UnityEngine.DictionarySerialization/SerializedKeyValue`2
+Assets:
+- Assets/ScriptableObjects/SingleAudioClipDirectReference.asset
+Dependencies:
+- C:/UnitySrc/UnityDataTools/UnityProjects/LeadingEdge/../../TestCommon/Data/LeadingEdgeBuilds/AssetBundlesLz4/a