mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-11-12 23:32:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update bundle reader

Browse Source 
- Replaced creation of a duplicated file/memory stream with OffsetStream.
- Added separate processing of uncompressed bundles (including streamed bundles). They will be read directly from disk.
- Added progress report on LZMA decompression process.
This commit is contained in:
VaDiM
2025-07-24 17:24:41 +03:00
parent efca2a7557
commit c20c07b5f2
7 changed files with 191 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
AssetStudioCLI/Studio.cs
View File

@ -96,11 +96,11 @@ namespace AssetStudioCLI
var bundleReader = new FileReader(reader.FullPath, bundleStream);
var bundleFile = new BundleFile(bundleReader, assetsManager.CustomBlockInfoCompression, assetsManager.CustomBlockCompression, assetsManager.SpecifyUnityVersion);
var extractPath = Path.Combine(savePath, reader.FileName + "_unpacked");
if (bundleFile.fileList.Length > 0)
if (bundleFile.fileList.Count > 0)
{
count += ExtractStreamFile(extractPath, bundleFile.fileList);
}
while (bundleFile.IsMultiBundle)
while (bundleFile.IsDataAfterBundle)
{
bundleStream.Offset = reader.Position;
bundleReader = new FileReader($"{reader.FullPath}_0x{bundleStream.Offset:X}", bundleStream);
@ -113,8 +113,8 @@ namespace AssetStudioCLI
bundleReader.FileName = $"{reader.FileName}_0x{bundleStream.Offset:X}";
}
Logger.Info($"[MultiBundle] Decompressing \"{reader.FileName}\" from offset: 0x{bundleStream.Offset:X}..");
bundleFile = new BundleFile(bundleReader, assetsManager.CustomBlockInfoCompression, assetsManager.CustomBlockCompression, assetsManager.SpecifyUnityVersion);
if (bundleFile.fileList.Length > 0)
bundleFile = new BundleFile(bundleReader, assetsManager.CustomBlockInfoCompression, assetsManager.CustomBlockCompression, assetsManager.SpecifyUnityVersion, isMultiBundle: true);
if (bundleFile.fileList.Count > 0)
{
count += ExtractStreamFile(extractPath, bundleFile.fileList);
}
@ -128,19 +128,21 @@ namespace AssetStudioCLI
Logger.Info($"Decompressing {reader.FileName} ...");
var webFile = new WebFile(reader);
reader.Dispose();
if (webFile.fileList.Length > 0)
if (webFile.fileList.Count > 0)
{
var extractPath = Path.Combine(savePath, reader.FileName + "_unpacked");
return ExtractStreamFile(extractPath, webFile.fileList);
return ExtractStreamFile(extractPath, webFile.fileList, isOffsetStream: false);
}
return 0;
}
private static int ExtractStreamFile(string extractPath, StreamFile[] fileList)
private static int ExtractStreamFile(string extractPath, List<StreamFile> fileList, bool isOffsetStream = true)
{
var extractedCount = 0;
foreach (var file in fileList)
{
if (file.stream == null)
continue;
var filePath = Path.Combine(extractPath, file.path);
var fileDirectory = Path.GetDirectoryName(filePath);
if (!Directory.Exists(fileDirectory))
@ -151,11 +153,16 @@ namespace AssetStudioCLI
{
using (var fileStream = File.Create(filePath))
{
file.stream.CopyTo(fileStream);
file.stream.Position = 0;
file.stream.CopyTo(fileStream, file.stream.Length);
}
extractedCount += 1;
extractedCount++;
}
file.stream.Dispose();
if (!isOffsetStream) file.stream.Dispose();
}
if (isOffsetStream && fileList.Count > 0)
{
fileList[0].stream?.Dispose();
}
return extractedCount;
}