[CHANGED] the DCCOptionNames list to public and adjusted the test case to reflect that

[ADDED] clear() and set() functions for the DCCOptionNames list

Author: AJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -226,9 +226,12 @@ private static string TryFindDCC(string dccPath, string ext, ExportSettings.DCCT
     public class ExportSettings : ScriptableSingleton<ExportSettings>
     {
         public const string kDefaultSavePath = ".";
-        private static List<string> s_PreferenceList = new List<string>() {"maya", "mayalt", "3ds", "blender" };
-        public static string s_MaxName = "3ds Max ";
-        public static string s_MayaName = "Maya ";
+        private static List<string> s_PreferenceList = new List<string>() {kMayaOptionName, kMayaLtOptionName, kMaxOptionName, kBlenderOptionName };
+        //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 kBlenderOptionName = "Blender ";
 
         /// <summary>
         /// The path where all the different versions of Maya are installed
@@ -268,10 +271,10 @@ public static string kDefaultAdskRoot {
 
         // List of names in order that they appear in option list
         [SerializeField]
-        public List<string> dccOptionNames;
+        private List<string> dccOptionNames = new List<string>();
         // List of paths in order that they appear in the option list
         [SerializeField]
-        public List<string> dccOptionPaths;
+        private List<string> dccOptionPaths;
 
         protected override void LoadDefaults()
         {
@@ -287,7 +290,12 @@ protected override void LoadDefaults()
         /// </summary>
         /// <returns>The unique name.</returns>
         /// <param name="name">Name.</param>
-        public static string GetUniqueName(string name){
+        public static string GetUniqueDCCOptionName(string name){
+            Debug.Assert(instance != null);
+            if (name == null)
+            {
+                return null;
+            }
             if (!instance.dccOptionNames.Contains(name)) {
                 return name;
             }
@@ -314,6 +322,16 @@ public static string GetUniqueName(string name){
             return uniqueName;
         }
 
+        public void SetDCCOptionNames(List<string> newList)
+        {
+            dccOptionNames = newList;
+        }
+
+        public void ClearDCCOptionNames()
+        {
+            dccOptionNames.Clear();
+        }
+
         /// <summary>
         ///
         /// Find the latest program available and make that the default choice.
@@ -335,6 +353,10 @@ public int GetPreferredDCCApp()
             for (int i = 0; i < dccOptionNames.Count; i++)
             {
                 int versionToCheck = FindDCCVersion(dccOptionNames[i]);
+                if (versionToCheck == -1)
+                {
+                    continue;
+                }
                 if (versionToCheck > newestDCCVersionNumber)
                 {
                     newestDCCVersionIndex = i;
@@ -362,16 +384,23 @@ public int GetPreferredDCCApp()
         /// <returns></returns>
         private int ChoosePreferredDCCApp(int optionA, int optionB)
         {
-            int scoreA = s_PreferenceList.IndexOf(GetAppNameFromFolderName(dccOptionNames[optionA]));
-            int scoreB = s_PreferenceList.IndexOf(GetAppNameFromFolderName(dccOptionNames[optionB]));
+            Debug.Assert(optionA >= 0 && optionB >= 0 && optionA < dccOptionNames.Count && optionB < dccOptionNames.Count);
+            if (dccOptionNames.Count == 0)
+            {
+                return -1;
+            }
+            var appA = dccOptionNames[optionA];
+            var appB = dccOptionNames[optionB];
+            if (appA == null || appB == null || appA.Length <= 0 || appB.Length <= 0)
+            {
+                return -1;
+            }
 
-            return scoreA < scoreB ? optionA : optionB;
-        }
+            //We assume that the option names have a 
+            int scoreA = s_PreferenceList.IndexOf(appA.Split(' ')[0]);
+            int scoreB = s_PreferenceList.IndexOf(appB.Split(' ')[0]);
 
-        ///
-        private string GetAppNameFromFolderName(string originalString)
-        {
-            return originalString.ToLower().Split(' ')[0];
+            return scoreA < scoreB ? optionA : optionB;
         }
 
         /// <summary>
@@ -448,7 +477,7 @@ private static void FindDCCInstalls() {
                     }
                     string version = product.Substring ("maya".Length);
                     dccOptionPath.Add (GetMayaExePath (productDir.FullName.Replace ("\\", "/")));
-                    dccOptionName.Add (GetUniqueName (s_MayaName + version));
+                    dccOptionName.Add (GetUniqueDCCOptionName(kMayaOptionName + version));
                 }
 
                 if (product.StartsWith ("3ds max", StringComparison.InvariantCultureIgnoreCase)) {
@@ -458,7 +487,7 @@ private static void FindDCCInstalls() {
                     }
                     string version = product.Substring ("3ds max ".Length);
                     dccOptionPath.Add (exePath);
-                    dccOptionName.Add (GetUniqueName (s_MaxName + version));
+                    dccOptionName.Add (GetUniqueDCCOptionName(kMaxOptionName + version));
                 }
             }
             instance.selectedDCCApp = instance.GetPreferredDCCApp();
@@ -565,7 +594,7 @@ public static void AddDCCOption(string newOption, DCCType dcc){
                     Debug.LogError (string.Format("Unity Integration does not support Maya LT: \"{0}\"", newOption));
                     return;
                 }
-                optionName = GetUniqueName ("Maya " + version);
+                optionName = GetUniqueDCCOptionName("Maya " + version);
                 break;
             case DCCType.Max:
                 optionName = GetMaxOptionName (newOption);
@@ -608,7 +637,7 @@ static string AskMayaVersion(string exePath) {
         /// <returns>The 3DsMax dropdown option label.</returns>
         /// <param name="exePath">Exe path.</param>
         public static string GetMaxOptionName(string exePath){
-            return GetUniqueName (Path.GetFileName(Path.GetDirectoryName (exePath)));
+            return GetUniqueDCCOptionName(Path.GetFileName(Path.GetDirectoryName (exePath)));
         }
 
         public static bool IsEarlierThanMax2017(string AppName){

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -183,34 +183,38 @@ public void TestGetSetFields()
         public void TestFindPreferredProgram()
         {
             //Add a number of fake programs to the list, including some garbage ones
-            ExportSettings.instance.dccOptionNames = new List<string>();
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MaxName + "2000"));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "2016"));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "2017"));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MaxName + "2017"));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName("Blender " + "2.67"));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(""));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(null));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "lt"));
-            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "2017"));
+            List<string> testList = new List<string>();
+            testList.Add(null);
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMaxOptionName + "2000"));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMayaOptionName + "2016"));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMayaOptionName + "2017"));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMaxOptionName + "2017"));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kBlenderOptionName + "2.67"));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(""));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(null));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMayaLtOptionName));
+            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMayaOptionName + "2017"));
+
+            ExportSettings.instance.SetDCCOptionNames(testList);
 
             int preferred = ExportSettings.instance.GetPreferredDCCApp();
             //While Maya 2017 and 3ds Max 2017 are tied for most recent, Maya 2017 should win because we prefer Maya.
-            Assert.AreEqual(preferred, 2);
+            Assert.AreEqual(preferred, 9);
 
-            ExportSettings.instance.dccOptionNames = new List<string> { "Blender 2.67", "Blender 3.0" };
+            List<string> blenderList = new List<string> { "Blender 2.67", "Blender 3.0" };
+            ExportSettings.instance.SetDCCOptionNames(blenderList);
 
             preferred = ExportSettings.instance.GetPreferredDCCApp();
             //The function should be able to deal with floats well enough to give us a preferred version of soemthing like blender, which does not use the year.
             Assert.AreEqual(preferred, 1);
 
-            ExportSettings.instance.dccOptionNames.Clear();
+            ExportSettings.instance.ClearDCCOptionNames();
             //Try running it with an empty list
             preferred = ExportSettings.instance.GetPreferredDCCApp();
 
             Assert.AreEqual(preferred, -1);
 
-            ExportSettings.instance.dccOptionNames = null;
+            ExportSettings.instance.SetDCCOptionNames(null);
             //Try running it with a null list
             preferred = ExportSettings.instance.GetPreferredDCCApp();