ModAPI.Common: add StreamUtils.cs

Author: Rosalie241

ModAPI.Common/DownloadClient.cs

@@ -1,7 +1,9 @@
-using System;
+using ModApi.Common;
+using ModAPI.Common.Update;
+using System;
 using System.IO;
+using System.IO.Pipes;
 using System.Net.Http;
-using ModAPI.Common.Update;
 
 namespace ModAPI.Common
 {
@@ -11,32 +13,7 @@ public class DownloadClient : IDisposable
         private HttpRequestMessage httpRequestMessage = new HttpRequestMessage();
         private static readonly string httpUserAgent = "Spore-ModAPI-Launcher-Kit/" + UpdateManager.CurrentVersion.ToString();
 
-        public delegate void DownloadClientEventHandler(object source, int percentage);
-        public event DownloadClientEventHandler DownloadProgressChanged = null;
-
-        private void copyStreamWithProgress(Stream inputStrem, Stream outputStream)
-        {
-            long streamLength = inputStrem.Length;
-            byte[] buffer = new byte[4096];
-            long totalBytesRead = 0;
-            int bytesRead;
-            int percentageDownloaded = 0;
-            int percentage;
-
-            while ((bytesRead = inputStrem.Read(buffer, 0, buffer.Length)) > 0)
-            {
-                outputStream.Write(buffer, 0, bytesRead);
-                totalBytesRead += bytesRead;
-
-                // only trigger event when percentage has changed
-                percentage = (int)((double)totalBytesRead / (double)streamLength * 100.0);
-                if (percentageDownloaded != percentage)
-                {
-                    percentageDownloaded = percentage;
-                    DownloadProgressChanged?.Invoke(this, percentage);
-                }
-            }
-        }
+        public event StreamUtils.StreamProgressEventHandler DownloadProgressChanged = null;
 
         public DownloadClient(string url)
         {
@@ -79,7 +56,7 @@ public void DownloadToFile(string file)
             using (var downloadStream = response.Content.ReadAsStreamAsync().Result)
             using (var fileStream = new FileStream(file, FileMode.Create))
             {
-                copyStreamWithProgress(downloadStream, fileStream);
+                StreamUtils.CopyStreamWithProgress(downloadStream, fileStream, this, DownloadProgressChanged);
             }
         }
 
@@ -96,7 +73,7 @@ public MemoryStream DownloadToMemory()
             using (var downloadStream = response.Content.ReadAsStreamAsync().Result)
             {
                 memoryStream = new MemoryStream((int)downloadStream.Length);
-                copyStreamWithProgress(downloadStream, memoryStream);
+                StreamUtils.CopyStreamWithProgress(downloadStream, memoryStream, this, DownloadProgressChanged);
             }
 
             return memoryStream;

ModAPI.Common/ModApi.Common.csproj

@@ -67,6 +67,7 @@
     <Compile Include="Permissions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SporePath.cs" />
+    <Compile Include="StreamUtils.cs" />
     <Compile Include="Types.cs" />
     <Compile Include="UI\AnimatedScrollViewer.cs" />
     <Compile Include="UI\Converters.cs" />

ModAPI.Common/StreamUtils.cs

@@ -0,0 +1,33 @@
+using System.IO;
+
+namespace ModApi.Common
+{
+    public class StreamUtils
+    {
+        public delegate void StreamProgressEventHandler(object source, int percentage);
+
+        public static void CopyStreamWithProgress(Stream inputStrem, Stream outputStream, object eventSource, StreamProgressEventHandler eventHandler)
+        {
+            long streamLength = inputStrem.Length;
+            byte[] buffer = new byte[4096];
+            long totalBytesRead = 0;
+            int bytesRead;
+            int percentageDownloaded = 0;
+            int percentage;
+
+            while ((bytesRead = inputStrem.Read(buffer, 0, buffer.Length)) > 0)
+            {
+                outputStream.Write(buffer, 0, bytesRead);
+                totalBytesRead += bytesRead;
+
+                // only trigger event when percentage has changed
+                percentage = (int)((double)totalBytesRead / (double)streamLength * 100.0);
+                if (percentageDownloaded != percentage)
+                {
+                    percentageDownloaded = percentage;
+                    eventHandler?.Invoke(eventSource, percentage);
+                }
+            }
+        }
+    }
+}