Merge pull request #122 from patchkit-net/dev/v3.13.x

3.13.0 Release

Author: witcher112

Assets/PatchKit Patcher/Scripts/AppData/Local/LimitedStream.cs

@@ -13,22 +13,6 @@ public class LimitedStream : Stream
 
         private long _bytesLeft;
 
-        public long BytesLeft
-        {
-            get
-            {
-                return _bytesLeft;
-            }
-        }
-
-        public long Limit
-        {
-            get
-            {
-                return _bytesLimit;
-            }
-        }
-
         public LimitedStream(Stream orig, long bytesLimit)
         {
             _orig = orig;
@@ -38,17 +22,17 @@ public LimitedStream(Stream orig, long bytesLimit)
 
         public override void Flush()
         {
-            _orig.Flush();
+            throw new InvalidOperationException();
         }
 
         public override long Seek(long offset, SeekOrigin origin)
         {
-            return _orig.Seek(offset, origin);
+            throw new InvalidOperationException();
         }
 
         public override void SetLength(long value)
         {
-            _orig.SetLength(value);
+            throw new InvalidOperationException();
         }
 
         public override int Read(byte[] buffer, int offset, int count)
@@ -65,33 +49,36 @@ public override int Read(byte[] buffer, int offset, int count)
 
         public override void Write(byte[] buffer, int offset, int count)
         {
-            _orig.Write(buffer, offset, count);
+            throw new InvalidOperationException();
         }
 
         public override bool CanRead
         {
-            get { return _orig.CanRead; }
+            get { return true; }
         }
 
         public override bool CanSeek
         {
-            get { return _orig.CanSeek; }
+            get { return false; }
         }
 
         public override bool CanWrite
         {
-            get { return _orig.CanWrite; }
+            get { return false; }
         }
 
         public override long Length
         {
-            get { return _orig.Length; }
+            get { return _bytesLimit; }
         }
 
         public override long Position
         {
-            get { return _orig.Position; }
-            set { _orig.Position = value; }
+            get { return _bytesLimit - _bytesLeft; }
+            set
+            {
+                throw new InvalidOperationException();
+            }
 
         }
     }

Assets/PatchKit Patcher/Scripts/AppData/Local/Pack1Unarchiver.cs

@@ -223,18 +223,30 @@ private void UnpackRegularFile(Pack1Meta.FileEntry file, Action<double> onProgre
                 KeySize = 256
             };
 
-            ICryptoTransform decryptor = rijn.CreateDecryptor(_key, _iv);
+            var aesAlg = new AesCryptoServiceProvider
+            {
+                IV = _iv,
+                Key = _key
+            };
+
+            ICryptoTransform decryptor = aesAlg.CreateDecryptor(
+                aesAlg.Key,
+                aesAlg.IV);
+
             DecompressorCreator decompressorCreator = ResolveDecompressor(_metaData);
 
             using (var fs = new FileStream(_packagePath, FileMode.Open))
             {
                 fs.Seek(file.Offset.Value - _range.Start, SeekOrigin.Begin);
 
-                using (var limitedStream = new LimitedStream(fs, file.Size.Value))
+                using (var limitedStream = new BufferedStream(new LimitedStream(fs, file.Size.Value), 2 * 1024 * 1024))
                 {
-                    using (var target = new FileStream(destPath, FileMode.Create))
+                    //using (var bufferedLimitedStream = new ThreadBufferedStream(limitedStream, 8 * 1024 * 1024))
                     {
-                        ExtractFileFromStream(limitedStream, target, file.Size.Value, decryptor, decompressorCreator, onProgress, cancellationToken);
+                        using (var target = new FileStream(destPath, FileMode.Create))
+                        {
+                            ExtractFileFromStream(limitedStream, target, file.Size.Value, decryptor, decompressorCreator, onProgress, cancellationToken);
+                        }
                     }
 
                     if (Platform.IsPosix())
@@ -265,7 +277,7 @@ private Stream CreateGzipDecompressor(Stream source)
         }
 
         private void ExtractFileFromStream(
-            LimitedStream sourceStream,
+            Stream sourceStream,
             Stream targetStream,
             long fileSize,
             ICryptoTransform decryptor,
@@ -275,44 +287,50 @@ private void ExtractFileFromStream(
         {
             using (var cryptoStream = new CryptoStream(sourceStream, decryptor, CryptoStreamMode.Read))
             {
-                using (var wrapperStream = new GZipReadWrapperStream(cryptoStream))
+                using (var bufferedCryptoStream = new BufferedStream(new ThreadBufferedStream(cryptoStream, 2 * 1024 * 1024), 2 * 1024 * 1024))
                 {
-                    using (Stream decompressionStream = createDecompressor(wrapperStream))
+                    //using (var wrapperStream = new GZipReadWrapperStream(bufferedCryptoStream))
                     {
-                        try
+                        using (Stream decompressionStream = createDecompressor(bufferedCryptoStream))
                         {
-                            const int bufferSize = 128 * 1024;
-                            var buffer = new byte[bufferSize];
-                            int count;
-
-                            while ((count = decompressionStream.Read(buffer, 0, buffer.Length)) > 0)
+                            using (var bufferedDecompressionStream = new ThreadBufferedStream(decompressionStream, 4 * 1024 * 1024))
                             {
-                                cancellationToken.ThrowIfCancellationRequested();
-                                targetStream.Write(buffer, 0, count);
-
-                                long bytesProcessed = sourceStream.Limit - sourceStream.BytesLeft;
-                                onProgress(bytesProcessed / (double) fileSize);
+                                try
+                                {
+                                    const int bufferSize = 2 * 1024 * 1024;
+                                    var buffer = new byte[bufferSize];
+                                    int count;
+
+                                    while ((count = bufferedDecompressionStream.Read(buffer, 0, buffer.Length)) > 0)
+                                    {
+                                        cancellationToken.ThrowIfCancellationRequested();
+                                        targetStream.Write(buffer, 0, count);
+
+                                        long bytesProcessed = sourceStream.Position;
+                                        onProgress(bytesProcessed / (double) fileSize);
+                                    }
+                                }
+                                catch (OperationCanceledException)
+                                {
+                                    throw;
+                                }
+                                catch (Exception e)
+                                {
+                                    DebugLogger.LogException(e);
+
+                                    PatcherLogManager logManager = PatcherLogManager.Instance;
+                                    PatcherLogSentryRegistry sentryRegistry = logManager.SentryRegistry;
+                                    RavenClient ravenClient = sentryRegistry.RavenClient;
+
+                                    var sentryEvent = new SentryEvent(e);
+                                    PatcherLogSentryRegistry.AddDataToSentryEvent(sentryEvent,
+                                        logManager.Storage.Guid.ToString());
+                                    ravenClient.Capture(sentryEvent);
+
+                                    throw;
+                                }
                             }
                         }
-                        catch (OperationCanceledException)
-                        {
-                            throw;
-                        }
-                        catch (Exception e)
-                        {
-                            DebugLogger.LogException(e);
-
-                            PatcherLogManager logManager = PatcherLogManager.Instance;
-                            PatcherLogSentryRegistry sentryRegistry = logManager.SentryRegistry;
-                            RavenClient ravenClient = sentryRegistry.RavenClient;
-
-                            var sentryEvent = new SentryEvent(e);
-                            PatcherLogSentryRegistry.AddDataToSentryEvent(sentryEvent, logManager.Storage.Guid.ToString());
-                            ravenClient.Capture(sentryEvent);
-
-                            throw;
-                        }
-
                     }
                 }
             }