if project is already launched then bring Unity instance to front, move Editor process references to separate class (so that it doesn't reset on project list refresh, fixes #19 )

unitycoder · unitycoder · commit 41cf4fd2444f · 2021-10-17T16:04:51.000+03:00
diff --git a/UnityLauncherPro/Data/Project.cs b/UnityLauncherPro/Data/Project.cs
@@ -15,24 +15,19 @@ public class Project : IValueConverter
         public string GITBranch { set; get; }
         //public string TargetPlatform { set; get; }
         public string TargetPlatform { set; get; }
-
         public string[] TargetPlatforms { set; get; }
-
-
         public bool folderExists { set; get; }
-        public Process Process; // launched unity exe
 
         public override string ToString()
         {
             return $"{Title} {Version} {Path} {Modified} {Arguments} {GITBranch} {TargetPlatform}";
         }
 
-        // https://stackoverflow.com/a/5551986/5452781
+        // change datagrid colors based on value using converter https://stackoverflow.com/a/5551986/5452781
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             bool b = (bool)value;
             return b;
-            //return string.IsNullOrEmpty(str);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/UnityLauncherPro/Helpers/ProcessHandler.cs b/UnityLauncherPro/Helpers/ProcessHandler.cs
@@ -0,0 +1,62 @@
+﻿// keeps reference of launched unity processes, so that can close them even if project list is refreshed
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace UnityLauncherPro.Helpers
+{
+    public static class ProcessHandler
+    {
+        static Dictionary<string, Process> processes = new Dictionary<string, Process>();
+
+        public static void Add(Project proj, Process proc)
+        {
+            if (proc == null) return;
+
+            var key = proj.Path;
+            if (processes.ContainsKey(key))
+            {
+                // already in the list, maybe trying to launch same project twice? only overwrite if previous process has closed
+                if (processes[key] == null) processes[key] = proc;
+            }
+            else
+            {
+                processes.Add(key, proc);
+            }
+
+            // subscribe to process exit here, so that can update proj details row (if it was changed in Unity)
+            proc.Exited += (object o, EventArgs ea) =>
+            {
+                // call method in mainwindow, to easy access for sourcedata and grid
+                Application.Current.Dispatcher.Invoke(DispatcherPriority.Background, (Action)delegate ()
+                {
+                    MainWindow wnd = (MainWindow)Application.Current.MainWindow;
+                    wnd.ProcessExitedCallBack(proj);
+                });
+
+                // remove closed process item
+                Remove(key);
+            };
+        }
+
+        public static Process Get(string key)
+        {
+            if (processes.ContainsKey(key)) return processes[key];
+            return null;
+        }
+
+        public static bool IsRunning(string key)
+        {
+            return processes.ContainsKey(key) && (processes[key] != null);
+        }
+
+        public static void Remove(string key)
+        {
+            if (processes.ContainsKey(key)) processes.Remove(key);
+        }
+    }
+}
diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
@@ -18,6 +18,7 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shell;
+using UnityLauncherPro.Helpers;
 
 namespace UnityLauncherPro
 {
@@ -91,6 +92,7 @@ void Start()
                 myMutex = new Mutex(true, appName, out aIsNewInstance);
                 if (!aIsNewInstance)
                 {
+                    // NOTE doesnt work if its minized to tray
                     ActivateOtherWindow();
                     App.Current.Shutdown();
                 }
@@ -142,8 +144,7 @@ private static void ActivateOtherWindow()
             if (other != IntPtr.Zero)
             {
                 SetForegroundWindow(other);
-                if (IsIconic(other))
-                    OpenIcon(other);
+                if (IsIconic(other)) OpenIcon(other);
             }
         }
 
@@ -192,7 +193,8 @@ void HandleCommandLineLaunch()
                     {
                         // try launching it
                         var proc = Tools.LaunchProject(proj);
-                        proj.Process = proc;
+                        //proj.Process = proc;
+                        //ProcessHandler.Add(proj, proc);
                     }
 
                     // quit after launch if enabled in settings
@@ -828,30 +830,8 @@ private void BtnLaunchProject_Click(object sender, RoutedEventArgs e)
         {
             var proj = GetSelectedProject();
             var proc = Tools.LaunchProject(proj, gridRecent);
-            proj.Process = proc;
 
-            // subscribe to process exit, so that can update proj details row (if it was changed in Unity)
-            proj.Process.Exited += (object o, EventArgs ea) =>
-            {
-                Console.WriteLine("Unity closed, update this project: " + proj);
-
-                // call update on main thread, TODO move this to Tools?
-                this.Dispatcher.Invoke(() =>
-                {
-                    //Console.WriteLine("got project "+gridRecent.Items.Contains(proj));
-                    var index = projectsSource.IndexOf(proj);
-                    var tempProj = projectsSource[index];
-                    tempProj.Modified = Tools.GetLastModifiedTime(proj.Path);
-                    tempProj.Version = Tools.GetProjectVersion(proj.Path);
-                    tempProj.GITBranch = Tools.ReadGitBranchInfo(proj.Path);
-                    tempProj.TargetPlatform = Tools.GetTargetPlatform(proj.Path);
-                    projectsSource[index] = tempProj;
-
-                    // TODO no need to update every item though..
-                    gridRecent.Items.Refresh();
-
-                });
-            };
+            //ProcessHandler.Add(proj, proc);
 
             Tools.SetFocusToGrid(gridRecent);
         }
@@ -963,7 +943,7 @@ private void TxtSearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
                 case Key.Return: // open selected project
                     var proj = GetSelectedProject();
                     var proc = Tools.LaunchProject(proj);
-                    proj.Process = proc;
+                    //ProcessHandler.Add(proj, proc);
                     break;
                 case Key.Tab:
                 case Key.Up:
@@ -1055,7 +1035,7 @@ private void GridRecent_PreviewKeyDown(object sender, KeyEventArgs e)
                     e.Handled = true;
                     var proj = GetSelectedProject();
                     var proc = Tools.LaunchProject(proj);
-                    proj.Process = proc;
+                    //ProcessHandler.Add(proj, proc);
                     break;
                 default:
                     break;
@@ -1441,7 +1421,7 @@ private void GridRecent_PreviewMouseDoubleClick(object sender, MouseButtonEventA
 
             var proj = GetSelectedProject();
             var proc = Tools.LaunchProject(proj);
-            proj.Process = proc;
+            //ProcessHandler.Add(proj, proc);
         }
 
         private void DataGridUnitys_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -1727,16 +1707,18 @@ private void MenuItemKillProcess_Click(object sender, RoutedEventArgs e)
         void KillSelectedProcess(object sender, ExecutedRoutedEventArgs e)
         {
             var proj = GetSelectedProject();
-            if (proj.Process != null)
+            var proc = ProcessHandler.Get(proj.Path);
+            if (proj != null && proc != null)
             {
                 try
                 {
-                    proj.Process.Kill();
+                    proc.Kill();
                 }
                 catch (Exception)
                 {
                 }
-                proj.Process = null;
+                //proc.Dispose(); // NOTE cannot dispose, otherwise process.Exited event is not called
+                proj = null;
             }
         }
 
@@ -1745,7 +1727,8 @@ private void GridRecent_ContextMenuOpening(object sender, ContextMenuEventArgs e
             if (tabControl.SelectedIndex == 0)
             {
                 var proj = GetSelectedProject();
-                menuItemKillProcess.IsEnabled = proj.Process != null;
+                var proc = ProcessHandler.Get(proj.Path);
+                menuItemKillProcess.IsEnabled = proc != null;
             }
         }
 
@@ -1892,7 +1875,8 @@ private void MenuStartWebGLServer_Click(object sender, RoutedEventArgs e)
             int port = rnd.Next(50000, 61000);
 
             // take process id from unity, if have it (then webserver closes automatically when unity is closed)
-            int pid = proj.Process == null ? -1 : proj.Process.Id;
+            var proc = ProcessHandler.Get(proj.Path);
+            int pid = proc == null ? -1 : proc.Id;
             var param = "\"" + webExe + "\" \"" + buildPath + "\" " + port + (pid == -1 ? "" : " " + pid); // server exe path, build folder and port
 
             // then open browser
@@ -2242,5 +2226,27 @@ private void BtnResources_Click(object sender, RoutedEventArgs e)
         {
             Tools.OpenURL(resourcesURL);
         }
+
+        public void ProcessExitedCallBack(Project proj)
+        {
+            Console.WriteLine("Process Exited: " + proj.Path);
+            //var index = projectsSource.IndexOf(proj); // this fails since proj has changed after refresh (timestamp or other data)
+
+            // FIXME nobody likes extra loops.. but only 40 items to find correct project?
+            for (int i = 0, len = projectsSource.Count; i < len; i++)
+            {
+                if (projectsSource[i].Path == proj.Path)
+                {
+                    var tempProj = projectsSource[i];
+                    tempProj.Modified = Tools.GetLastModifiedTime(proj.Path);
+                    tempProj.Version = Tools.GetProjectVersion(proj.Path);
+                    tempProj.GITBranch = Tools.ReadGitBranchInfo(proj.Path);
+                    tempProj.TargetPlatform = Tools.GetTargetPlatform(proj.Path);
+                    projectsSource[i] = tempProj;
+                    gridRecent.Items.Refresh();
+                    break;
+                }
+            }
+        }
     } // class
 } //namespace
