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

Add support for .z zlibbed files

Browse Source
This commit is contained in:
KillzXGaming 2019-04-30 19:38:39 -04:00
parent 21255d7c31
commit 18d891e1a0
9 changed files with 18 additions and 11 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

@ -136,7 +136,7 @@ namespace FirstPlugin
reader.Close();
reader.Dispose();
data = STLibraryCompression.ZLIB.Decompress(filedata, decompSize);
data = STLibraryCompression.ZLIB.Decompress(filedata);
}
return data;
}

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

@ -204,7 +204,7 @@ namespace FirstPlugin
else if (header.Version > 22)
decomp = STLibraryCompression.Type_LZ4.Decompress(CompressedBlock);
else
decomp = STLibraryCompression.ZLIB.Decompress(CompressedBlock, Header.DecompressedSize);
decomp = STLibraryCompression.ZLIB.Decompress(CompressedBlock);
//Now it's decompressed lets parse!
using (var reader = new FileReader(decomp))

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

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache
View File

Binary file not shown.

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

Binary file not shown.

25
Switch_Toolbox_Library/IO/FileIO.cs
View File

@ -163,11 +163,19 @@ namespace Switch_Toolbox.Library.IO
data = STLibraryCompression.ZSTD.Decompress(fileReader.getSection(0, data.Length));
return OpenFileFormat(FileName, data, LeaveStreamOpen, InArchive, archiveNode, true, CompressionType.Zstb);
}
if (Magic == "ZLIB" || Path.GetExtension(FileName) == ".z")
if (Path.GetExtension(FileName) == ".z" && CompType == CompressionType.None)
{
if (data == null)
data = File.ReadAllBytes(FileName);
data = STLibraryCompression.ZLIB.Decompress(fileReader.getSection(2, data.Length - 2));
return OpenFileFormat(FileName, data, LeaveStreamOpen, InArchive, archiveNode, true, CompressionType.Zlib);
}
if (Magic == "ZLIB")
{
if (data == null)
data = File.ReadAllBytes(FileName);
data = STLibraryCompression.GZIP.Decompress(fileReader.getSection(64, data.Length - 64));
return OpenFileFormat(FileName, data, LeaveStreamOpen, InArchive, archiveNode, true, CompressionType.Zlib);
}
@ -310,16 +318,15 @@ namespace Switch_Toolbox.Library.IO
public class ZLIB
{
public static byte[] Decompress(byte[] b, uint DecompSize)
public static byte[] Decompress(byte[] b)
{
var output = new MemoryStream();
using (var compressedStream = new MemoryStream(b))
using (var zipStream = new DeflateStream(compressedStream, CompressionMode.Decompress))
{
zipStream.CopyTo(output);
zipStream.Close();
output.Position = 0;
return output.ToArray();
using (var compressedStream = new MemoryStream(b)) {
using (var zipStream = new DeflateStream(compressedStream, CompressionMode.Decompress))
{
zipStream.CopyTo(output);
return output.ToArray();
}
}
}