mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2026-11-14 11:18:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

[GUI] Fix shared stream bug

Browse Source
This commit is contained in:
VaDiM
2026-08-04 23:02:22 +03:00
parent 3ac76eb1cd
commit 4f62ea1ba7
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AssetStudio/BundleFile.cs
+23 -13
View File
@@ -43,7 +43,9 @@ namespace AssetStudio
public class BundleFile : FileArchive
{
public readonly bool IsDataAfterBundle;
private static TempFileStream _sharedTempFileStream;
private readonly bool _useSharedStream;
private readonly AssetsManagerOptions _studioOptions;
public class Header
@@ -77,9 +79,10 @@ namespace AssetStudio
private StorageBlock[] m_BlocksInfo;
private Node[] m_DirectoryInfo;
public BundleFile(FileReader reader, AssetsManagerOptions studioOptions, bool isMultiBundle = false)
public BundleFile(FileReader reader, AssetsManagerOptions studioOptions, bool isMultiBundle = false, bool useSharedStream = true)
{
_studioOptions = studioOptions;
_useSharedStream = useSharedStream;
m_Header = new Header();
m_Header.signature = reader.ReadStringToNull();
m_Header.version = reader.ReadUInt32();
@@ -180,21 +183,28 @@ namespace AssetStudio
private Stream CreateBlocksStream()
{
var uncompressedSizeSum = m_BlocksInfo.Sum(x => x.uncompressedSize);
if (uncompressedSizeSum < int.MaxValue && !_studioOptions.DecompressToDisk)
if (!_studioOptions.DecompressToDisk && uncompressedSizeSum < int.MaxValue)
return new MemoryStream((int)uncompressedSizeSum);
if (_sharedTempFileStream == null || !_sharedTempFileStream.CanRead)
{
var cachePath = _studioOptions.CustomCachePath;
if (string.IsNullOrEmpty(cachePath) || !Directory.Exists(cachePath))
{
throw new NotSupportedException("Cache directory wasn't found. Make sure that the specified path is correct.");
}
var filename = $"studio_{DateTimeOffset.UtcNow.ToUnixTimeSeconds():X}.temp";
_sharedTempFileStream = new TempFileStream(Path.Combine(cachePath, filename), FileMode.Create);
}
bool createNewSharedStream = _sharedTempFileStream == null || !_sharedTempFileStream.CanRead;
if (_useSharedStream && !createNewSharedStream)
return new OffsetStream(_sharedTempFileStream, _sharedTempFileStream.Length, uncompressedSizeSum);
return new OffsetStream(_sharedTempFileStream, _sharedTempFileStream.Length, uncompressedSizeSum);
var cachePath = _studioOptions.CustomCachePath;
if (string.IsNullOrEmpty(cachePath) || !Directory.Exists(cachePath))
throw new NotSupportedException("Cache directory wasn't found. Make sure that the specified path is correct.");
var filename = $"studio_{DateTimeOffset.UtcNow.ToUnixTimeSeconds():X}.temp";
if (_useSharedStream)
{
_sharedTempFileStream = new TempFileStream(Path.Combine(cachePath, filename), FileMode.Create);
return new OffsetStream(_sharedTempFileStream, _sharedTempFileStream.Length, uncompressedSizeSum);
}
else
{
var tempFileStream = new TempFileStream(Path.Combine(cachePath, filename), FileMode.Create);
return new OffsetStream(tempFileStream, tempFileStream.Length, uncompressedSizeSum);
}
}
private Stream ReadBlocksAndDirectory(FileReader reader)
AssetStudioGUI/Studio.cs
+1 -1
View File
@@ -140,7 +140,7 @@ namespace AssetStudioGUI
var count = 0;
var bundleStream = new OffsetStream(reader);
var bundleReader = new FileReader(reader.FullPath, bundleStream);
var bundleFile = new BundleFile(bundleReader, assetsManager.Options);
var bundleFile = new BundleFile(bundleReader, assetsManager.Options, useSharedStream: false);
var extractPath = Path.Combine(savePath, reader.FileName + "_unpacked");
if (bundleFile.FileList.Count > 0)
{