Skip to content

Commit 6b1cd9a

Browse files
unitycoderunitycoder
committed
adding project item refresh after unity is closed (#19),
1 parent c0c6ce6 commit 6b1cd9a

File tree

3 files changed

+54
-41
lines changed

3 files changed

+54
-41
lines changed

‎UnityLauncherPro/GetProjects.cs‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static class GetProjects
1212
static readonly string[] registryPathsToCheck = new string[] { @"SOFTWARE\Unity Technologies\Unity Editor 5.x", @"SOFTWARE\Unity Technologies\Unity Editor 4.x" };
1313

1414
// convert target platform name into valid buildtarget platform name, NOTE this depends on unity version, now only 2019 and later are supported
15-
static Dictionary<string, string> remapPlatformNames = new Dictionary<string, string> { { "StandaloneWindows64", "Standalone" }, { "StandaloneWindows", "Standalone" }, { "Android", "Android" }, { "WebGL", "WebGL" } };
15+
public static Dictionary<string, string> remapPlatformNames = new Dictionary<string, string> { { "StandaloneWindows64", "Standalone" }, { "StandaloneWindows", "Standalone" }, { "Android", "Android" }, { "WebGL", "WebGL" } };
1616

1717
// TODO separate scan and folders
1818
public static List<Project> Scan(bool getGitBranch = false, bool getArguments = false, bool showMissingFolders = false, bool showTargetPlatform = false)
@@ -78,22 +78,6 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
7878
projectName = projectPath;
7979
}
8080

81-
//string csprojFile = Path.Combine(projectPath, projectName + ".csproj");
82-
83-
//// maybe 4.x or 2019 or later project
84-
//if (folderExists == true && File.Exists(csprojFile) == false)
85-
//{
86-
// csprojFile = Path.Combine(projectPath, "Assembly-CSharp.csproj");
87-
//}
88-
//else if (folderExists == true && File.Exists(csprojFile) == false) // editor only project
89-
//{
90-
// csprojFile = Path.Combine(projectPath, projectName + ".Editor.csproj");
91-
//}
92-
//else if (folderExists == true && File.Exists(csprojFile) == false) // solution only
93-
//{
94-
// csprojFile = Path.Combine(projectPath, projectName + ".sln");
95-
//}
96-
9781
// get last modified date from folder
9882
DateTime? lastUpdated = folderExists ? Tools.GetLastModifiedTime(projectPath) : null;
9983

@@ -114,13 +98,10 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
11498
gitBranch = folderExists ? Tools.ReadGitBranchInfo(projectPath) : null;
11599
}
116100

117-
// TODO add option to disable check
118101
string targetPlatform = "";
119-
//Platform targetPlatform = Platform.Unknown;
120102
if (showTargetPlatform == true)
121103
{
122104
targetPlatform = folderExists ? Tools.GetTargetPlatform(projectPath) : null;
123-
//targetPlatform = folderExists ? Tools.GetTargetPlatform(projectPath) : Platform.Unknown;
124105
}
125106

126107
var p = new Project();
@@ -130,18 +111,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
130111
p.Modified = lastUpdated;
131112
p.Arguments = customArgs;
132113
p.GITBranch = gitBranch;
133-
//p.TargetPlatform = targetPlatform;
134-
//Console.WriteLine("targetPlatform="+ targetPlatform);
135-
// get matching buildtarget platform name from dictionary
136-
if (string.IsNullOrEmpty(targetPlatform) == false && remapPlatformNames.ContainsKey(targetPlatform))
137-
{
138-
p.TargetPlatform = remapPlatformNames[targetPlatform];
139-
}
140-
else
141-
{
142-
if (string.IsNullOrEmpty(targetPlatform) == false) Console.WriteLine("Missing buildTarget remap name for: " + targetPlatform);
143-
p.TargetPlatform = null;
144-
}
114+
p.TargetPlatform = targetPlatform;
145115

146116
// bubblegum(TM) solution, fill available platforms for this unity version, for this project
147117
p.TargetPlatforms = Tools.GetPlatformsForUnityVersion(projectVersion);

‎UnityLauncherPro/MainWindow.xaml.cs‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ async void GoLookForUpdatesForThisUnity()
561561
}
562562
}
563563