diff --git a/UnityLauncherPro/Tools.cs b/UnityLauncherPro/Tools.cs
@@ -5,16 +5,31 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using UnityLauncherPro.Helpers;
 
 namespace UnityLauncherPro
 {
     public static class Tools
     {
+        const int SW_RESTORE = 9;
+
+        [DllImport("user32", CharSet = CharSet.Unicode)]
+        static extern IntPtr FindWindow(string cls, string win);
+        [DllImport("user32")]
+        static extern IntPtr SetForegroundWindow(IntPtr hWnd);
+        [DllImport("user32")]
+        static extern bool IsIconic(IntPtr hWnd);
+        [DllImport("user32")]
+        static extern bool OpenIcon(IntPtr hWnd);
+        [DllImport("user32")]
+        private static extern bool ShowWindow(IntPtr handle, int nCmdShow);
+
         // returns last modified date for file (or null if cannot get it)
         public static DateTime? GetLastModifiedTime(string path)
         {
@@ -150,7 +165,20 @@ public static Process LaunchProject(Project proj, DataGrid dataGridRef = null)
             if (proj == null) return null;
             if (Directory.Exists(proj.Path) == false) return null;
 
-            Console.WriteLine("launch project " + proj.Title + " " + proj.Version);
+            Console.WriteLine("Launching project " + proj.Title + " at " + proj.Path);
+
+            // check if this project path has unity already running? (from lock file or process) 
+            // NOTE this check only works if previous unity instance was started while we were running
+            if (ProcessHandler.IsRunning(proj.Path))
+            {
+                Console.WriteLine("Project is already running, lets not launch unity.. because it opens Hub");
+                BringProcessToFront(ProcessHandler.Get(proj.Path));
+                return null;
+            }
+            else
+            {
+                // TODO check lock file?
+            }
 
             // there is no assets path, probably we want to create new project then
             var assetsFolder = Path.Combine(proj.Path, "Assets");
@@ -216,6 +244,8 @@ public static Process LaunchProject(Project proj, DataGrid dataGridRef = null)
             // NOTE move project as first, since its opened, disabled for now, since its too jumpy..
             //MainWindow wnd = (MainWindow)Application.Current.MainWindow;
             //wnd.MoveRecentGridItem(0);
+
+            ProcessHandler.Add(proj, newProcess);
             return newProcess;
         }
 
@@ -679,7 +709,6 @@ public static void DisplayUpgradeDialog(Project proj, MainWindow owner)
                 // inject new version for this item
                 proj.Version = upgradeToVersion;
                 var proc = LaunchProject(proj);
-                proj.Process = proc;
             }
             else
             {
@@ -977,7 +1006,7 @@ public static void FastCreateProject(string version, string baseFolder, string p
             proj.Path = Path.Combine(baseFolder, newPath);
             proj.Version = version;
             var proc = LaunchProject(proj);
-            proj.Process = proc;
+            ProcessHandler.Add(proj, proc);
         } // FastCreateProject
 
 
@@ -1142,5 +1171,17 @@ public static bool ValidateDateFormat(string format)
             }
         }
 
