[FlashpointInstaller] Minor refactoring

Author: WumboSpasm

FlashpointInstaller/src/Common.cs

@@ -160,23 +160,6 @@ public static bool RedistInstalled
                 get => Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X86") != null;
             }
 
-            // Object for tracking numerous file size sums
-            public static class SizeTracker
-            {
-                private static long toDownload;
-
-                // Tracks total size of the pending Flashpoint download
-                public static long ToDownload
-                {
-                    get => toDownload;
-                    set
-                    {
-                        toDownload = value;
-                        Main.InstallButton.Text = $"Install Flashpoint ({GetFormattedBytes(toDownload)})";
-                    }
-                }
-            }
-
             // Performs an operation on every node in the specified TreeNodeCollection
             public static void IterateList(TreeNodeCollection parent, Action<TreeNode> action)
             {
@@ -384,22 +367,6 @@ void AddDependencies(string[] depends)
                 return true;
             }
 
-            // Gets total size in bytes of all checked components in the specified TreeView
-            public static long GetTotalSize(TreeView sourceTree)
-            {
-                long size = 0;
-
-                IterateList(sourceTree.Nodes, node =>
-                {
-                    if (node.Checked && node.Tag.GetType().ToString().EndsWith("Component"))
-                    {
-                        size += (node.Tag as Component).Size;
-                    }
-                });
-
-                return size;
-            }
-
             // Formats bytes as a human-readable string
             public static string GetFormattedBytes(long bytes)
             {

FlashpointInstaller/src/Forms/Main.Designer.cs

@@ -53,7 +53,16 @@ public void ComponentList_BeforeCheck(object sender, TreeViewCancelEventArgs e)
 
         private void ComponentList_AfterCheck(object sender, TreeViewEventArgs e)
         {
-            FPM.SizeTracker.ToDownload = FPM.GetTotalSize(ComponentList);
+            long size = 0;
+
+            FPM.IterateList(ComponentList.Nodes, node =>
+            {
+                if (!node.Checked || !node.Tag.GetType().ToString().EndsWith("Component")) return;
+
+                size += (node.Tag as Component).Size;
+            });
+
+            InstallButton.Text = $"Install Flashpoint ({FPM.GetFormattedBytes(size)})";
         }
 
         private void ComponentList_BeforeSelect(object _, TreeViewCancelEventArgs e)
@@ -99,12 +108,12 @@ private void DestinationPath_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (e.KeyChar == (char)Keys.Return)
             {
-                DownloadButton_Click(this, e);
+                InstallButton_Click(this, e);
                 e.Handled = true;
             }
         }
 
-        private void DownloadButton_Click(object sender, EventArgs e)
+        private void InstallButton_Click(object sender, EventArgs e)
         {
             if (!FPM.VerifyDestinationPath(DestinationPath.Text) || !FPM.CheckDependencies()) return;
 

FlashpointInstaller/src/Forms/Main.cs

@@ -45,12 +45,13 @@ private async void Operation_Load(object sender, EventArgs e)
             {
                 if (node.Checked && node.Tag.GetType().ToString().EndsWith("Component"))
                 {
-                    markedComponents.Add(node.Tag as Component);
+                    var component = node.Tag as Component;
+
+                    markedComponents.Add(component);
+                    byteTotal += component.Size;
                 }
             });
 
-            byteTotal = FPM.SizeTracker.ToDownload;
-
             foreach (var component in markedComponents)
             {
                 workingComponent = component;