From eda09f706605e273ecfff7ee30a2f9480d039c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tommy=20=C3=96man?= <tommy.oman@gmail.com>
Date: Wed, 3 Jun 2020 21:40:50 +0200
Subject: [PATCH] Refactoring and developing a progressbar on the first async
 function

---
 SyncAsyncApp/DemoMethods.cs         | 109 +++++++++++++++++++++++
 SyncAsyncApp/MainWindow.xaml        |   8 +-
 SyncAsyncApp/MainWindow.xaml.cs     | 133 ++++++++++++----------------
 SyncAsyncApp/ProgressReportModel.cs |  14 +++
 SyncAsyncApp/SyncAsyncApp.csproj    |   2 +
 5 files changed, 187 insertions(+), 79 deletions(-)
 create mode 100644 SyncAsyncApp/DemoMethods.cs
 create mode 100644 SyncAsyncApp/ProgressReportModel.cs

diff --git a/SyncAsyncApp/DemoMethods.cs b/SyncAsyncApp/DemoMethods.cs
new file mode 100644
index 0000000..1f40b08
--- /dev/null
+++ b/SyncAsyncApp/DemoMethods.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncAsyncApp
+{
+    public static class DemoMethods
+    {
+        private static List<string> PrepData()
+        {
+            List<string> output = new List<string>();
+
+            output.Add("https://www.yahoo.com");
+            output.Add("https://www.google.com");
+            output.Add("https://www.microsoft.com");
+            output.Add("https://www.cnn.com");
+            output.Add("https://www.amazon.com");
+            output.Add("https://www.facebook.com");
+            output.Add("https://www.twitter.com");
+            output.Add("https://www.codeproject.com");
+            output.Add("https://www.stackoverflow.com");
+            output.Add("https://en.wikipedia.org/wiki/.NET_Framework");
+
+            return output;
+
+        }
+
+        public static List<WebsiteDataModel> RunDownloadSync()
+        {
+            List<string> websites = PrepData();
+            List<WebsiteDataModel> output = new List<WebsiteDataModel>();
+
+            foreach (string site in websites)
+            {
+                WebsiteDataModel results = DownLoadWebSite(site);
+                output.Add(results);
+            }
+
+            return output;
+
+        }
+
+        public static async Task<List<WebsiteDataModel>> RunDownloadASync(IProgress<ProgressReportModel> progress)
+        {
+            List<string> websites = PrepData();
+            List<WebsiteDataModel> output = new List<WebsiteDataModel>();
+            ProgressReportModel report = new ProgressReportModel();
+
+            foreach (string site in websites)
+            {
+                WebsiteDataModel results = await DownLoadWebSiteAsync(site);
+                output.Add(results);
+
+                report.SitesDownoaded = output;
+                report.PercentageComplete = (output.Count * 100) / websites.Count;
+
+                progress.Report(report);
+            }
+
+            return output;
+        }
+
+        public static async Task<List<WebsiteDataModel>> RunDownloadParallelASync()
+        {
+
+            List<string> websites = PrepData();
+            List<Task<WebsiteDataModel>> tasks = new List<Task<WebsiteDataModel>>();
+
+            foreach (string site in websites)
+            {
+                // Make it async 
+                // tasks.Add( Task.Run(() => DownLoadWebSite(site)));
+
+                //Use Native async
+                tasks.Add(DownLoadWebSiteAsync(site));
+            }
+
+            var results = await Task.WhenAll(tasks);
+
+            return new List<WebsiteDataModel>(results);
+        }
+
+        private static async Task<WebsiteDataModel> DownLoadWebSiteAsync(string websiteURL)
+        {
+            WebsiteDataModel output = new WebsiteDataModel();
+            WebClient client = new WebClient();
+
+            output.WebsiteUrl = websiteURL;
+            output.WebsiteData = await client.DownloadStringTaskAsync(websiteURL);
+
+            return output;
+        }
+
+        private static WebsiteDataModel DownLoadWebSite(string websiteURL)
+        {
+            WebsiteDataModel output = new WebsiteDataModel();
+            WebClient client = new WebClient();
+
+            output.WebsiteUrl = websiteURL;
+            output.WebsiteData = client.DownloadString(websiteURL);
+
+            return output;
+        }
+
+    }
+}
diff --git a/SyncAsyncApp/MainWindow.xaml b/SyncAsyncApp/MainWindow.xaml
index 2ad7946..d7a57e3 100644
--- a/SyncAsyncApp/MainWindow.xaml
+++ b/SyncAsyncApp/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SyncAsyncApp"
         mc:Ignorable="d"
