[FlashpointManager] Remove SizeTracker object, disable apply button until changes are made

Author: WumboSpasm

FlashpointManager/src/Common.cs

@@ -193,30 +193,16 @@ public static class FPM
             // Controls which component (if any) will be automatically downloaded at launch
             public static string AutoDownload { get; set; } = "";
 
-            // Object for tracking numerous file size sums
-            public static class SizeTracker
-            {
-                // Tracks total size of components available locally
-                public static long Downloaded { get; set; }
-                // Tracks size difference from checking/unchecking components in the manager tab
-                private static long toChange;
-                public static long ToChange
-                {
-                    get => toChange;
-                    set {
-                        toChange = value;
-                        Main.ChangeButton.Text = $"Apply changes ({GetFormattedBytes(toChange - Downloaded)})";
-                    }
-                }
-            }
+            // Total size of every downloaded component; managed by SyncManager() function
+            public static long DownloadedSize { get; set; } = 0;
 
-            // Object for tracking information about certain groups of components
+            // Object providing easy access to certain groups of components; managed by SyncManager() function
             public static class ComponentTracker
             {
-                // Information about components that are available locally
+                // Returns all downloaded components
                 public static List<Component> Downloaded { get; set; } = new List<Component>();
-                // Information about components that are to be updated or added through the updater
-                public static List<Component> ToUpdate   { get; set; } = new List<Component>();
+                // Returns all outdated components
+                public static List<Component> Outdated   { get; set; } = new List<Component>();
             }
 
             // Performs an operation on every node in the specified TreeNodeCollection
@@ -288,7 +274,8 @@ public static TreeNode AddNodeToList(XmlNode child, TreeNodeCollection parent)
             public static void SyncManager()
             {
                 ComponentTracker.Downloaded.Clear();
-                ComponentTracker.ToUpdate.Clear();
+                ComponentTracker.Outdated.Clear();
+                Main.UpdateList.Items.Clear();
 
                 IterateList(Main.ComponentList.Nodes, node =>
                 {
@@ -308,8 +295,7 @@ public static void SyncManager()
                     }
                 });
 
-                Main.UpdateList.Items.Clear();
-                Main.UpdateButton.Text = "Install updates";
+                DownloadedSize = ComponentTracker.Downloaded.Sum(c => long.Parse(File.ReadLines(c.InfoFile).First().Split(' ')[1]));
 
                 long totalSizeChange = 0;
 
@@ -326,9 +312,9 @@ void AddToQueue(Component component, long oldSize)
                     item.SubItems.Add(component.Description);
                     item.SubItems.Add(component.LastUpdated);
                     item.SubItems.Add(displayedSize);
-                    Main.UpdateList.Items.Add(item);
 
-                    ComponentTracker.ToUpdate.Add(component);
+                    Main.UpdateList.Items.Add(item);
+                    ComponentTracker.Outdated.Add(component);
                 }
 
                 IterateXML(XmlTree.GetElementsByTagName("list")[0].ChildNodes, node =>
@@ -367,18 +353,20 @@ void AddToQueue(Component component, long oldSize)
                     }
                 });
 
-                if (ComponentTracker.ToUpdate.Count > 0)
+                Main.ChangeButton.Text = $"Apply changes";
+                Main.ChangeButton.Enabled = false;
+
+                Main.UpdateButton.Text = "Install updates";
+
+                if (ComponentTracker.Outdated.Count > 0)
                 {
-                    Main.UpdateButton.Enabled = true;
                     Main.UpdateButton.Text += $" ({GetFormattedBytes(totalSizeChange)})";
+                    Main.UpdateButton.Enabled = true;
                 }
                 else
                 {
                     Main.UpdateButton.Enabled = false;
                 }
-
-                SizeTracker.Downloaded = GetTotalSize(Main.ComponentList);
-                SizeTracker.ToChange = SizeTracker.Downloaded;
             }
 
             // Deletes a file as well as any directories made empty by its deletion
@@ -499,26 +487,6 @@ public static bool CheckDependencies(bool alertDepends = true)
                 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"))
-                    {
-                        var component = node.Tag as Component;
-
-                        size += component.Downloaded
-                            ? long.Parse(File.ReadLines(component.InfoFile).First().Split(' ')[1])
-                            : component.Size;
-                    }
-                });
-
-                return size;
-            }
-
             // Formats bytes as a human-readable string
             public static string GetFormattedBytes(long bytes)
             {

FlashpointManager/src/Forms/Main.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Xml;
@@ -65,7 +66,21 @@ public void ComponentList_BeforeCheck(object sender, TreeViewCancelEventArgs e)
 
         public void ComponentList_AfterCheck(object sender, TreeViewEventArgs e)
         {
-            FPM.SizeTracker.ToChange = FPM.GetTotalSize(ComponentList);
+            long size = 0;
+
+            FPM.IterateList(ComponentList.Nodes, node =>
+            {
+                if (!node.Checked || !node.Tag.GetType().ToString().EndsWith("Component")) return;
+
+                var component = node.Tag as Component;
+
+                size += component.Downloaded
+                    ? long.Parse(File.ReadLines(component.InfoFile).First().Split(' ')[1])
+                    : component.Size;
+            });
+
+            ChangeButton.Text = $"Apply changes ({FPM.GetFormattedBytes(size - FPM.DownloadedSize)})";
+            ChangeButton.Enabled = true;
         }
 
         private void ComponentList_BeforeSelect(object sender, TreeViewCancelEventArgs e)

FlashpointManager/src/Forms/Operate.cs

@@ -62,7 +62,7 @@ private async void Operation_Load(object sender, EventArgs e)
             }
             else
             {
-                foreach (var component in FPM.ComponentTracker.ToUpdate)
+                foreach (var component in FPM.ComponentTracker.Outdated)
                 {
                     if (FPM.ComponentTracker.Downloaded.Exists(c => c.ID == component.ID))
                     {
@@ -256,7 +256,7 @@ private void RemoveComponents()
 
                 ProgressLabel.Invoke((MethodInvoker)delegate
                 {
-                    string text = FPM.ComponentTracker.ToUpdate.Exists(c => c.ID == workingComponent.ID)
+                    string text = FPM.ComponentTracker.Outdated.Exists(c => c.ID == workingComponent.ID)
                         ? $"Removing old version of component \"{workingComponent.Title}\"..."
                         : $"Removing component \"{workingComponent.Title}\"...";