ModAPI.Common: refactor PathDialogs.cs

Author: Rosalie241

ModAPI.Common/PathDialogs.cs

@@ -11,115 +11,99 @@ public static class PathDialogs
         private static string _galacticAdventuresPath = null;
         public static string ProcessGalacticAdventures()
         {
-            string path = null;
-
             if (_galacticAdventuresPath != null)
             {
                 return _galacticAdventuresPath;
             }
 
             try
             {
-                if (!LauncherSettings.ForceGamePath)
+                // attempt to retrieve spore path from registry
+                string path = SporePath.GetFromRegistry(SporePath.Game.GalacticAdventures);
+                if (!String.IsNullOrEmpty(path) && Directory.Exists(path))
                 {
-                    path = SporePath.GetFromRegistry(SporePath.Game.GalacticAdventures);
+                    path = SporePath.MoveToSporebinEP1(path);
                 }
 
-                if (path != null)
+                // fallback to specified game path
+                if (String.IsNullOrEmpty(path) || !Directory.Exists(path))
                 {
-                    // move the path to SporebinEP1
-                    path = SporePath.MoveToSporebinEP1(path);
+                    path = LauncherSettings.GamePath;
+                    if (!String.IsNullOrEmpty(path) && Directory.Exists(path))
+                    {
+                        path = SporePath.MoveToSporebinEP1(path);
+                    }
                 }
 
-                // If we didn't find the path in the registry or was not valid, ask the user
-                if (path == null || !Directory.Exists(path))
+                // ask the user when fallback wasn't found
+                if (String.IsNullOrEmpty(path) || !Directory.Exists(path))
                 {
+                    var result = MessageBox.Show(CommonStrings.GalacticAdventuresNotFoundSpecifyManual, CommonStrings.GalacticAdventuresNotFound,
+                        MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation);
 
-                    if (path == null)
-                    {
-                        path = LauncherSettings.GamePath;
-                        if (path == null || path.Length == 0)
-                        {
-                            var result = MessageBox.Show(CommonStrings.GalacticAdventuresNotFoundSpecifyManual, CommonStrings.GalacticAdventuresNotFound,
-                                MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation);
-
-                            if (result == DialogResult.OK)
-                            {
-                                path = ShowGalacticAdventuresChooserDialog();
-                            }
-                        }
-                    }
-                    else
+                    if (result == DialogResult.OK)
                     {
-                        // move the path to SporebinEP1
-                        path = SporePath.MoveToSporebinEP1(path);
+                        path = ShowGalacticAdventuresChooserDialog();
                     }
                 }
+
+                _galacticAdventuresPath = path;
             }
             catch (Exception)
             {
                 return null;
             }
 
-            _galacticAdventuresPath = path;
             return _galacticAdventuresPath;
         }
 
         // Returns path to Sporebin or null
         private static string _coreSporePath = null;
         public static string ProcessSpore()
         {
-            string path = null;
-
             if (_coreSporePath != null)
             {
                 return _coreSporePath;
             }
 
             try
             {
-                if (!LauncherSettings.ForceGamePath)
+                // attempt to retrieve spore path from registry
+                string path = SporePath.GetFromRegistry(SporePath.Game.Spore);
+                if (!String.IsNullOrEmpty(path) && Directory.Exists(path))
                 {
-                    path = SporePath.GetFromRegistry(SporePath.Game.Spore);
+                    path = SporePath.MoveToSporebin(path);
                 }
 
-                if (path != null)
+                // fallback to specified game path
+                if (String.IsNullOrEmpty(path) || !Directory.Exists(path))
                 {
-                    // move the path to Sporebin
-                    path = SporePath.MoveToSporebin(path);
+                    path = LauncherSettings.SporeGamePath;
+                    if (!String.IsNullOrEmpty(path) && Directory.Exists(path))
+                    {
+                        path = SporePath.MoveToSporebin(path);
+                    }
                 }
 
-                // If we didn't find the path in the registry or was not valid, ask the user
-                if (path == null || !Directory.Exists(path))
+                // ask the user when fallback wasn't found
+                if (String.IsNullOrEmpty(path) || !Directory.Exists(path))
                 {
+                    var result = MessageBox.Show(CommonStrings.SporeNotFoundSpecifyManual, CommonStrings.SporeNotFound,
+                        MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation);
 
-                    if (path == null)
+                    if (result == DialogResult.OK)
                     {
-                        path = LauncherSettings.GamePath;
-                        if (path == null || path.Length == 0)
-                        {
-                            var result = MessageBox.Show(CommonStrings.SporeNotFoundSpecifyManual, CommonStrings.SporeNotFound,
-                                MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation);
-
-                            if (result == DialogResult.OK)
-                            {
-                                path = ShowSporeChooserDialog();
-                            }
-                        }
-                    }
-                    else
-                    {
-                        // move the path to Sporebin
-                        path = SporePath.MoveToSporebin(path);
+                        path = ShowSporeChooserDialog();
                     }
                 }
+
+                _coreSporePath = path;
             }
             catch (Exception)
             {
                 return null;
             }
 
-            _coreSporePath = path;
             return _coreSporePath;
         }