-        Title="MainWindow" Height="500" Width="825" FontSize="16">
+        Title="MainWindow" Height="650" Width="825" FontSize="16">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
@@ -13,6 +13,8 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TextBlock Grid.Row="1" Margin="10 0" FontSize="28">
@@ -21,6 +23,8 @@
         <Button x:Name="executeSync" Grid.Row="2" Margin="10" Padding="5" Click="executeSync_Click">Normal Execute</Button>
         <Button x:Name="executeAsync" Grid.Row="3" Margin="10" Padding="5" Click="executeAsync_Click">Async Execute</Button>
         <Button x:Name="executeParaAsync" Grid.Row="4" Margin="10" Padding="5" Click="executeParallelAsync_Click">Parallel Async Execute</Button>
-        <TextBlock x:Name="resultsWindow" Grid.Row="5" Margin="10"/>
+        <Button x:Name="cancelOperation" Grid.Row="5" Margin="10" Padding="5" Click="executeCancelOperation_Click">Cancel Operation</Button>
+        <ProgressBar x:Name="dashboardProgress" Grid.Row="6" Margin="10" Height="25" />
+        <TextBlock x:Name="resultsWindow" Grid.Row="7" Margin="10"/>
     </Grid>
 </Window>
diff --git a/SyncAsyncApp/MainWindow.xaml.cs b/SyncAsyncApp/MainWindow.xaml.cs
index b04e9ab..b2ec1ec 100644
--- a/SyncAsyncApp/MainWindow.xaml.cs
+++ b/SyncAsyncApp/MainWindow.xaml.cs
@@ -25,11 +25,14 @@ namespace SyncAsyncApp
         {
             InitializeComponent();
         }
-
-        private async void executeAsync_Click(object sender, RoutedEventArgs e)
+        private  void executeSync_Click(object sender, RoutedEventArgs e)
         {
+            resultsWindow.Text = "";
             var watch = System.Diagnostics.Stopwatch.StartNew();
-            await RunDownloadASync();
+            
+            var results = DemoMethods.RunDownloadSync();
+            PrintResults(results);
+
             watch.Stop();
             var elapsedMs = watch.ElapsedMilliseconds;
 
@@ -37,101 +40,72 @@ namespace SyncAsyncApp
         }
 
  
-        private  void executeSync_Click(object sender, RoutedEventArgs e)
+
+        private async void executeAsync_Click(object sender, RoutedEventArgs e)
         {
+            resultsWindow.Text = "";
+            Progress<ProgressReportModel> progress = new Progress<ProgressReportModel>();
+            progress.ProgressChanged += ReportProgress;
             var watch = System.Diagnostics.Stopwatch.StartNew();
-            
-            RunDownloadSync();
-            
+
+            var results = await DemoMethods.RunDownloadASync(progress);
+            PrintResults(results);
+
             watch.Stop();
             var elapsedMs = watch.ElapsedMilliseconds;
 
             resultsWindow.Text += $"Total execution time: {elapsedMs}";
         }
 
-        private async Task RunDownloadASync()
+        private void ReportProgress(object sender, ProgressReportModel e)
         {
-
-            List<string> websites = PrepData();
-            foreach (string site in websites)
-            {
-                WebsiteDataModel results = await Task.Run(()=> DownLoadWebSite(site));
-                ReportWebSiteInfo(results);
-            }
-
+            dashboardProgress.Value = e.PercentageComplete;
+            PrintResults(e.SitesDownoaded);
         }
 
-        private async Task RunDownloadParallelASync()
-        {
 
-            List<string> websites = PrepData();
-            List<Task<WebsiteDataModel>> tasks = new List<Task<WebsiteDataModel>>();
+        //private async Task RunDownloadParallelASync()
+        //{
 
-            foreach (string site in websites)
-            {
-               // Make it async 
-               // tasks.Add( Task.Run(() => DownLoadWebSite(site)));
+        //    List<string> websites = PrepData();
+        //    List<Task<WebsiteDataModel>> tasks = new List<Task<WebsiteDataModel>>();
 
-                //Use Native async
-                tasks.Add(DownLoadWebSiteAsync(site));
-            }
+        //    foreach (string site in websites)
+        //    {
+        //       // Make it async 
+        //       // tasks.Add( Task.Run(() => DownLoadWebSite(site)));
 
-            var results = await Task.WhenAll(tasks);
+        //        //Use Native async
+        //        tasks.Add(DownLoadWebSiteAsync(site));
+        //    }
 
-            foreach (var item in results)
-            {
-                ReportWebSiteInfo(item);
-            }
-        }
+        //    var results = await Task.WhenAll(tasks);
 
