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

Extract fileList to a separate class

Browse Source
This commit is contained in:
VaDiM
2026-03-02 17:21:34 +03:00
parent 1856378377
commit 0a381aff55
6 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AssetStudioGUI/Studio.cs
+13 -11
View File
@@ -142,9 +142,9 @@ namespace AssetStudioGUI
var bundleReader = new FileReader(reader.FullPath, bundleStream);
var bundleFile = new BundleFile(bundleReader, assetsManager.Options);
var extractPath = Path.Combine(savePath, reader.FileName + "_unpacked");
if (bundleFile.fileList.Count > 0)
if (bundleFile.FileList.Count > 0)
{
count += ExtractStreamFile(extractPath, bundleFile.fileList);
count += ExtractStreamFile(extractPath, bundleFile);
}
while (bundleFile.IsDataAfterBundle)
{
@@ -160,9 +160,9 @@ namespace AssetStudioGUI
}
Logger.Info($"[MultiBundle] Decompressing \"{reader.FileName}\" from offset: 0x{bundleStream.Offset:X}..");
bundleFile = new BundleFile(bundleReader, assetsManager.Options, isMultiBundle: true);
if (bundleFile.fileList.Count > 0)
if (bundleFile.FileList.Count > 0)
{
count += ExtractStreamFile(extractPath, bundleFile.fileList);
count += ExtractStreamFile(extractPath, bundleFile);
}
}
bundleStream.Dispose();
@@ -174,21 +174,23 @@ namespace AssetStudioGUI
Logger.Info($"Decompressing {reader.FileName} ...");
var webFile = new WebFile(reader);
reader.Dispose();
if (webFile.fileList.Count > 0)
if (webFile.FileList.Count > 0)
{
var extractPath = Path.Combine(savePath, reader.FileName + "_unpacked");
return ExtractStreamFile(extractPath, webFile.fileList, isOffsetStream: false);
return ExtractStreamFile(extractPath, webFile);
}
return 0;
}
private static int ExtractStreamFile(string extractPath, List<StreamFile> fileList, bool isOffsetStream = true)
private static int ExtractStreamFile(string extractPath, FileArchive fileArchive)
{
var extractedCount = 0;
foreach (var file in fileList)
var isWebFile = fileArchive is WebFile;
foreach (var file in fileArchive.FileList)
{
if (file.stream == null)
continue;
var filePath = Path.Combine(extractPath, file.path);
var fileDirectory = Path.GetDirectoryName(filePath);
if (!Directory.Exists(fileDirectory))
@@ -204,11 +206,11 @@ namespace AssetStudioGUI
}
extractedCount++;
}
if (!isOffsetStream) file.stream.Dispose();
if (isWebFile) file.stream.Dispose();
}
if (isOffsetStream && fileList.Count > 0)
if (!isWebFile)
{
fileList[0].stream?.Dispose();
fileArchive.FileList.FirstOrDefault(x => x.stream != null)?.stream.Dispose();
}
return extractedCount;
}