fix icomparer sorting exception (with show missing projects enabled)

unitycoder · unitycoder · commit f1ed8152e7a7 · 2022-10-19T23:25:43.000+03:00
diff --git a/UnityLauncherPro/GetProjects.cs b/UnityLauncherPro/GetProjects.cs
@@ -64,7 +64,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
                         {
                             projectsFound.Add(p);
 
-                            // test adding to history
+                            // add found projects to history also (gets added only if its not already there)
                             Tools.AddProjectToHistory(p.Path);
                         }
                     } // valid key
@@ -77,10 +77,10 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
             // scan info for custom folders (if not already on the list)
             if (AllProjectPaths != null)
             {
-                // iterate custom full project history
+                // iterate custom full projects history
                 foreach (var projectPath in AllProjectPaths)
                 {
-                    // check if registry list contains this path
+                    // check if registry list contains this path already, then skip it
                     bool found = false;
                     for (int i = 0, len = projectsFound.Count; i < len; i++)
                     {
@@ -91,7 +91,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
                         }
                     }
 
-                    // if not found from full history list, add to projects list
+                    // if not found from registry, add to recent projects list
                     if (found == false)
                     {
                         var p = GetProjectInfo(projectPath, getGitBranch, getPlasticBranch, getArguments, showMissingFolders, showTargetPlatform);
@@ -100,20 +100,19 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
                 }
             }
 
-            // NOTE sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)
+            // sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)
             // thats why need to sort projects list by modified date
             // sort by modified date, projects without modified date are put to last, NOTE: this would remove projects without modified date (if they become last items, before trimming list on next step)
             projectsFound.Sort((x, y) =>
             {
-                if (x.Modified == null && y.Modified == null) return -1; // was 0
+                if (x.Modified == null && y.Modified == null) return 0; // cannot be -1, https://stackoverflow.com/a/42821992/5452781
                 if (x.Modified == null) return 1;
                 if (y.Modified == null) return -1;
                 return y.Modified.Value.CompareTo(x.Modified.Value);
                 //return x.Modified.Value.CompareTo(y.Modified.Value); // BUG this breaks something, so that last item platform is wrong (for project that is missing from disk) ?
             });
-            //projectsFound.Sort((x, y) => y.Modified.Value.CompareTo(x.Modified.Value));
 
-            // trim list to max amount TODO only if enabled in settings
+            // trim list to max amount
             if (projectsFound.Count > MainWindow.maxProjectCount)
             {
                 //Console.WriteLine("Trimming projects list to " + MainWindow.maxProjectCount + " projects");
@@ -129,7 +128,6 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo
 
             // if displaying missing folders are disabled, and folder doesnt exists, skip this project
             if (showMissingFolders == false && folderExists == false) return null;
-
             string projectName = "";
 
             // get project name from full path
@@ -179,7 +177,6 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo
                 targetPlatform = folderExists ? Tools.GetTargetPlatform(projectPath) : null;
                 //if (projectPath.Contains("Shader")) Console.WriteLine(projectPath + " targetPlatform=" + targetPlatform);
             }
-
             var p = new Project();
 
             switch (MainWindow.projectNameSetting)

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc`
`64`	`64`	`{`
`65`	`65`	`projectsFound.Add(p);`
`66`	`66`
`67`		`- // test adding to history`
	`67`	`+ // add found projects to history also (gets added only if its not already there)`
`68`	`68`	`Tools.AddProjectToHistory(p.Path);`
`69`	`69`	`}`
`70`	`70`	`} // valid key`
`@@ -77,10 +77,10 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc`
`77`	`77`	`// scan info for custom folders (if not already on the list)`
`78`	`78`	`if (AllProjectPaths != null)`
`79`	`79`	`{`
`80`		`- // iterate custom full project history`
	`80`	`+ // iterate custom full projects history`
`81`	`81`	`foreach (var projectPath in AllProjectPaths)`
`82`	`82`	`{`
`83`		`- // check if registry list contains this path`
	`83`	`+ // check if registry list contains this path already, then skip it`
`84`	`84`	`bool found = false;`
`85`	`85`	`for (int i = 0, len = projectsFound.Count; i < len; i++)`
`86`	`86`	`{`
`@@ -91,7 +91,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- // if not found from full history list, add to projects list`
	`94`	`+ // if not found from registry, add to recent projects list`
`95`	`95`	`if (found == false)`
`96`	`96`	`{`
`97`	`97`	`var p = GetProjectInfo(projectPath, getGitBranch, getPlasticBranch, getArguments, showMissingFolders, showTargetPlatform);`
`@@ -100,20 +100,19 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`- // NOTE sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)`
	`103`	`+ // sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)`
`104`	`104`	`// thats why need to sort projects list by modified date`
`105`	`105`	`// sort by modified date, projects without modified date are put to last, NOTE: this would remove projects without modified date (if they become last items, before trimming list on next step)`
`106`	`106`	`projectsFound.Sort((x, y) =>`
`107`	`107`	`{`
`108`		`- if (x.Modified == null && y.Modified == null) return -1; // was 0`
	`108`	`+ if (x.Modified == null && y.Modified == null) return 0; // cannot be -1, https://stackoverflow.com/a/42821992/5452781`
`109`	`109`	`if (x.Modified == null) return 1;`
`110`	`110`	`if (y.Modified == null) return -1;`
`111`	`111`	`return y.Modified.Value.CompareTo(x.Modified.Value);`
`112`	`112`	`//return x.Modified.Value.CompareTo(y.Modified.Value); // BUG this breaks something, so that last item platform is wrong (for project that is missing from disk) ?`
`113`	`113`	`});`
`114`		`- //projectsFound.Sort((x, y) => y.Modified.Value.CompareTo(x.Modified.Value));`
`115`	`114`
`116`		`- // trim list to max amount TODO only if enabled in settings`
	`115`	`+ // trim list to max amount`
`117`	`116`	`if (projectsFound.Count > MainWindow.maxProjectCount)`
`118`	`117`	`{`
`119`	`118`	`//Console.WriteLine("Trimming projects list to " + MainWindow.maxProjectCount + " projects");`
`@@ -129,7 +128,6 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo`
`129`	`128`
`130`	`129`	`// if displaying missing folders are disabled, and folder doesnt exists, skip this project`
`131`	`130`	`if (showMissingFolders == false && folderExists == false) return null;`
`132`		`-`
`133`	`131`	`string projectName = "";`
`134`	`132`
`135`	`133`	`// get project name from full path`
`@@ -179,7 +177,6 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo`
`179`	`177`	`targetPlatform = folderExists ? Tools.GetTargetPlatform(projectPath) : null;`
`180`	`178`	`//if (projectPath.Contains("Shader")) Console.WriteLine(projectPath + " targetPlatform=" + targetPlatform);`
`181`	`179`	`}`
`182`		`-`
`183`	`180`	`var p = new Project();`
`184`	`181`
`185`	`182`	`switch (MainWindow.projectNameSetting)`