[ADDED] unit test for this function

[CHANGED] the name of this function
[ADDED] function to deal with ties for best default program
[CHANGED] the function to be more modular overall

Author: AJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -98,7 +98,7 @@ public override void OnInspectorGUI() {
             var options = ExportSettings.GetDCCOptions();
             // make sure we never initially have browse selected
             if (exportSettings.selectedDCCApp == options.Length - 1) {
-                exportSettings.selectedDCCApp = exportSettings.FindMostRecentProgram();
+                exportSettings.selectedDCCApp = exportSettings.FindPreferredProgram();
             }
 
             int oldValue = exportSettings.selectedDCCApp;
@@ -226,6 +226,7 @@ private static string TryFindDCC(string dccPath, string ext, ExportSettings.DCCT
     public class ExportSettings : ScriptableSingleton<ExportSettings>
     {
         public const string kDefaultSavePath = ".";
+        private static List<string> preferenceList = new List<string>() {"maya", "mayalt", "3ds", "blender" };
 
         /// <summary>
         /// The path where all the different versions of Maya are installed
@@ -265,10 +266,10 @@ public static string kDefaultAdskRoot {
 
         // List of names in order that they appear in option list
         [SerializeField]
-        private List<string> dccOptionNames;
+        public List<string> dccOptionNames;
         // List of paths in order that they appear in the option list
         [SerializeField]
-        private List<string> dccOptionPaths;
+        public List<string> dccOptionPaths;
 
         protected override void LoadDefaults()
         {
@@ -316,84 +317,87 @@ private static string GetUniqueName(string name){
         /// Find the latest program available and make that the default choice.
         /// Will always take any Maya version over any 3ds Max version.
         ///
-        /// Returns the position of the most recent program in the list of dccOptionPaths
+        /// Returns the index of the most recent program in the list of dccOptionPaths
         ///
         /// </summary>
-        public int FindMostRecentProgram()
+        public int FindPreferredProgram()
         {
-            int newestMayaVersion = -1;
-            int savedMayaVersionNumber = 0;
-            int newestMaxVersion = -1;
-            int savedMaxVersionNumber = 0;
 
-            for (int i = 0; i < instance.dccOptionPaths.Count; i++)
+            int newestDCCVersionIndex = 0;
+            int newestDCCVersionNumber = 0;
+            
+            for (int i = 0; i < dccOptionPaths.Count; i++)
             {
-                if (instance.dccOptionPaths[i].ToLower().Contains("maya"))
+                int versionToCheck = FindDCCVersion(dccOptionNames[i]);
+                if (versionToCheck > newestDCCVersionNumber)
                 {
-                    if (newestMayaVersion == -1)
-                    {
-                        newestMayaVersion = 0;
-                        savedMayaVersionNumber = FindDCCVersion(dccOptionNames[i]);
-                        continue;
-                    }
-
-                    //Check if the path we are considering is newer than the previously saved one
-                    int versionToCheck = FindDCCVersion(dccOptionNames[i]);
-                        if (versionToCheck > savedMayaVersionNumber)
-                        {
-                            newestMayaVersion = i;
-                            savedMayaVersionNumber = versionToCheck;
-                        }                   
+                    newestDCCVersionIndex = i;
+                    newestDCCVersionNumber = versionToCheck;
                 }
-                else if (newestMayaVersion == -1 && instance.dccOptionPaths[i].ToLower().Contains("max"))
+                else if (versionToCheck == newestDCCVersionNumber)
                 {
-                    if (newestMaxVersion == -1)
+                    string selection = PickPrefferedName(dccOptionNames[newestDCCVersionIndex], dccOptionNames[i]);
+                    if (selection == dccOptionNames[i])
                     {
-                        newestMaxVersion = 0;
-                        savedMaxVersionNumber = FindDCCVersion(dccOptionNames[newestMaxVersion]);
-                        continue;
+                        newestDCCVersionIndex = i;
+                        newestDCCVersionNumber = FindDCCVersion(dccOptionNames[i]);
                     }
-
-                    //Check if the path we are considering is newer than the previously saved one
-                    int versionToCheck = FindDCCVersion(dccOptionNames[i]);
-                    if (versionToCheck > savedMaxVersionNumber)
-                    {
-                        newestMaxVersion = i;
-                        savedMaxVersionNumber = versionToCheck;
-                    }
-
                 }
-
             }
+            Debug.Assert(newestDCCVersionIndex > -1 && newestDCCVersionIndex < dccOptionPaths.Count);
+            return newestDCCVersionIndex;
+        }
+        /// <summary>
+        /// Gives our preffered program name from two options. ACCEPTS ENTRIES FROM DCCOptionNames LIST
+        /// </summary>
+        /// <param name="optionA"></param>
+        /// <param name="optionB"></param>
+        /// <returns></returns>
+        private string PickPrefferedName(string optionA, string optionB)
+        {
+            string[] optionArray = new string[2];
+            optionArray[0] = optionA.ToLower().Split(' ')[0];
+            optionArray[1] = optionB.ToLower().Split(' ')[0];
+            int[] optionScores = new int[2];
 
-            //We prefer to use the latest Maya version, if one exists
-            if (newestMayaVersion != -1)
+            for (int i = 0; i < 2; i++)
             {
-                return newestMayaVersion;
-            }
-            else if (newestMaxVersion != -1)
-            {
-                return newestMaxVersion;
+                for (int j = 0; j < preferenceList.Count; j++)
+                {
+                    if (optionArray[i] == preferenceList[j])
+                    {
+                        optionScores[i] = j;
+                    }
+                }
             }
 
-            return 0;
+            return optionScores[0] < optionScores[1] ? optionA : optionB;
         }
 
         /// <summary>
-        /// Finds the 3ds Max version based off of the title of the application
+        /// Finds the version based off of the title of the application
         /// </summary>
         /// <param name="path"></param>
         /// <returns> the year/version  OR -1 if the year could not be parsed </returns>
         private static int FindDCCVersion(string AppName)
         {
             int version;
+            string[] piecesArray = AppName.Split(' ');
+            //Get the number, which is always the last chunk separated by a space.
+            string number = piecesArray[piecesArray.Length - 1];
 
-            if (int.TryParse(AppName, out version))
+            if (int.TryParse(number, out version))
             {
                 return version;
             }
             else
             {
+                float fVersion;
+                //In case we are looking at a Blender 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 -1;
             }
         }
@@ -448,7 +452,7 @@ private static void FindDCCInstalls() {
                     dccOptionName.Add (GetUniqueName ("3ds Max " + version));
                 }
             }
-            instance.selectedDCCApp = instance.FindMostRecentProgram();
+            instance.selectedDCCApp = instance.FindPreferredProgram();
         }
 
         /// <summary>
@@ -495,7 +499,7 @@ public static GUIContent[] GetDCCOptions(){
                 var dccPath = instance.dccOptionPaths [i];
                 if (!File.Exists (dccPath)) {
                     if (i == instance.selectedDCCApp) {
-                        instance.selectedDCCApp = instance.FindMostRecentProgram();
+                        instance.selectedDCCApp = instance.FindPreferredProgram();
                     }
                     namesToDelete.Add (instance.dccOptionNames [i]);
                     pathsToDelete.Add (dccPath);

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -178,5 +178,25 @@ public void TestGetSetFields()
             var platformPath = Path.Combine("a", Path.Combine("b", "c"));
             Assert.AreEqual(Path.Combine(appDataPath, platformPath), ExportSettings.GetAbsoluteSavePath());
         }
+
+        [Test]
+        public void TestFindPreferredProgram()
+        {           
+            //Putting Maya 2017 and Max 2017 will also test our PickPreferredName function
+            ExportSettings.instance.dccOptionNames = new List<string> { "3ds Max 2000", "Maya 2016", "Maya 2017", "3ds max 2017" };
+            ExportSettings.instance.dccOptionPaths = new List<string> { "3ds Max 2000 path", "maya 2016 path", "maya 2017 path", "3ds max 2017 path"};
+
+            int preferred = ExportSettings.instance.FindPreferredProgram();
+            //While Maya 2017 and 3ds Max 2017 are tied for most recent, Maya 2017 should win because we prefer Maya.
+            Assert.AreEqual(preferred, 2);
+
+            ExportSettings.instance.dccOptionNames = new List<string> { "Blender 2.67", "Blender 3.0" };
+            ExportSettings.instance.dccOptionPaths = new List<string> { "Blender 2.67 path", "Blender 3.0 path" };
+
+            preferred = ExportSettings.instance.FindPreferredProgram();
+            //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);
+        }
+
     }
 }