Spore ModAPI Easy Installer: make messages after install more consistent

Author: Rosalie241

Spore ModAPI Easy Installer/EasyInstaller.cs

@@ -20,7 +20,7 @@
 
 namespace Spore_ModAPI_Easy_Installer
 {
-    static class EasyInstaller
+    public static class EasyInstaller
     {
         enum FileChooserType
         {
@@ -38,15 +38,16 @@ enum FileType
             Spore_Package // a .package that goes to the Spore data folder instead of the EP1 one
         }
 
-        enum ResultType
+        public enum ResultType
         {
             Success,
             InstallerExecuted,  // we have found a custom installer, close Easy installer and execute that one
             UnsupportedFile,
             GalacticAdventuresNotFound,
             UnauthorizedAccess,
             InvalidPath,
-            ModNotInstalled
+            ModNotInstalled,
+            NoInstallerFound
         }
         //// Show a file chooser and returns the path selected. It can ask for files or directories.
         //static string ShowFileChooser(FileChooserType type, string title, string filter);
@@ -140,7 +141,6 @@ static void Main()
                         catch (Exception ex)
                         {
                             errorStrings[i] = ex.Message; results.Add(ResultType.UnsupportedFile);
-                            MessageBox.Show(ex.ToString() + "\n" + ex.StackTrace, "AAA");
                         }
                     }
                     for (int i = 0; i < results.Count; i++) //foreach (ResultType type in results)
@@ -149,7 +149,9 @@ static void Main()
                         ResultType type = results[i];
                         outcome += GetResultText(type, Path.GetFileNameWithoutExtension(inputPaths[i]), errorStrings[i]) + "\n";
                     }
-                    WaitForExit();
+
+                    ModList.Save();
+                    ShowExitMessageBox();
                 }
             }
         }
@@ -467,9 +469,6 @@ private static ResultType ExtractSporemodZip(string inputFile, ModConfiguration
             return ResultType.Success;
         }
 
-        [DllImport("user32.dll", ExactSpelling = true)]
-        static extern bool IsWindow(IntPtr hWnd);
-
         private static bool CheckModCoreDllsVersion(ZipArchiveEntry xmlEntry)
         {
             try
@@ -524,9 +523,9 @@ static ResultType TryExecuteInstaller(string inputFile, string modName)
                     win.SignalRevealInstaller();
 
                     installerThread.Join();
-                    
+
                     if (!XmlInstallerCancellation.Cancellation[modName.Trim('"')])
-                        return ResultType.InstallerExecuted;
+                        return win.GetResult();
                     else
                         return ResultType.ModNotInstalled;
                 }
@@ -536,7 +535,7 @@ static ResultType TryExecuteInstaller(string inputFile, string modName)
                 }
                 else
                 {
-                    return ResultType.Success;
+                    return ResultType.NoInstallerFound;
                 }
             }
         }
@@ -580,12 +579,7 @@ static ResultType InstallSporemod(string inputFile, string modName)
         {
             var result = TryExecuteInstaller(inputFile, modName);
 
-            if ((result == ResultType.InstallerExecuted) || (result == ResultType.ModNotInstalled))
-            {
-                // the custom installer executed, we don't need to do anything else
-                return ResultType.InstallerExecuted;
-            }
-            else if (result == ResultType.Success)
+            if (result == ResultType.NoInstallerFound)
             {
                 // the custom installer just didn't exist, extract as ZIP file
 
@@ -728,8 +722,6 @@ static string GetResultText(ResultType result, string modName, string errorStrin
                 // show message to the user
                 return Strings.ModInstalled1 + modName + Strings.ModInstalled2;
             }
-            else if (result == ResultType.InstallerExecuted)
-                return string.Empty;
             else if (result == ResultType.ModNotInstalled)
             {
                 return Strings.ModInstalled1 + modName + Strings.InstallationCancelled;
@@ -746,25 +738,6 @@ static string GetResultText(ResultType result, string modName, string errorStrin
             }
         }
 
-        static void WaitForExit()
-        {
-            int counter = 0;
-            System.Timers.Timer timer = new System.Timers.Timer(10);
-            timer.Elapsed += (sneder, args) =>
-            {
-                if ((counter > 5) && (XmlInstallerWindow.installerWindows.Count == 0))
-                {
-                    timer.Stop();
-                    ModList.Save();
-                    ShowExitMessageBox();
-                }
-                else
-                    counter++;
-            };
-            timer.Start();
-            Application.Run();
-        }
-
         static void ShowExitMessageBox()
         {
             Thread thread = new Thread(() =>

Spore ModAPI Easy Installer/Strings.resx

@@ -133,10 +133,10 @@
     <value>Choose the mod to be installed</value>
   </data>
   <data name="InstallationCancelled" xml:space="preserve">
-    <value>Installation cancelled</value>
+    <value>" cancelled installation</value>
   </data>
   <data name="InstallationCompleted" xml:space="preserve">
-    <value>Installation completed</value>
+    <value>" completed installation</value>
   </data>
   <data name="InstallingModTitle" xml:space="preserve">
     <value>Installing mod...</value>

Spore ModAPI Easy Installer/XmlInstallerWindow.xaml.cs

@@ -63,6 +63,8 @@ public partial class XmlInstallerWindow : DecoratableWindow
 
         public static string SporeDataPath = SporePath.MoveToData(SporePath.Game.Spore, SporePath.GetRealParent(PathDialogs.ProcessSpore()));
 
+        private EasyInstaller.ResultType _result = EasyInstaller.ResultType.ModNotInstalled;
+
         public XmlInstallerWindow(string modName, bool configure, bool uninstall)
         {
             InitializeComponent();
@@ -95,6 +97,11 @@ public XmlInstallerWindow(string modName, bool configure, bool uninstall)
             }
         }
 
+        public EasyInstaller.ResultType GetResult()
+        {
+            return _result;
+        }
+
         public void SignalRevealInstaller()
         {
             Dispatcher.Invoke(new Action(() =>
@@ -409,10 +416,6 @@ private void GetComponents()
                         RemovalGames = game
                     });
                 }
-                else
-                {
-                    Debug.WriteLine("u w0t");
-                }
             }
 
             int _activeComponentCount = GetComponentCount();
@@ -688,6 +691,7 @@ await Dispatcher.BeginInvoke(new Action(() =>
                     XmlInstallerCancellation.Cancellation[ModName] = true;
                     _installerState = 2;
                     _installerMode = 1;
+                    _result = EasyInstaller.ResultType.ModNotInstalled;
                     Close();
                 }
 
@@ -870,16 +874,19 @@ await Task.Run(() =>
                 if (_installerMode == 1)
                 {
                     _installerState = 2;
+                    _result = EasyInstaller.ResultType.Success;
                     Close();
                 }
                 else
                 {
                     CyclePage(0, 1);
+                    _result = EasyInstaller.ResultType.Success;
                     _installerState = 2;
                 }
             }
             catch (Exception ex)
             {
+                _result = EasyInstaller.ResultType.ModNotInstalled;
                 ErrorInfoTextBlock.Text = ex.ToString();
                 CyclePage(0, 3);
             }