fixing plastic branch parsing #185

Author: unitycoder

UnityLauncherPro/GetProjects.cs

@@ -120,7 +120,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
             return projectsFound;
         } // Scan()
 
-        static Project GetProjectInfo(string projectPath, bool getGitBranch = false, bool getPlasticBranch = false, bool getArguments = false, bool showMissingFolders = false, bool showTargetPlatform = false, bool searchGitbranchRecursivly = false, bool showSRP = false)
+        static Project GetProjectInfo(string projectPath, bool getGitBranch = false, bool getPlasticBranch = false, bool getArguments = false, bool showMissingFolders = false, bool showTargetPlatform = false, bool searchGitbranchRecursively = false, bool showSRP = false)
         {
             bool folderExists = Directory.Exists(projectPath);
 
@@ -165,7 +165,8 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo
             string gitBranch = "";
             if (getGitBranch == true)
             {
-                gitBranch = folderExists ? Tools.ReadGitBranchInfo(projectPath, searchGitbranchRecursivly) : null;
+                gitBranch = folderExists ? Tools.ReadGitBranchInfo(projectPath, searchGitbranchRecursively) : null;
+                
                 // check for plastic, if enabled
                 if (getPlasticBranch == true && gitBranch == null)
                 {

UnityLauncherPro/Tools.cs

@@ -1424,12 +1424,9 @@ public static string ReadGitBranchInfo(string projectPath, bool searchParentFold
             {
                 string dirName = Path.Combine(projectPath, ".git");
                 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));
@@ -1438,30 +1435,40 @@ public static string ReadGitBranchInfo(string projectPath, bool searchParentFold
                         results = results.Substring(pos, results.Length - pos);
 
                     }
-
                 }
             }
             return results;
         }
 
         public static string ReadPlasticBranchInfo(string projectPath)
         {
-            string results = null;
-            string dirName = Path.Combine(projectPath, ".plastic");
-            if (Directory.Exists(dirName))
+            string branchName = null;
+            string plasticSelectorPath = Path.Combine(projectPath, ".plastic", "plastic.selector");
+
+            if (File.Exists(plasticSelectorPath))
             {
-                string branchFile = Path.Combine(dirName, "plastic.selector");
-                if (File.Exists(branchFile))
+                string[] lines = File.ReadAllLines(plasticSelectorPath);
+                foreach (string line in lines)
                 {
-                    // removes extra end of line
-                    results = string.Join(" ", File.ReadAllText(branchFile));
-                    // get branch only
-                    int pos = results.LastIndexOf("\"/") + 1;
-                    // -1 to remove last "
-                    results = results.Substring(pos, results.Length - pos - 1);
+                    string trimmedLine = line.Trim();
+                    if (trimmedLine.StartsWith("br ") || trimmedLine.StartsWith("smartbranch "))
+                    {
+                        // Extract the branch name between quotes
+                        var match = Regex.Match(trimmedLine, "\"([^\"]+)\"");
+                        if (match.Success)
+                        {
+                            branchName = match.Groups[1].Value;
+                            // Remove the leading slash if present
+                            if (branchName.StartsWith("/"))
+                            {
+                                branchName = branchName.Substring(1);
+                            }
+                            break;
+                        }
+                    }
                 }
             }
-            return results;
+            return branchName;
         }
 
         //public static Platform GetTargetPlatform(string projectPath)