Spore ModAPI Easy Installer: remove need for RevealXmlInstaller.info

Author: Rosalie241

Spore ModAPI Easy Installer/EasyInstaller.cs

@@ -543,44 +543,22 @@ static ResultType TryExecuteInstaller(string inputFile, string modName)
                         return ResultType.ModNotInstalled;
                     }
 
-                    /*XmlDocument Document = new XmlDocument();
-                    archive.GetEntry("ModInfo.xml").Open();
-                    modName*/
                     string modPath = Path.Combine(Directory.GetParent(System.Reflection.Assembly.GetEntryAssembly().Location).ToString(), "ModConfigs", modName);
                     if (Directory.Exists(modPath))
                         DeleteFolder(modPath);
 
                     Directory.CreateDirectory(modPath);
 
-                    string revealInstallerInfoPath = Path.Combine(Directory.GetParent(System.Reflection.Assembly.GetEntryAssembly().Location).ToString(), "RevealXmlInstaller.info");
-                    if (File.Exists(revealInstallerInfoPath))
-                        File.Delete(revealInstallerInfoPath);
 
-                    /*XmlInstallerWindow win = */
-                    //bool installCancelled = false;
                     Thread installerThread = GetXmlInstaller(modName, false, false, true, out XmlInstallerWindow win);
-                    //_showXmlInstaller = true;//Thread showThread = new Thread(() => xmlWin.Show());// xmlWin.Dispatcher.Invoke(new Action(() => xmlWin.Show())));
-                    /*showThread.SetApartmentState(ApartmentState.STA);
-                    showThread.Start();
-                    showThread.Join();*/
-                    //if (archive.GetEntry("Theme.xaml"))
+
                     foreach (var fileEntry in archive.Entries)
                     {
                         fileEntry.ExtractToFile(Path.Combine(modPath, fileEntry.Name), true);
-                        /*if (Path.GetFileName(fileEntry.Name).ToLowerInvariant() == "theme.xaml")
-                            File.WriteAllText(themeInfoPath, string.Empty);*/
                     }
-                    //win.InstallCancelled += (sneder, args) => installCancelled = true;
-                    File.WriteAllText(revealInstallerInfoPath, string.Empty);
-                    /*if (win != null)
-                        win.Closed += (sneder, args) =>
-                        {installCancelled = win.cancelled;
-                            installerThread.Abort();
-                        };
-                    else
-                        MessageBox.Show("win == null");*/
-                    //RevealXmlInstaller = true; //Thread revealThread = new Thread(() => xmlWin.RevealInstaller()); //xmlWin.Dispatcher.Invoke(new Action(() => xmlWin.RevealInstaller())));
-                    //revealThread.SetApartmentState(ApartmentState.STA); revealThread.Start(); xmlWin.Closed += (sneder, args) => System.Windows.Application.Current.Shutdown(); revealThread.Join();
+
+                    win.SignalRevealInstaller();
+
                     installerThread.Join();
 
                     if (!XmlInstallerCancellation.Cancellation[modName.Trim('"')])
@@ -591,61 +569,11 @@ static ResultType TryExecuteInstaller(string inputFile, string modName)
                 else if (entry != null)
                 {
                     return ResultType.UnsupportedFile;
-                    /*tempFile = Path.GetTempFileName();
-                    try
-                    {
-                        entry.ExtractToFile(tempFile, true);
-                    }
-                    catch (Exception ex)
-                    {
-                        // delete the temp file and propagate the exception
-                        File.Delete(tempFile);
-                        throw ex;
-                    }
-
-                    string validInstaller = "!!!!!2017_DI_9_r_Beta2-1-6";
-                    bool modNameValid = modName == validInstaller;
-                    bool modInstallerSizeValid = new FileInfo(tempFile).Length == 13023232;
-                    //MessageBox.Show("modName: " + modName + "\ninputFile: " + inputFile + "\n\nmodNameValid: " + modNameValid + "\nmodInstallerSizeValid: " + modInstallerSizeValid);
-
-                    if (modNameValid && modInstallerSizeValid)
-                    {
-                        var startInfo = new ProcessStartInfo()
-                        {
-                            UseShellExecute = false,  // we need this to execute a temp file
-                            FileName = tempFile,
-                            Arguments =
-                                ConvertToArgument(inputFile) + " " +
-                                ConvertToArgument(GetOutputPath(FileType.DLL)) + " " +
-                                ConvertToArgument(GetOutputPath(FileType.Package)) + " " +
-                                ConvertToArgument(GetOutputPath(FileType.Spore_Package))
-                        };
-
-                        var process = Process.Start(startInfo);
-                        process.WaitForExit();
-
-                        File.Delete(tempFile);
-
-                        return ResultType.InstallerExecuted;
-                    }
-                    else
-                    {
-                        MessageBox.Show("For security reasons, EXE custom installers have been disabled. If you believe this mod is safe, inform its developer of the issue, and tell them to look into \"XML Custom Installers\".");
-                        return ResultType.UnsupportedFile;
-                    }*/
                 }
                 else
                 {
                     return ResultType.Success;
                 }
-
-                /*
-                    // there's no exe custom installer, check for an xml one
-                    if (xmlEntry == null)
-                    {
-                        // there's no custom installer of any kind
-                        return ResultType.Success;
-                    }*/
             }
         }
 
@@ -680,10 +608,14 @@ static Thread GetXmlInstaller(string modName, bool configure, bool uninstall, bo
             });
             thread.SetApartmentState(ApartmentState.STA);
             thread.Start();
-            //thread.Join();
+
+            // wait until xmlWin has been set
+            while (xmlWin == null)
+            {
+                Thread.Sleep(10);
+            }
+
             win = xmlWin;
-            
-            
             return thread;
         }
 

Spore ModAPI Easy Installer/XmlInstallerWindow.xaml.cs

@@ -93,30 +93,14 @@ public XmlInstallerWindow(string modName, bool configure, bool uninstall)
                     }));
                 }
             }
-            else
-            {
-                WaitForCue();
-            }
         }
 
-        void WaitForCue()
+        public void SignalRevealInstaller()
         {
-            string indicatorPath = Path.Combine(Directory.GetParent(System.Reflection.Assembly.GetEntryAssembly().Location).ToString(), "RevealXmlInstaller.info");
-
-            System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer()
-            {
-                Interval = 250
-            };
-            timer.Tick += (sneder, args) =>
+            Dispatcher.Invoke(new Action(() =>
             {
-                if (File.Exists(indicatorPath))
-                {
-                    RevealInstaller();
-                    File.Delete(indicatorPath);
-                    timer.Stop();
-                }
-            };
-            timer.Start();
+                RevealInstaller();
+            }));
         }
 
         public void RevealInstaller()