[FlashpointInstaller] Bring dependency handling up to par with FlashpointManager

Author: WumboSpasm

FlashpointInstaller/src/Common.cs

@@ -320,21 +320,33 @@ public static bool VerifyDestinationPath(string path)
             }
 
             // Checks if any dependencies were not marked for download by the user, and marks them accordingly
-            public static void CheckDependencies()
+            public static bool CheckDependencies()
             {
-                List<string> requiredDepends = new List<string>();
-                List<string> missingDepends  = new List<string>();
+                List<string> requiredDepends  = new List<string>();
+                List<TreeNode> missingDepends = new List<TreeNode>();
+
+                void AddDependencies(string[] depends)
+                {
+                    requiredDepends.AddRange(depends);
+
+                    foreach (string depend in depends)
+                    {
+                        var query = Main.ComponentList.Nodes.Find(depend, true);
+
+                        if (query.Length > 0) AddDependencies((query[0].Tag as Component).Depends);
+                    }
+                }
 
                 // First, fill out a list of dependencies
                 IterateList(Main.ComponentList.Nodes, node =>
                 {
                     if (node.Checked && node.Tag.GetType().ToString().EndsWith("Component"))
                     {
-                        requiredDepends.AddRange((node.Tag as Component).Depends);
+                        AddDependencies((node.Tag as Component).Depends);
                     }
                 });
 
-                // Then make sure they're all marked for installation 
+                // Then make sure they're all marked accordingly 
                 IterateList(Main.ComponentList.Nodes, node =>
                 {
                     if (node.Tag.GetType().ToString().EndsWith("Component"))
@@ -343,20 +355,33 @@ public static void CheckDependencies()
 
                         if (requiredDepends.Any(depend => depend == component.ID) && !node.Checked)
                         {
-                            node.Checked = true;
-                            missingDepends.Add(component.Title);
+                            missingDepends.Add(node);
                         }
                     }
                 });
 
                 if (missingDepends.Count > 0)
                 {
-                    MessageBox.Show(
+                    long missingSize = missingDepends.Select(n => (n.Tag as Component).Size).Sum();
+
+                    var result = MessageBox.Show(
                         "The following dependencies will also be installed:\n\n" +
-                        string.Join(", ", missingDepends) + "\n\nClick the OK button to proceed.",
-                        "Notice", MessageBoxButtons.OK, MessageBoxIcon.Information
+                        string.Join(", ", missingDepends.Select(n => (n.Tag as Component).Title)) + "\n\n" +
+                        $"This adds an additional {GetFormattedBytes(missingSize)} to your download. Is this OK?",
+                        "Notice", MessageBoxButtons.YesNo, MessageBoxIcon.Information
                     );
+
+                    if (result == DialogResult.Yes)
+                    {
+                        missingDepends.ForEach(d => d.Checked = true);
+                    }
+                    else
+                    {
+                        return false;
+                    }
                 }
+
+                return true;
             }
 
             // Gets total size in bytes of all checked components in the specified TreeView

FlashpointInstaller/src/Forms/Main.cs

@@ -106,9 +106,7 @@ private void DestinationPath_KeyPress(object sender, KeyPressEventArgs e)
 
         private void DownloadButton_Click(object sender, EventArgs e)
         {
-            if (!FPM.VerifyDestinationPath(DestinationPath.Text)) return;
-
-            FPM.CheckDependencies();
+            if (!FPM.VerifyDestinationPath(DestinationPath.Text) || !FPM.CheckDependencies()) return;
 
             if (!FPM.RedistInstalled)
             {