add searchparentfolder support for plastic branch search fixes #185

Author: unitycoder

UnityLauncherPro/GetProjects.cs

@@ -170,7 +170,7 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo
                 // check for plastic, if enabled
                 if (getPlasticBranch == true && gitBranch == null)
                 {
-                    gitBranch = folderExists ? Tools.ReadPlasticBranchInfo(projectPath) : null;
+                    gitBranch = folderExists ? Tools.ReadPlasticBranchInfo(projectPath, searchGitbranchRecursively) : null;
                 }
             }
 

UnityLauncherPro/Tools.cs

@@ -1394,83 +1394,84 @@ public static void RemoveContextMenuRegistryAPKInstall(string contextRegRoot)
         /// <returns></returns>
         public static string ReadGitBranchInfo(string projectPath, bool searchParentFolders)
         {
-            string results = null;
-
-            if (searchParentFolders)
+            DirectoryInfo directoryInfo = new DirectoryInfo(projectPath);
+            while (directoryInfo != null)
             {
-                DirectoryInfo directoryInfo = new DirectoryInfo(projectPath);
+                string gitDir = Path.Combine(directoryInfo.FullName, ".git");
+                string headFile = Path.Combine(gitDir, "HEAD");
 
-                while (directoryInfo != null)
+                if (Directory.Exists(gitDir) && File.Exists(headFile))
                 {
-                    string dirName = Path.Combine(directoryInfo.FullName, ".git");
+                    string headContent = File.ReadAllText(headFile).Trim();
+                    int pos = headContent.LastIndexOf('/') + 1;
+                    return (pos < headContent.Length) ? headContent.Substring(pos) : headContent;
+                }
 
-                    if (Directory.Exists(dirName))
-                    {
-                        string branchFile = Path.Combine(dirName, "HEAD");
-                        if (File.Exists(branchFile))
-                        {
-                            // removes extra end of line
-                            results = string.Join(" ", File.ReadAllLines(branchFile));
-                            // get branch only
-                            int pos = results.LastIndexOf("/") + 1;
-                            results = results.Substring(pos, results.Length - pos);
-                            return results;
-                        }
-                    }
-                    directoryInfo = directoryInfo.Parent;
+                if (!searchParentFolders)
+                {
+                    break;
                 }
+                directoryInfo = directoryInfo.Parent;
             }
-            else
+
+            return null;
+        }
+
+
+        public static string ReadPlasticBranchInfo(string projectPath, bool searchParentFolders)
+        {
+            string branchName = null;
+            DirectoryInfo directoryInfo = new DirectoryInfo(projectPath);
+
+            while (directoryInfo != null)
             {
-                string dirName = Path.Combine(projectPath, ".git");
-                if (Directory.Exists(dirName))
+                string plasticSelectorPath = Path.Combine(directoryInfo.FullName, ".plastic", "plastic.selector");
+                if (File.Exists(plasticSelectorPath))
                 {
-                    string branchFile = Path.Combine(dirName, "HEAD");
-                    if (File.Exists(branchFile))
+                    branchName = ExtractPlasticBranch(plasticSelectorPath);
+                    if (!string.IsNullOrEmpty(branchName))
                     {
-                        // removes extra end of line
-                        results = string.Join(" ", File.ReadAllLines(branchFile));
-                        // get branch only
-                        int pos = results.LastIndexOf("/") + 1;
-                        results = results.Substring(pos, results.Length - pos);
-
+                        return branchName;
                     }
                 }
+
+                if (!searchParentFolders)
+                {
+                    break;
+                }
+
+                directoryInfo = directoryInfo.Parent;
             }
-            return results;
+
+            return branchName;
         }
 
-        public static string ReadPlasticBranchInfo(string projectPath)
+        private static string ExtractPlasticBranch(string plasticSelectorPath)
         {
-            string branchName = null;
-            string plasticSelectorPath = Path.Combine(projectPath, ".plastic", "plastic.selector");
-
-            if (File.Exists(plasticSelectorPath))
+            string[] lines = File.ReadAllLines(plasticSelectorPath);
+            foreach (string line in lines)
             {
-                string[] lines = File.ReadAllLines(plasticSelectorPath);
-                foreach (string line in lines)
+                string trimmedLine = line.Trim();
+                if (trimmedLine.StartsWith("br ") || trimmedLine.StartsWith("smartbranch "))
                 {
-                    string trimmedLine = line.Trim();
-                    if (trimmedLine.StartsWith("br ") || trimmedLine.StartsWith("smartbranch "))
+                    // Extract the first quoted string
+                    var match = Regex.Match(trimmedLine, "\"([^\"]+)\"");
+                    if (match.Success)
                     {
-                        // Extract the branch name between quotes
-                        var match = Regex.Match(trimmedLine, "\"([^\"]+)\"");
-                        if (match.Success)
+                        string branchName = match.Groups[1].Value;
+                        // Remove leading slash if present (e.g., "/main" becomes "main")
+                        if (branchName.StartsWith("/"))
                         {
-                            branchName = match.Groups[1].Value;
-                            // Remove the leading slash if present
-                            if (branchName.StartsWith("/"))
-                            {
-                                branchName = branchName.Substring(1);
-                            }
-                            break;
+                            branchName = branchName.Substring(1);
                         }
+                        return branchName;
                     }
                 }
             }
-            return branchName;
+            return null;
         }
 
+
         //public static Platform GetTargetPlatform(string projectPath)
         static string GetTargetPlatformRaw(string projectPath)
         {