Merge pull request #260 from Unity-Technologies/Uni-33810_handle_MayaLT_in_preferred3DApp

Uni-33810 Handle MayaLT in GetPreferredDCCApp()

Author: inwoods

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -281,7 +281,7 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
         //Any additional names require a space after the name
         public const string kMaxOptionName = "3ds Max ";
         public const string kMayaOptionName = "Maya ";
-        public const string kMayaLtOptionName = "MayaLT ";
+        public const string kMayaLtOptionName = "Maya LT";
 
         private static string DefaultIntegrationSavePath {
             get{
@@ -590,13 +590,22 @@ private int ChoosePreferredDCCApp(int optionA, int optionB)
                 return -1;
             }
 
-            //We assume that the option names have a 
-            int scoreA = s_PreferenceList.IndexOf(appA.Split(' ')[0]);
-            int scoreB = s_PreferenceList.IndexOf(appB.Split(' ')[0]);
+            int scoreA = s_PreferenceList.FindIndex(app => RemoveSpacesAndNumbers(app).Equals(RemoveSpacesAndNumbers(appA)));
+
+            int scoreB = s_PreferenceList.FindIndex(app => RemoveSpacesAndNumbers(app).Equals(RemoveSpacesAndNumbers(appB)));
 
             return scoreA < scoreB ? optionA : optionB;
         }
 
+        /// <summary>
+        /// Takes a given string and removes any spaces or numbers from it
+        /// </summary>
+        /// <param name="s"></param>
+        public static string RemoveSpacesAndNumbers(string s)
+        {
+            return System.Text.RegularExpressions.Regex.Replace(s, @"[\s^0-9]", "");
+        }
+
         /// <summary>
         /// Finds the version based off of the title of the application
         /// </summary>
@@ -627,11 +636,20 @@ private static int FindDCCVersion(string AppName)
             }
             else
             {
+                //remove any letters in the string in a final attempt to extract an int from it (this will happen with MayaLT, for example)
+                string AppNameCopy = AppName;
+                string stringWithoutLetters = System.Text.RegularExpressions.Regex.Replace(AppNameCopy, "[^0-9]", "");
+
+                if (int.TryParse(stringWithoutLetters, out version))
+                {
+                    return version;
+                }
+
                 float fVersion;
                 //In case we are looking at something with a decimal based version- the int parse will fail so we'll need to parse it as a float.
                 if (float.TryParse(number, out fVersion))
                 {
-                   return (int)fVersion;
+                    return (int)fVersion;
                 }
                 return -1;
             }

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -216,7 +216,31 @@ public void TestFindPreferredProgram ()
             //Try running it with a null list
             preferred = ExportSettings.instance.GetPreferredDCCApp ();
 
-            Assert.AreEqual (preferred, -1);
+            Assert.AreEqual(preferred, -1);
+
+            //Testing the results of only having a mayaLT install
+            ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMayaLtOptionName + "2018" }); //hardcoded because the constant is changed in another branch but not this one at this time
+            preferred = ExportSettings.instance.GetPreferredDCCApp();
+
+            Assert.AreEqual(preferred, 0);
+
+            //Testing the results of only having a maya install
+            ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMayaOptionName + "2018" });
+            preferred = ExportSettings.instance.GetPreferredDCCApp();
+
+            Assert.AreEqual(preferred, 0);
+
+            //Testing the results of only having a max install
+            ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMaxOptionName + "2018" });
+            preferred = ExportSettings.instance.GetPreferredDCCApp();
+
+            Assert.AreEqual(preferred, 0);
+
+            //Testing the preference priority
+            ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMaxOptionName + "2018", ExportSettings.kMayaOptionName + "2018", ExportSettings.kMayaLtOptionName + "2018" });
+            preferred = ExportSettings.instance.GetPreferredDCCApp();
+
+            Assert.AreEqual(preferred, 1);
         }
 
         [Test]