Add more information about invalid chunk data exception (#185)

Co-authored-by: Jakub Szczyrk <Jakub Szczyrk>

Author: Szczyrk

Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/ChunkedFileStream.cs

@@ -188,14 +188,18 @@ public void Write([NotNull] byte[] buffer, int offset, int count)
 
                 if (ChunkFullyInBuffer())
                 {
-                    if (BufferedChunkValid())
+                    byte[] bufferHash = _hashFunction(_buffer, 0, (int) Math.Min(_chunksData.ChunkSize, RemainingLength));
+                    byte[] chunkHash = _chunksData.Chunks[_chunkIndex + _startChunk].Hash;
+                    
+                    if (BufferedChunkValid(bufferHash, chunkHash))
                     {
                         FlushBuffer();
                     }
                     else
                     {
                         DiscardBuffer();
-                        throw new InvalidChunkDataException("Invalid chunk data.");
+                        throw new InvalidChunkDataException("Invalid chunk data. Expected " +
+                                                            BitConverter.ToString(chunkHash) + ", got " + BitConverter.ToString(bufferHash));
                     }
                 }
             } while (count > 0);
@@ -206,11 +210,8 @@ private bool ChunkFullyInBuffer()
             return _bufferPos == Math.Min(_chunksData.ChunkSize, RemainingLength);
         }
 
-        private bool BufferedChunkValid()
+        private bool BufferedChunkValid(byte[] bufferHash, byte[] chunkHash)
         {
-            byte[] bufferHash = _hashFunction(_buffer, 0, (int) Math.Min(_chunksData.ChunkSize, RemainingLength));
-            byte[] chunkHash = _chunksData.Chunks[_chunkIndex + _startChunk].Hash;
-
             return bufferHash.SequenceEqual(chunkHash);
         }
 

Assets/PatchKit Patcher/Scripts/Version.cs

@@ -5,7 +5,7 @@ public static class Version
         public const int Major = 3;
         public const int Minor = 17;
         public const int Patch = 9;
-        public const int Hotfix = 2;
+        public const int Hotfix = 3;
 
         public static string Value
         {

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.17.9.3]
+### Added
+- More information about invalid chunk data exception
+
 ## [3.17.9.2]
 ### Changed
 - HDPI scale thresholds