Simplify uninstall code

Author: WumboSpasm

src/Forms/MainRemove.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 using FlashpointInstaller.Common;
@@ -18,14 +21,30 @@ private void SourcePathBrowse2_Click(object sender, EventArgs e)
             RemoveButton.Enabled = true;
         }
 
-        private void RemoveButton_Click(object sender, EventArgs e)
+        private async void RemoveButton_Click(object sender, EventArgs e)
         {
             if (FPM.VerifySourcePath(FPM.SourcePath2))
             {
                 FPM.OperateMode = 3;
+                TabControl.Enabled = false;
 
-                var operationWindow = new Operation();
-                operationWindow.ShowDialog();
+                await Task.Run(() => Directory.Delete(FPM.SourcePath2, true));
+
+                if (FPM.Main.RemoveShortcuts.Checked)
+                {
+                    var shortcutPaths = new List<string>()
+                    {
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Flashpoint.lnk"),
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop),   "Flashpoint.lnk")
+                    };
+
+                    foreach (string path in shortcutPaths) if (File.Exists(path)) File.Delete(path);
+                }
+
+                Hide();
+
+                var finishWindow = new FinishOperation();
+                finishWindow.ShowDialog();
             }
         }
     }

src/Forms/Operation.cs

@@ -54,7 +54,7 @@ private async void Operation_Load(object sender, EventArgs e)
 
                 byteTotal = FPM.SizeTracker.ToDownload;
             }
-            else if (FPM.OperateMode != 3)
+            else
             {
                 Text = "Modifying Flashpoint...";
                 CancelButton.Visible = false;
@@ -93,15 +93,6 @@ private async void Operation_Load(object sender, EventArgs e)
 
                 byteTotal = removedComponents.Concat(addedComponents).Sum(item => item.Size);
             }
-            else if (FPM.OperateMode == 3)
-            {
-                Text = "Removing Flashpoint...";
-                CancelButton.Visible = false;
-
-                await Task.Run(RemoveFlashpoint);
-
-                FinishOperation();
-            }
 
             foreach (var component in removedComponents)
             {
@@ -154,6 +145,8 @@ await Task.Run(() =>
                     });
                 }
 
+                TaskbarManager.Instance.SetProgressState(TaskbarProgressBarState.NoProgress, FPM.Main.Handle);
+
                 FinishOperation();
             }
         }
@@ -310,36 +303,6 @@ private void RemoveComponents()
             FPM.DeleteFileAndDirectories(infoFile);
         }
 
-        private void RemoveFlashpoint()
-        {
-            string[] files = Directory.GetFiles(FPM.SourcePath2);
-
-            for (int i = 0; i < files.Length; i++)
-            {
-                double progress = (i + 1) / files.Length;
-                string fileName = files[i].Substring(files[i].LastIndexOf(@"\"));
-
-                ProgressMeasure.Invoke((MethodInvoker)delegate
-                {
-                    ProgressMeasure.Value = (int)((double)progress * ProgressMeasure.Maximum);
-                });
-
-                ProgressLabel.Invoke((MethodInvoker)delegate
-                {
-                    ProgressLabel.Text = $"[{(int)((double)progress * 100)}%] Removing \"{fileName}\"... {i + 1} of {files.Length} files";
-                });
-
-                File.Delete(files[i]);
-            }
-
-            ProgressLabel.Invoke((MethodInvoker)delegate
-            {
-                ProgressLabel.Text = $"[100%] Removing directories...";
-            });
-
-            Directory.Delete(FPM.SourcePath2, true);
-        }
-
         private async void FinishOperation()
         {
             if (FPM.OperateMode == 0)
@@ -373,25 +336,6 @@ await Task.Run(() =>
                 var finishWindow = new FinishOperation();
                 finishWindow.ShowDialog();
             }
-            else if (FPM.OperateMode == 3)
-            {
-                if (FPM.Main.RemoveShortcuts.Checked)
-                {
-                    var shortcutPaths = new List<string>()
-                    {
-                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Flashpoint.lnk"),
-                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop),   "Flashpoint.lnk")
-                    };
-
-                    foreach (string path in shortcutPaths) if (File.Exists(path)) File.Delete(path);
-                }
-
-                Hide();
-                FPM.Main.Hide();
-
-                var finishWindow = new FinishOperation();
-                finishWindow.ShowDialog();
-            }
 
             Close();
         }