refactor(updaters): добавил отображение прогресса при скачивании новой версии приложения

Author: ArXa1L

Commands/SelfUpdate.cs

@@ -101,7 +101,7 @@ protected override int Execute()
 
         ICementUpdater updater = server == null
             ? new GitHubReleaseCementUpdater(Log)
-            : new ServerCementUpdater(Log, server, branch);
+            : new ServerCementUpdater(Log, ConsoleWriter.Shared, server, branch);
 
         Log.LogInformation("Updater: {CementUpdaterName}", updater.Name);
         return UpdateBinary(updater);

Common/Common.csproj

@@ -6,6 +6,7 @@
     <Nullable>warnings</Nullable>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />

Common/Extensions/StreamExtensions.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Buffers;
+using System.IO;
+using System.Text;
+
+namespace Common.Extensions;
+
+internal static class StreamExtensions
+{
+    public static byte[] ReadAllBytes(this Stream stream)
+    {
+        using var buffer = new MemoryStream();
+        stream.CopyTo(buffer);
+
+        return buffer.ToArray();
+    }
+
+    public static byte[] ReadAllBytesWithProgress(this Stream source, Action<long> reportProgress)
+    {
+        using var destination = new MemoryStream();
+        using var streamReader = new StreamReader(source, Encoding.UTF8);
+
+        // This value was originally picked to be the largest multiple of 4096 that is still smaller than
+        // the large object heap threshold (85K).
+        const int readBufferSize = 4096 * 20;
+        var readBuffer = ArrayPool<byte>.Shared.Rent(readBufferSize);
+
+        var totalBytesRead = 0L;
+
+        try
+        {
+            int bytesRead;
+            while ((bytesRead = source.Read(readBuffer, 0, readBuffer.Length)) != 0)
+            {
+                destination.Write(readBuffer, 0, bytesRead);
+                totalBytesRead += bytesRead;
+
+                reportProgress(totalBytesRead);
+            }
+        }
+        finally
+        {
+            ArrayPool<byte>.Shared.Return(readBuffer);
+        }
+
+        return destination.ToArray();
+    }
+}

Common/Updaters/GitHubReleaseCementUpdater.cs

@@ -4,6 +4,7 @@
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading;
+using Common.Extensions;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -116,21 +117,7 @@ private static byte[] LoadGitHubReleaseAsset(GitHubAsset gitHubAsset)
             httpResponseMessage.EnsureSuccessStatusCode();
 
             using var stream = httpResponseMessage.Content.ReadAsStream(cts.Token);
-            return ReadAllBytes(stream);
-        }
-
-        private static byte[] ReadAllBytes(Stream stream)
-        {
-            if (stream is MemoryStream ms)
-            {
-                stream.CopyTo(ms);
-                return ms.ToArray();
-            }
-
-            using var buffer = new MemoryStream();
-            stream.CopyTo(buffer);
-
-            return buffer.ToArray();
+            return stream.ReadAllBytes();
         }
 
         public string Name => "GitHub";

Common/Updaters/LocalPathCementUpdater.cs

@@ -32,11 +32,13 @@ public byte[] GetNewCementZip()
             return null;
         }
 
-        public static string GetZipCementDirectory()
+        private static string GetZipCementDirectory()
         {
             var zipDir = Path.Combine(Helper.HomeDirectory(), "work");
+
             if (!Directory.Exists(zipDir))
                 Directory.CreateDirectory(zipDir);
+
             return zipDir;
         }
 

Common/Updaters/ServerCementUpdater.cs

@@ -4,6 +4,8 @@
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading;
+using Common.Extensions;
+using Humanizer;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -19,12 +21,14 @@ public sealed class ServerCementUpdater : ICementUpdater
         private readonly ILogger log;
         private readonly string server;
         private readonly string branch;
+        private readonly ConsoleWriter consoleWriter;
 
-        public ServerCementUpdater(ILogger log, string server, string branch)
+        public ServerCementUpdater(ILogger log, ConsoleWriter consoleWriter, string server, string branch)
         {
             this.server = server;
             this.branch = branch;
             this.log = log;
+            this.consoleWriter = consoleWriter;
         }
 
         public string GetNewCommitHash()
@@ -63,7 +67,7 @@ public string GetNewCommitHash()
             catch (Exception ex)
             {
                 log.LogError(ex, "Failed to look for updates on server");
-                ConsoleWriter.Shared.WriteWarning("Failed to look for updates on server: " + ex.Message);
+                consoleWriter.WriteWarning("Failed to look for updates on server: " + ex.Message);
 
                 return null;
             }
@@ -91,29 +95,28 @@ public byte[] GetNewCementZip()
                     }
                 };
 
-                using var httpResponseMessage = httpClient.Send(httpRequestMessage, cts.Token);
+                using var httpResponseMessage = httpClient.Send(httpRequestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
                 httpResponseMessage.EnsureSuccessStatusCode();
 
                 using var stream = httpResponseMessage.Content.ReadAsStream(cts.Token);
-                return ReadAllBytes(stream);
+
+                return stream.ReadAllBytesWithProgress(ReportProgress);
+
+                void ReportProgress(long totalBytes)
+                {
+                    var readableBytes = totalBytes.Bytes().ToString();
+                    consoleWriter.WriteProgress($"Downloading: {readableBytes}");
+                }
             }
             catch (Exception ex)
             {
                 log.LogError(ex, "Failed to look for updates on server, channel='{CementServerReleaseChannel}'", branch);
-                ConsoleWriter.Shared.WriteWarning("Failed to look for updates on server: " + ex.Message);
+                consoleWriter.WriteWarning("Failed to look for updates on server: " + ex.Message);
 
                 return null;
             }
         }
 
-        private static byte[] ReadAllBytes(Stream stream)
-        {
-            using var buffer = new MemoryStream();
-            stream.CopyTo(buffer);
-
-            return buffer.ToArray();
-        }
-
         public string Name => server;
     }
 }