564-
void RefreshRecentProjects()
564+
public void RefreshRecentProjects()
565565
{
566566
// clear search
567567
txtSearchBox.Text = "";
@@ -824,8 +824,32 @@ private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
824824
private void BtnLaunchProject_Click(object sender, RoutedEventArgs e)
825825
{
826826
var proj = GetSelectedProject();
827-
var proc = Tools.LaunchProject(proj);
827+
var proc = Tools.LaunchProject(proj, gridRecent);
828828
proj.Process = proc;
829+
830+
// subscribe to process exit, so that can update proj details row (if it was changed in Unity)
831+
proj.Process.Exited += (object o, EventArgs ea) =>
832+
{
833+
Console.WriteLine("Unity closed, update this project: " + proj);
834+
835+
// call update on main thread, TODO move this to Tools?
836+
this.Dispatcher.Invoke(() =>
837+
{
838+
//Console.WriteLine("got project "+gridRecent.Items.Contains(proj));
839+
var index = projectsSource.IndexOf(proj);
840+
var tempProj = projectsSource[index];
841+
tempProj.Modified = Tools.GetLastModifiedTime(proj.Path);
842+
tempProj.Version = Tools.GetProjectVersion(proj.Path);
843+
tempProj.GITBranch = Tools.ReadGitBranchInfo(proj.Path);
844+
tempProj.TargetPlatform = Tools.GetTargetPlatform(proj.Path);
845+
projectsSource[index] = tempProj;
846+
847+
// TODO no need to update every item though..
848+
gridRecent.Items.Refresh();
849+
850+
});
851+
};
852+
829853
Tools.SetFocusToGrid(gridRecent);
830854
}
831855

‎UnityLauncherPro/Tools.cs‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static void ExploreProjectFolder(Project proj)
144144
}
145145

146146
// NOTE holding alt key (when using alt+o) brings up unity project selector
147-
public static Process LaunchProject(Project proj)
147+
public static Process LaunchProject(Project proj, DataGrid dataGridRef = null)
148148
{
149149
// validate
150150
if (proj == null) return null;
@@ -200,6 +200,7 @@ public static Process LaunchProject(Project proj)
200200
Console.WriteLine("Start process: " + cmd + " " + unitycommandlineparameters);
201201

202202
newProcess.StartInfo.Arguments = unitycommandlineparameters;
203+
newProcess.EnableRaisingEvents = true;
203204
newProcess.Start();
204205

205206
if (Properties.Settings.Default.closeAfterProject)
@@ -212,12 +213,10 @@ public static Process LaunchProject(Project proj)
212213
Console.WriteLine(e);
213214
}
214215

215-
// move as first, since its opened, disabled for now, more used to it staying in place..
216-
// MainWindow wnd = (MainWindow)Application.Current.MainWindow;
217-
// wnd.MoveRecentGridItem(0);
218-
216+
// NOTE move project as first, since its opened, disabled for now, since its too jumpy..
217+
//MainWindow wnd = (MainWindow)Application.Current.MainWindow;
218+
//wnd.MoveRecentGridItem(0);
219219
return newProcess;
220-
221220
}
222221

223222
static bool CheckCrashBackupScene(string projectPath)
@@ -775,7 +774,7 @@ public static string ReadGitBranchInfo(string projectPath)
775774
}
776775

777776
//public static Platform GetTargetPlatform(string projectPath)
778-
public static string GetTargetPlatform(string projectPath)
777+
static string GetTargetPlatformRaw(string projectPath)
779778
{
780779
string results = null;
781780
//Platform results = Platform.Unknown;
@@ -807,9 +806,29 @@ public static string GetTargetPlatform(string projectPath)
807806
}
808807
}
809808
}
809+
else
810+
{
811+
Console.WriteLine("Missing csproj, cannot parse target platform: "+ projectPath);
812+
}
813+
810814
return results;
811815
}
812816

817+
public static string GetTargetPlatform(string projectPath)
818+
{
819+
var rawPlatformName = GetTargetPlatformRaw(projectPath);
820+
821+
if (string.IsNullOrEmpty(rawPlatformName) == false && GetProjects.remapPlatformNames.ContainsKey(rawPlatformName))
822+
{
823+
return GetProjects.remapPlatformNames[rawPlatformName];
824+
}
825+
else
826+
{
827+
if (string.IsNullOrEmpty(rawPlatformName) == false) Console.WriteLine("Missing buildTarget remap name for: " + rawPlatformName);
828+
return null;
829+
}
830+
}
831+
813832
/// <summary>
814833
/// Searches for a directory beginning with "startPath".
815834
/// If the directory is not found, then parent folders are searched until

0 commit comments

Comments
 (0)