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

Some fixes for bundle reader

Browse Source
This commit is contained in:
VaDiM
2025-08-11 01:26:46 +03:00
parent be11fdf14f
commit 52b0a21181
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
AssetStudio/BundleFile.cs
View File

@ -82,7 +82,6 @@ namespace AssetStudio
public BundleFile(FileReader reader, CustomBundleOptions bundleOptions, bool isMultiBundle = false) public BundleFile(FileReader reader, CustomBundleOptions bundleOptions, bool isMultiBundle = false)
{ {
Stream blocksStream;
_bundleOptions = bundleOptions; _bundleOptions = bundleOptions;
m_Header = new Header(); m_Header = new Header();
m_Header.signature = reader.ReadStringToNull(); m_Header.signature = reader.ReadStringToNull();
@ -105,9 +104,8 @@ namespace AssetStudio
ReadHeaderAndBlocksInfo(reader); ReadHeaderAndBlocksInfo(reader);
using (reader) using (reader)
{ {
blocksStream = ReadBlocksAndDirectory(reader); ReadFiles(ReadBlocksAndDirectory(reader));
} }
ReadFiles(blocksStream);
break; break;
case "UnityFS": case "UnityFS":
ReadHeader(reader); ReadHeader(reader);
@ -115,13 +113,8 @@ namespace AssetStudio
var bundleSize = m_Header.size; var bundleSize = m_Header.size;
var streamSize = reader.BaseStream.Length; var streamSize = reader.BaseStream.Length;
if (bundleSize > streamSize) if (bundleSize > streamSize)
{
Logger.Warning("Bundle size is incorrect."); Logger.Warning("Bundle size is incorrect.");
} IsDataAfterBundle = streamSize - bundleSize > 200;
else if (streamSize - bundleSize > 200)
{
IsDataAfterBundle = true;
}
var unityVer = m_Header.unityRevision; var unityVer = m_Header.unityRevision;
var customUnityVer = _bundleOptions.Options.CustomUnityVersion; var customUnityVer = _bundleOptions.Options.CustomUnityVersion;
@ -135,20 +128,18 @@ namespace AssetStudio
} }
unityVer = customUnityVer; unityVer = customUnityVer;
} }
UnityCnCheck(reader, unityVer); UnityCnCheck(reader, unityVer);
ReadBlocksInfoAndDirectory(reader, unityVer); ReadBlocksInfoAndDirectory(reader, unityVer);
if (!isMultiBundle && IsUncompressedBundle) if (IsUncompressedBundle && !IsDataAfterBundle && !isMultiBundle)
{ {
Logger.Debug($"[Uncompressed bundle] BlockData count: {m_BlocksInfo.Length}");
ReadFiles(reader.BaseStream, reader.Position); ReadFiles(reader.BaseStream, reader.Position);
break; break;
} }
blocksStream = ReadBlocks(reader); ReadFiles(ReadBlocks(reader));
ReadFiles(blocksStream);
if (!IsDataAfterBundle) if (!IsDataAfterBundle)
reader.Close(); reader.Close();
@ -194,9 +185,18 @@ namespace AssetStudio
private Stream CreateBlocksStream(string path) private Stream CreateBlocksStream(string path)
{ {
var uncompressedSizeSum = m_BlocksInfo.Sum(x => x.uncompressedSize); var uncompressedSizeSum = m_BlocksInfo.Sum(x => x.uncompressedSize);
return uncompressedSizeSum >= int.MaxValue || _bundleOptions.DecompressToDisk if (uncompressedSizeSum < int.MaxValue && !_bundleOptions.DecompressToDisk)
? new FileStream(path + ".temp", FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.DeleteOnClose) return new MemoryStream((int)uncompressedSizeSum);
: (Stream) new MemoryStream((int)uncompressedSizeSum);
if (!Directory.Exists(Path.GetDirectoryName(path)))
{
var tempDir = Path.Combine(Directory.GetCurrentDirectory(), "Studio_temp");
Directory.CreateDirectory(tempDir);
var filename = Path.GetFileName(path);
var hash = path.GetHashCode();
path = Path.Combine(tempDir, $"{filename}_{hash:X}");
}
return new FileStream(path + ".temp", FileMode.Create, FileAccess.ReadWrite, FileShare.Read, 4096, FileOptions.DeleteOnClose);
} }
private Stream ReadBlocksAndDirectory(FileReader reader) private Stream ReadBlocksAndDirectory(FileReader reader)
@ -412,8 +412,10 @@ namespace AssetStudio
var customBlockCompression = _bundleOptions.CustomBlockCompression; var customBlockCompression = _bundleOptions.CustomBlockCompression;
var blocksStream = CreateBlocksStream(reader.FullPath); var blocksStream = CreateBlocksStream(reader.FullPath);
var blocksCompression = m_BlocksInfo.Max(x => (CompressionType)(x.flags & StorageBlockFlags.CompressionTypeMask)); var blocksCompression = m_BlocksInfo.Max(x => (CompressionType)(x.flags & StorageBlockFlags.CompressionTypeMask));
Logger.Debug($"BlockData compression: {blocksCompression}"); var blockSize = (int)m_BlocksInfo.Max(x => x.uncompressedSize);
Logger.Debug($"BlockData count: {m_BlocksInfo.Length}"); Logger.Debug($"BlockData compression: {blocksCompression}\n" +
$"BlockData count: {m_BlocksInfo.Length}\n" +
$"BlockSize: {blockSize}");
if (customBlockCompression == CompressionType.Auto) if (customBlockCompression == CompressionType.Auto)
{ {
@ -432,9 +434,6 @@ namespace AssetStudio
byte[] sharedUncompressedBuff = null; byte[] sharedUncompressedBuff = null;
if (blocksCompression != CompressionType.Lzma && blocksCompression != CompressionType.Lzham) if (blocksCompression != CompressionType.Lzma && blocksCompression != CompressionType.Lzham)
{ {
var blockSize = (int)m_BlocksInfo.Max(x => x.uncompressedSize);
Logger.Debug($"BlockSize: {blockSize}");
sharedCompressedBuff = BigArrayPool<byte>.Shared.Rent(blockSize); sharedCompressedBuff = BigArrayPool<byte>.Shared.Rent(blockSize);
sharedUncompressedBuff = BigArrayPool<byte>.Shared.Rent(blockSize); sharedUncompressedBuff = BigArrayPool<byte>.Shared.Rent(blockSize);
} }
@ -478,8 +477,10 @@ namespace AssetStudio
numWrite = BundleDecompressionHelper.DecompressBlock(compressionType, compressedSpan, uncompressedSpan, ref errorMsg); numWrite = BundleDecompressionHelper.DecompressBlock(compressionType, compressedSpan, uncompressedSpan, ref errorMsg);
if (numWrite == uncompressedSize) if (numWrite == uncompressedSize)
{
blocksStream.Write(sharedUncompressedBuff, 0, uncompressedSize); blocksStream.Write(sharedUncompressedBuff, 0, uncompressedSize);
continue;
}
break; break;
case CompressionType.Lzham: case CompressionType.Lzham:
throw new IOException($"Unsupported block compression type: {compressionType}.\n"); throw new IOException($"Unsupported block compression type: {compressionType}.\n");
@ -511,6 +512,9 @@ namespace AssetStudio
private void UnityCnCheck(FileReader reader, UnityVersion unityVer) private void UnityCnCheck(FileReader reader, UnityVersion unityVer)
{ {
if ((m_Header.flags & ArchiveFlags.BlocksInfoAtTheEnd) != 0)
return;
var hasUnityCnFlag = false; var hasUnityCnFlag = false;
if (!unityVer.IsStripped) if (!unityVer.IsStripped)
{ {