Merge pull request #387 from Unity-Technologies/UT-111-update-DLL-to-source-code

Ut 111 update dll to source code

Author: benoithudson

Assets/com.unity.formats.fbx/Editor/Scripts/FbxExportSettings.cs

@@ -124,9 +124,8 @@ public override void OnInspectorGUI() {
 
             var repairMissingScripts = new GUIContent (
                                        "Run Component Updater",
-                                        "If the forum package 1.1.0b1 was previously installed, then links to the FbxPrefab component " +
-                                        "in assets created with the FBX exporter will need updating.\n" +
-                                        "Run this button to update all FbxPrefab references in text serialized prefabs and scene files.");
+                                        "If FBX exporter version 1.3.0f1 or earlier was previously installed, then links to the FbxPrefab component will need updating.\n" +
+                                        "Run this to update all FbxPrefab references in text serialized prefabs and scene files.");
 
             if (GUILayout.Button (repairMissingScripts)) {
                 var componentUpdater = new FbxExporters.Editor.RepairMissingScripts ();

Assets/com.unity.formats.fbx/Editor/Scripts/FbxExporterRepairMissingScripts.cs

@@ -9,31 +9,25 @@ namespace FbxExporters.Editor
     public class RepairMissingScripts
     {
         private const string m_forumPackageGUID = "2d81c55c4d9d85146b1d2de96e084b63";
-        private const string m_currentPackageGUID = "628ffbda3fdf4df4588770785d91a698";
+        private const string m_assetStorePackageGUID = "628ffbda3fdf4df4588770785d91a698";
 
         private const string m_fbxPrefabDLLFileId = "69888640";
 
         private const string m_idFormat = "{{fileID: {0}, guid: {1}, type:";
 
-        private static string m_forumPackageSearchID;
-
-        private static string ForumPackageSearchID {
-            get {
-                if (string.IsNullOrEmpty (m_forumPackageSearchID)) {
-                    m_forumPackageSearchID = string.Format (m_idFormat, m_fbxPrefabDLLFileId, m_forumPackageGUID);
-                }
-                return m_forumPackageSearchID;
-            }
-        }
-
-        private static string m_currentPackageSearchID;
-
-        private static string CurrentPackageSearchID {
-            get {
-                if (string.IsNullOrEmpty (m_currentPackageSearchID)) {
-                    m_currentPackageSearchID = string.Format (m_idFormat, m_fbxPrefabDLLFileId, m_currentPackageGUID);
+        private static List<string> m_searchIDsToReplace;
+        private static List<string> SearchIDsToReplace
+        {
+            get
+            {
+                if (m_searchIDsToReplace == null || m_searchIDsToReplace.Count <= 0)
+                {
+                    m_searchIDsToReplace = new List<string>() {
+                        string.Format(m_idFormat, m_fbxPrefabDLLFileId, m_forumPackageGUID),
+                        string.Format(m_idFormat, m_fbxPrefabDLLFileId, m_assetStorePackageGUID)
+                    };
                 }
-                return m_currentPackageSearchID;
+                return m_searchIDsToReplace;
             }
         }
 
@@ -47,6 +41,19 @@ private string[] AssetsToRepair{
             }
         }
 
+        public static string GetSourceCodeSearchID()
+        {
+            var fbxPrefabObj = AssetDatabase.LoadMainAssetAtPath(FbxExporters.FbxPrefabAutoUpdater.FindFbxPrefabAssetPath());
+            string searchID = null;
+            string guid;
+            long fileId;
+            if(AssetDatabase.TryGetGUIDAndLocalFileIdentifier(fbxPrefabObj, out guid, out fileId))
+            {
+                searchID = string.Format(m_idFormat, fileId, guid);
+            }
+            return searchID;
+        }
+
         public int GetAssetsToRepairCount(){
             return AssetsToRepair.Length;
         }
@@ -91,7 +98,8 @@ private static bool AssetNeedsRepair(string filePath)
                     }
 
                     var contents = sr.ReadToEnd();
-                    if(contents.Contains(ForumPackageSearchID)){
+                    if (SearchIDsToReplace.Exists(searchId => contents.Contains(searchId)))
+                    {
                         sr.Close();
                         return true;
                     }
@@ -105,17 +113,32 @@ private static bool AssetNeedsRepair(string filePath)
 
         public bool ReplaceGUIDInTextAssets ()
         {
+            string sourceCodeSearchID = GetSourceCodeSearchID();
+            if(string.IsNullOrEmpty(sourceCodeSearchID))
+            {
+                return false;
+            }
             bool replacedGUID = false;
             foreach (string file in AssetsToRepair) {
-                replacedGUID |= ReplaceGUIDInFile (file);
+                replacedGUID |= ReplaceGUIDInFile (file, sourceCodeSearchID);
             }
             if (replacedGUID) {
                 AssetDatabase.Refresh ();
             }
             return replacedGUID;
         }
 
-        private static bool ReplaceGUIDInFile (string path)
+        private static bool ReplaceID(string searchId, string replacementId, ref string line)
+        {
+            if (line.Contains(searchId))
+            {
+                line = line.Replace(searchId, replacementId);
+                return true;
+            }
+            return false;
+        }
+
+        private static bool ReplaceGUIDInFile (string path, string replacementSearchID)
         {
             // try to read file, assume it's a text file for now
             bool modified = false;
@@ -144,11 +167,9 @@ private static bool ReplaceGUIDInFile (string path)
 
                         while (sr.Peek () > -1) {
                             var line = sr.ReadLine ();
-
-                            if (line.Contains (ForumPackageSearchID)) {
-                                line = line.Replace (ForumPackageSearchID, CurrentPackageSearchID);
-                                modified = true;
-                            }
+                            SearchIDsToReplace.ForEach(searchId =>
+                                modified |= ReplaceID(searchId, replacementSearchID, ref line)
+                            );
 
                             sw.WriteLine (line);
                         }