-        private void RunDownloadSync()
-        {
+        //    foreach (var item in results)
+        //    {
+        //        ReportWebSiteInfo(item);
+        //    }
+        //}
 
-            List<string> websites = PrepData();
-            foreach(string site in websites)
-            {
-                WebsiteDataModel results = DownLoadWebSite(site);
-                ReportWebSiteInfo(results);
-            }
 
-        }
 
-        private void ReportWebSiteInfo(WebsiteDataModel data)
-        {
-            resultsWindow.Text += $"{data.WebsiteUrl} downloaded: {data.WebsiteData.Length} characters long. {Environment.NewLine}";  
-        }
+        //private void ReportWebSiteInfo(WebsiteDataModel data)
+        //{
+        //    resultsWindow.Text += $"{data.WebsiteUrl} downloaded: {data.WebsiteData.Length} characters long. {Environment.NewLine}";  
+        //}
 
-        private WebsiteDataModel DownLoadWebSite(string websiteURL)
-        {
-            WebsiteDataModel output = new WebsiteDataModel();
-            WebClient client = new WebClient();
 
-            output.WebsiteUrl = websiteURL;
-            output.WebsiteData = client.DownloadString(websiteURL);
 
-            return output;
-        }
 
-        private List<string> PrepData()
-        {
-            List<string> output = new List<string>();
-
-            resultsWindow.Text = "";
-            output.Add("https://www.yahoo.com");
-            output.Add("https://www.google.com");
-            output.Add("https://www.microsoft.com");
-            output.Add("https://www.cnn.com");
-            output.Add("https://www.codeproject.com");
-            output.Add("https://www.stackoverflow.com");
-
-            return output;
-
-        }
 
         private async void executeParallelAsync_Click(object sender, RoutedEventArgs e)
         {
+            resultsWindow.Text = "";
             var watch = System.Diagnostics.Stopwatch.StartNew();
-            await RunDownloadParallelASync();
+
+            var results = await DemoMethods.RunDownloadParallelASync();
+            PrintResults(results);
+
             watch.Stop();
             var elapsedMs = watch.ElapsedMilliseconds;
 
@@ -139,16 +113,21 @@ namespace SyncAsyncApp
         }
 
 
-        private async Task<WebsiteDataModel> DownLoadWebSiteAsync(string websiteURL)
+
+
+        private void executeCancelOperation_Click(object sender, RoutedEventArgs e)
         {
-            WebsiteDataModel output = new WebsiteDataModel();
-            WebClient client = new WebClient();
 
-            output.WebsiteUrl = websiteURL;
-            output.WebsiteData = await client.DownloadStringTaskAsync(websiteURL);
-
-            return output;
         }
 
+        private void PrintResults(List<WebsiteDataModel> results)
+        {
+            resultsWindow.Text = "";
+
+            foreach (var item in results)
+            {
+                resultsWindow.Text += $"{item.WebsiteUrl} downloaded: {item.WebsiteData.Length} characters long. {Environment.NewLine}";
+            }
+        }
     }
 }
diff --git a/SyncAsyncApp/ProgressReportModel.cs b/SyncAsyncApp/ProgressReportModel.cs
new file mode 100644
index 0000000..0f7019e
--- /dev/null
+++ b/SyncAsyncApp/ProgressReportModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncAsyncApp
+{
+    public class ProgressReportModel
+    {
+        public int PercentageComplete { get; set; } = 0;
+        public List<WebsiteDataModel> SitesDownoaded { get; set; } = new List<WebsiteDataModel>();
+    }
+}
diff --git a/SyncAsyncApp/SyncAsyncApp.csproj b/SyncAsyncApp/SyncAsyncApp.csproj
index 08329bc..f315fdf 100644
--- a/SyncAsyncApp/SyncAsyncApp.csproj
+++ b/SyncAsyncApp/SyncAsyncApp.csproj
@@ -55,6 +55,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="DemoMethods.cs" />
+    <Compile Include="ProgressReportModel.cs" />
     <Compile Include="WebsiteDataModel.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>