From 76ebaec0d9e1550bf5c25ab3da63e1445208854c Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Wed, 8 May 2019 13:38:12 +0300
Subject: [PATCH] FileDownloader refactor

---
 ShareX.HelpersLib/FileDownloader.cs           | 42 ++++++++-----------
 .../UpdateChecker/DownloaderForm.cs           |  2 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/ShareX.HelpersLib/FileDownloader.cs b/ShareX.HelpersLib/FileDownloader.cs
index 489a336ef..604b38250 100644
--- a/ShareX.HelpersLib/FileDownloader.cs
+++ b/ShareX.HelpersLib/FileDownloader.cs
@@ -38,6 +38,7 @@ namespace ShareX.HelpersLib
         public string DownloadLocation { get; private set; }
         public bool IsDownloading { get; private set; }
         public bool IsCanceled { get; private set; }
+        public bool IsPaused { get; private set; }
         public long FileSize { get; private set; }
         public long DownloadedSize { get; private set; }
         public double DownloadSpeed { get; private set; }
@@ -55,12 +56,11 @@ namespace ShareX.HelpersLib
             }
         }
 
-        public Exception LastException { get; private set; }
-        public bool IsPaused { get; private set; }
         public IWebProxy Proxy { get; set; }
         public string AcceptHeader { get; set; }
+        public Exception LastException { get; private set; }
 
-        public event EventHandler FileSizeReceived, DownloadStarted, ProgressChanged, DownloadCompleted, ExceptionThrowed;
+        public event EventHandler FileSizeReceived, DownloadStarted, ProgressChanged, DownloadCompleted, ExceptionThrown;
 
         private BackgroundWorker worker;
         private const int bufferSize = 32768;
@@ -74,7 +74,6 @@ namespace ShareX.HelpersLib
 
             worker = new BackgroundWorker();
             worker.WorkerReportsProgress = true;
-            worker.WorkerSupportsCancellation = true;
             worker.DoWork += worker_DoWork;
             worker.ProgressChanged += worker_ProgressChanged;
             worker.RunWorkerCompleted += worker_RunWorkerCompleted;
@@ -85,33 +84,26 @@ namespace ShareX.HelpersLib
             if (!IsDownloading && !string.IsNullOrEmpty(URL) && !worker.IsBusy)
             {
                 IsDownloading = true;
+                IsCanceled = false;
                 IsPaused = false;
+
                 worker.RunWorkerAsync();
             }
         }
 
-        public void ResumeDownload()
-        {
-            if (IsDownloading)
-            {
-                IsPaused = false;
-            }
-        }
-
-        public void PauseDownload()
-        {
-            if (IsDownloading)
-            {
-                IsPaused = true;
-            }
-        }
-
         public void StopDownload()
         {
-            if (IsDownloading)
-            {
-                IsCanceled = true;
-            }
+            IsCanceled = true;
+        }
+
+        public void PauseDownload()
+        {
+            IsPaused = true;
+        }
+
+        public void ResumeDownload()
+        {
+            IsPaused = false;
         }
 
         private void ThrowEvent(EventHandler eventHandler)
@@ -207,7 +199,7 @@ namespace ShareX.HelpersLib
                 {
                     LastException = ex;
 
-                    ThrowEvent(ExceptionThrowed);
+                    ThrowEvent(ExceptionThrown);
                 }
             }
             finally
diff --git a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
index a7d068505..d2bf937a4 100644
--- a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
+++ b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
@@ -223,7 +223,7 @@ namespace ShareX.HelpersLib
                 fileDownloader.DownloadStarted += (v1, v2) => ChangeStatus(Resources.DownloaderForm_StartDownload_Downloading_);
                 fileDownloader.ProgressChanged += (v1, v2) => ChangeProgress();
                 fileDownloader.DownloadCompleted += fileDownloader_DownloadCompleted;
-                fileDownloader.ExceptionThrowed += (v1, v2) => ChangeStatus(fileDownloader.LastException.Message);
+                fileDownloader.ExceptionThrown += (v1, v2) => ChangeStatus(fileDownloader.LastException.Message);
                 fileDownloader.StartDownload();
 
                 ChangeStatus(Resources.DownloaderForm_StartDownload_Getting_file_size_);