From 8d1c6654f995dd7556e72eb3bb33aca5c6504df8 Mon Sep 17 00:00:00 2001
From: Nemesh <prevter@gmail.com>
Date: Wed, 27 Jul 2022 23:37:04 +0300
Subject: [PATCH] v.1.1.1

* Added a progress bar to updating process
---
 FloatTool/Common/Utils.cs            | 57 ++++++++++++++++++++++++++++
 FloatTool/FloatTool.csproj           |  2 +-
 FloatTool/Views/UpdateWindow.xaml    |  4 +-
 FloatTool/Views/UpdateWindow.xaml.cs | 13 +++++--
 README.md                            | 14 ++++++-
 5 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/FloatTool/Common/Utils.cs b/FloatTool/Common/Utils.cs
index 0a4149d..12d3ab0 100644
--- a/FloatTool/Common/Utils.cs
+++ b/FloatTool/Common/Utils.cs
@@ -18,13 +18,70 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace FloatTool
 {
+    // Taken from here:
+    // https://stackoverflow.com/a/46497896/16349466
+    public static class StreamExtensions
+    {
+        public static async Task CopyToAsync(this Stream source, Stream destination, int bufferSize, IProgress<long> progress = null, CancellationToken cancellationToken = default)
+        {
+            if (source == null)
+                throw new ArgumentNullException(nameof(source));
+            if (!source.CanRead)
+                throw new ArgumentException("Has to be readable", nameof(source));
+            if (destination == null)
+                throw new ArgumentNullException(nameof(destination));
+            if (!destination.CanWrite)
+                throw new ArgumentException("Has to be writable", nameof(destination));
+            if (bufferSize < 0)
+                throw new ArgumentOutOfRangeException(nameof(bufferSize));
+
+            var buffer = new byte[bufferSize];
+            long totalBytesRead = 0;
+            int bytesRead;
+            while ((bytesRead = await source.ReadAsync(buffer, cancellationToken).ConfigureAwait(false)) != 0)
+            {
+                await destination.WriteAsync(buffer.AsMemory(0, bytesRead), cancellationToken).ConfigureAwait(false);
+                totalBytesRead += bytesRead;
+                progress?.Report(totalBytesRead);
+            }
+        }
+    }
+
+    public static class HttpClientExtensions
+    {
+        public static async Task DownloadAsync(this HttpClient client, string requestUri, Stream destination, IProgress<float> progress = null, CancellationToken cancellationToken = default)
+        {
+            // Get the http headers first to examine the content length
+            using var response = await client.GetAsync(requestUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+            var contentLength = response.Content.Headers.ContentLength;
+
+            using var download = await response.Content.ReadAsStreamAsync(cancellationToken);
+
+            // Ignore progress reporting when no progress reporter was 
+            // passed or when the content length is unknown
+            if (progress == null || !contentLength.HasValue)
+            {
+                await download.CopyToAsync(destination, cancellationToken);
+                return;
+            }
+
+            // Convert absolute progress (bytes downloaded) into relative progress (0% - 100%)
+            var relativeProgress = new Progress<long>(totalBytes => progress.Report((float)totalBytes / contentLength.Value));
+            // Use extension method to report progress while downloading
+            await download.CopyToAsync(destination, 81920, relativeProgress, cancellationToken);
+            progress.Report(1);
+        }
+    }
+
     public static class StringExtensions
     {
         public static string FirstCharToUpper(this string input) =>
diff --git a/FloatTool/FloatTool.csproj b/FloatTool/FloatTool.csproj
index c1f96cd..f5e3120 100644
--- a/FloatTool/FloatTool.csproj
+++ b/FloatTool/FloatTool.csproj
@@ -9,7 +9,7 @@
     <PackageProjectUrl>https://prevter.github.io/FloatTool</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Prevter/FloatTool</RepositoryUrl>
     <NeutralLanguage>en</NeutralLanguage>
-    <AssemblyVersion>1.1.0</AssemblyVersion>
+    <AssemblyVersion>1.1.1</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
     <ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
     <DebugType>embedded</DebugType>
diff --git a/FloatTool/Views/UpdateWindow.xaml b/FloatTool/Views/UpdateWindow.xaml
index c8927e7..6ffb7c0 100644
--- a/FloatTool/Views/UpdateWindow.xaml
+++ b/FloatTool/Views/UpdateWindow.xaml
@@ -79,9 +79,11 @@
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
 
-                    <Button Content="{DynamicResource m_Update}" Grid.Column="2" Style="{DynamicResource MainButtonStyle}" Click="UpdateButtonClick"/>
+                    <Button Content="{DynamicResource m_Update}" Grid.Column="2" Style="{DynamicResource MainButtonStyle}" Click="UpdateButtonClick" x:Name="UpdateButton"/>
                     <Button Content="{DynamicResource m_Later}" Grid.Column="1" Style="{DynamicResource MainButtonStyle}" Margin="2,0" Click="LaterButtonClick"/>
                     <Button Content="{DynamicResource m_DoNotAsk}" Grid.Column="0" Style="{DynamicResource MainButtonStyle}" Click="DoNotAskButtonClick"/>
+
+                    <ProgressBar Visibility="Hidden" Grid.Column="0" Grid.ColumnSpan="2" Background="{DynamicResource ProgressBackground}" BorderThickness="0" Foreground="{DynamicResource ProgressFill}" x:Name="DownloadProgress"/>
                 </Grid>
             </Grid>
         </Grid>
diff --git a/FloatTool/Views/UpdateWindow.xaml.cs b/FloatTool/Views/UpdateWindow.xaml.cs
index 78f5220..1bf06ab 100644
--- a/FloatTool/Views/UpdateWindow.xaml.cs
+++ b/FloatTool/Views/UpdateWindow.xaml.cs
@@ -65,16 +65,23 @@ private void DoNotAskButtonClick(object sender, RoutedEventArgs e)
 
         private void UpdateButtonClick(object sender, RoutedEventArgs e)
         {
+            UpdateButton.IsEnabled = false;
+            DownloadProgress.Visibility = Visibility.Visible;
             string archiveUrl = UpdateResult.Assets[0].BrowserDownloadUrl;
             Task.Run(async () =>
             {
                 // Download the archive
                 using HttpClient client = new();
-                using (var s = await client.GetStreamAsync(archiveUrl))
+                var progress = new Progress<float>(value =>
                 {
-                    using var fs = new FileStream("update.zip", FileMode.CreateNew);
-                    await s.CopyToAsync(fs);
+                    DownloadProgress.Dispatcher.Invoke(() => DownloadProgress.Value = value * 100);
+                });
+
+                using (var file = new FileStream("update.zip", FileMode.Create, FileAccess.Write, FileShare.None))
+                {
+                    await client.DownloadAsync(archiveUrl, file, progress);
                 }
+
                 // Rename all locked files to .old
                 string folderPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
                 foreach (string file in Directory.GetFiles(folderPath, "*", SearchOption.TopDirectoryOnly))
diff --git a/README.md b/README.md
index fcd23f9..056df62 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 ![Program Working](https://github.com/Prevter/FloatTool/blob/master/doc/program.png?raw=true)  
 
 This app allows you to quickly search combinations to craft skins in CS:GO with (almost) any float you want. All you have to do is set some search settings, wait a bit and all you have to do next is to buy skins from marketplace, that the app found to be needed.  
-This is probably the fastest app you can find, as it can achieve more than 10,000,000 combinations per second on a i9-9900K.
+This is probably the fastest app you can find, as it can achieve more than 15,000,000 combinations per second on an old Ryzen 5 2600.
 
 ## Getting Started
 
@@ -39,6 +39,18 @@ This is probably the fastest app you can find, as it can achieve more than 10,00
 _Please see [Documentation](https://prevter.github.io/FloatTool/tutorial.html) for complete tutorial in usage_
 
 ## Version History
+* 1.1.1
+    * Added a progress bar to updating process
+* 1.1.0
+    * Minor bug fixes
+    * Small optimizations
+    * Added CZ75, P250, SSG 08, Tec-9 and USP-S to list (haven't realized until now)
+    * Fixed all warnings and messages in VS
+    * Added search filter check, it'l show a warning if you entered incorrect settings
+    * If you press F4, it will open steam marketplace for current skin
+* 1.0.2
+    * Added Recoil case
+    * You can now press F3 to open current collection on CSGOStash
 * 1.0.1
     * Fixed critical bug that showed incorrect combinations.
     * Added new collections: