Merge branch 'main' of https://github.com/Razzmatazzz/RemnantSaveGuar…

…dian
Razzmatazzz · Sep 13, 2023 · e837b45 · e837b45
2 parents 35af804 + 9453a95
commit e837b45
Showing 1 changed file with 30 additions and 15 deletions.
diff --git a/RemnantSaveGuardian/RemnantSave.cs b/RemnantSaveGuardian/RemnantSave.cs
@@ -153,23 +153,40 @@ public static string DefaultSaveFolder()
         }
 
         // Credit to https://gist.github.com/crackedmind
+
+        internal class FileHeader
+        {
+            public uint Crc32;
+            public uint TotalSize;
+            public uint Unknown;
+
+            public static FileHeader ReadFromStream(Stream stream)
+            {
+                FileHeader header = new();
+                using var reader = new BinaryReader(stream, Encoding.UTF8, true);
+                header.Crc32 = reader.ReadUInt32();
+                header.TotalSize = reader.ReadUInt32();
+                header.Unknown = reader.ReadUInt32();
+                return header;
+            }
+        }
         internal class ChunkHeader
         {
-            public ulong unknown;
-            public ulong unknown2;
-            public byte unknown3;
+            public ulong ChunkHeaderTag; // always 0x222222229E2A83C1
+            public ulong ChunkSize;      // always 0x20000
+            public byte DecompressionMethod; // 3 - zlib
             public ulong CompressedSize1;
-            public ulong DecompressedSize1; // only valid for profile.sav with 1 chunk?
+            public ulong DecompressedSize1; // <= ChunkSize
             public ulong CompressedSize2;
-            public ulong DecompressedSize2; // only valid for profile.sav with 1 chunk?
+            public ulong DecompressedSize2; // <= ChunkSize
 
             public static ChunkHeader ReadFromStream(Stream stream)
             {
                 ChunkHeader header = new ChunkHeader();
                 using var reader = new BinaryReader(stream, Encoding.UTF8, true);
-                header.unknown = reader.ReadUInt64();
-                header.unknown2 = reader.ReadUInt64();
-                header.unknown3 = reader.ReadByte();
+                header.ChunkHeaderTag = reader.ReadUInt64();
+                header.ChunkSize = reader.ReadUInt64();
+                header.DecompressionMethod = reader.ReadByte();
                 header.CompressedSize1 = reader.ReadUInt64();
                 header.DecompressedSize1 = reader.ReadUInt64();
                 header.CompressedSize2 = reader.ReadUInt64();
@@ -182,10 +199,11 @@ public static byte[] DecompressSave(string saveFilePath)
         {
             if (File.Exists(saveFilePath))
             {
-                using var memstream = new MemoryStream();
                 using var fileStream = File.Open(saveFilePath, FileMode.Open);
+                var fileHeader = FileHeader.ReadFromStream(fileStream);
 
-                fileStream.Seek(0xC, SeekOrigin.Current);
+                var saveContent = new byte[fileHeader.TotalSize];
+                using var memstream = new MemoryStream(saveContent);
                 while (fileStream.Position < fileStream.Length)
                 {
                     ChunkHeader header = ChunkHeader.ReadFromStream(fileStream);
@@ -196,13 +214,10 @@ public static byte[] DecompressSave(string saveFilePath)
                     using var decompressor = new ZLibStream(bufferStream, CompressionMode.Decompress);
                     decompressor.CopyTo(memstream);
                 }
-                fileStream.Dispose();
-
-                var res = memstream.ToArray();
 
-                return res;
+                return saveContent;
             }
-            return new byte[] { };
+            return Array.Empty<byte>();
         }
         public static string DecompressSaveAsString(string saveFilePath)
         {