Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-12-01 02:27:22 +01:00
Code Releases Wiki Activity

Decompress zlib files that start after 4 bytes

Browse Source
This commit is contained in:
KillzXGaming 2019-07-02 21:39:19 -04:00
parent 131a7b940a
commit 2a99dd3308
7 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

2
Switch_FileFormatsMain/FileFormats/Archives/NARC.cs
View File

@ -46,7 +46,7 @@ namespace FirstPlugin
public FileEntry(string Name) public FileEntry(string Name)
{ {
Text = Name; Text = Name.Replace(" ", string.Empty).RemoveIllegaleFolderNameCharacters();
if (Utils.HasExtension(Name, ".cbfmd") || if (Utils.HasExtension(Name, ".cbfmd") ||
Utils.HasExtension(Name, ".cbfa") || Utils.HasExtension(Name, ".cbfa") ||

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View File

Binary file not shown.

17
Switch_Toolbox_Library/IO/STFileLoader.cs
View File

@ -165,12 +165,17 @@ namespace Switch_Toolbox.Library.IO
fileReader.Position = 0; fileReader.Position = 0;
ushort MagicHex2 = fileReader.ReadUInt16(); ushort MagicHex2 = fileReader.ReadUInt16();
//Another hacky magic check if decomp size is first
fileReader.Position = 4;
ushort MagicHex3 = fileReader.ReadUInt16();
Stream stream; Stream stream;
if (data != null) if (data != null)
stream = new MemoryStream(data); stream = new MemoryStream(data);
else else
stream = File.OpenRead(FileName); stream = File.OpenRead(FileName);
//Note this method will soon be how all compression formats are handled rather than being checked here
foreach (ICompressionFormat compressionFormat in FileManager.GetCompressionFormats()) foreach (ICompressionFormat compressionFormat in FileManager.GetCompressionFormats())
{ {
if (compressionFormat.Identify(stream)) if (compressionFormat.Identify(stream))
@ -218,6 +223,18 @@ namespace Switch_Toolbox.Library.IO
return OpenFileFormat(FileName, data, LeaveStreamOpen, InArchive, archiveNode, true, return OpenFileFormat(FileName, data, LeaveStreamOpen, InArchive, archiveNode, true,
CompressionType.Zlib, DecompressedFileSize, CompressedFileSize); CompressionType.Zlib, DecompressedFileSize, CompressedFileSize);
} }
if (MagicHex3 == 0x789C || MagicHex3 == 0x78DA && CompType == CompressionType.None)
{
if (data == null)
data = File.ReadAllBytes(FileName);
fileReader.Position = 0;
int OuSize = fileReader.ReadInt32();
int InSize = data.Length - 4;
data = STLibraryCompression.ZLIB.Decompress(fileReader.getSection(4, InSize));
return OpenFileFormat(FileName, data, LeaveStreamOpen, InArchive, archiveNode, true,
CompressionType.Zlib, DecompressedFileSize, CompressedFileSize);
}
if (Path.GetExtension(FileName) == ".carc" && CompType == CompressionType.None) if (Path.GetExtension(FileName) == ".carc" && CompType == CompressionType.None)
{ {
if (data == null) if (data == null)