+        // https://stackoverflow.com/a/37724335/5452781
+        public static void BringProcessToFront(Process process)
+        {
+            IntPtr handle = process.MainWindowHandle;
+            if (IsIconic(handle))
+            {
+                ShowWindow(handle, SW_RESTORE);
+            }
+
+            SetForegroundWindow(handle);
+        }
+
     } // class
 } // namespace
diff --git a/UnityLauncherPro/UnityLauncherPro.csproj b/UnityLauncherPro/UnityLauncherPro.csproj
@@ -82,6 +82,7 @@
     <Compile Include="GetProjects.cs" />
     <Compile Include="GetUnityInstallations.cs" />
     <Compile Include="GetUnityUpdates.cs" />
+    <Compile Include="Helpers\ProcessHandler.cs" />
     <Compile Include="Libraries\ExtractTarGz.cs" />
     <Compile Include="NewProject.xaml.cs">
       <DependentUpon>NewProject.xaml</DependentUpon>

Original file line number	Diff line number	Diff line change
`@@ -15,24 +15,19 @@ public class Project : IValueConverter`
`15`	`15`	`public string GITBranch { set; get; }`
`16`	`16`	`//public string TargetPlatform { set; get; }`
`17`	`17`	`public string TargetPlatform { set; get; }`
`18`		`-`
`19`	`18`	`public string[] TargetPlatforms { set; get; }`
`20`		`-`
`21`		`-`
`22`	`19`	`public bool folderExists { set; get; }`
`23`		`- public Process Process; // launched unity exe`
`24`	`20`
`25`	`21`	`public override string ToString()`
`26`	`22`	`{`
`27`	`23`	`return $"{Title} {Version} {Path} {Modified} {Arguments} {GITBranch} {TargetPlatform}";`
`28`	`24`	`}`
`29`	`25`
`30`		`- // https://stackoverflow.com/a/5551986/5452781`
	`26`	`+ // change datagrid colors based on value using converter https://stackoverflow.com/a/5551986/5452781`
`31`	`27`	`public object Convert(object value, Type targetType, object parameter, CultureInfo culture)`
`32`	`28`	`{`
`33`	`29`	`bool b = (bool)value;`
`34`	`30`	`return b;`
`35`		`- //return string.IsNullOrEmpty(str);`
`36`	`31`	`}`
`37`	`32`
`38`	`33`	`public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)`