UNI-22052: fix path problems, I think.

I'm adding tests next because it's getting tricky to verify by eye.

Author: Benoit Hudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -121,17 +121,16 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
                         continue;
                     }
 
-                    // make filepath relative to project folder
-                    if (fbxFileName.StartsWith (Application.dataPath, System.StringComparison.CurrentCulture)) 
-                    {
-                        fbxFileName = "Assets" + fbxFileName.Substring (Application.dataPath.Length);
-                    }
+                    // make filepath relative to assets folder
+                    var relativePath = FbxExporters.EditorTools.ExportSettings.ConvertToAssetRelativePath(fbxFileName);
 
                     // refresh the assetdata base so that we can query for the model
                     AssetDatabase.Refresh ();
 
-                    // replace w Model asset
-                    Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath (fbxFileName);
+                    // Replace w Model asset. LoadMainAssetAtPath wants a path
+                    // relative to the project, not relative to the assets
+                    // folder.
+                    Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath(Path.Combine("Assets", relativePath));
 
                     if (unityMainAsset != null) {
                         Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -60,7 +60,7 @@ public override void OnInspectorGUI() {
 
                 // Unless the user canceled, make sure they chose something in the Assets folder.
                 if (!string.IsNullOrEmpty (fullPath)) {
-                    var relativePath = GetRelativePath(Application.dataPath, fullPath);
+                    var relativePath = ExportSettings.ConvertToAssetRelativePath(fullPath);
                     if (string.IsNullOrEmpty(relativePath)
                             || relativePath == ".."
                             || relativePath.StartsWith(".." + Path.DirectorySeparatorChar)) {
@@ -81,39 +81,6 @@ public override void OnInspectorGUI() {
             }
         }
 
-        private string GetRelativePath(string fromDir, string toDir) {
-            // https://stackoverflow.com/questions/275689/how-to-get-relative-path-from-absolute-path
-            // With fixes to handle that fromDir and toDir are both directories (not files).
-            if (String.IsNullOrEmpty(fromDir)) throw new ArgumentNullException("fromDir");
-            if (String.IsNullOrEmpty(toDir))   throw new ArgumentNullException("toDir");
-
-            // MakeRelativeUri assumes the path is a file unless it ends with a
-            // path separator, so add one. Having multiple in a row is no problem.
-            fromDir += Path.DirectorySeparatorChar;
-            toDir += Path.DirectorySeparatorChar;
-
-            // Workaround for https://bugzilla.xamarin.com/show_bug.cgi?id=5921
-            fromDir += Path.DirectorySeparatorChar;
-
-            Uri fromUri = new Uri(fromDir);
-            Uri toUri = new Uri(toDir);
-
-            if (fromUri.Scheme != toUri.Scheme) { return null; } // path can't be made relative.
-
-            Uri relativeUri = fromUri.MakeRelativeUri(toUri);
-            String relativePath = Uri.UnescapeDataString(relativeUri.ToString());
-
-            if (string.IsNullOrEmpty(relativePath)) {
-                // The relative path is empty if it's the same directory.
-                relativePath = "./";
-            }
-
-            if (toUri.Scheme.Equals("file", StringComparison.InvariantCultureIgnoreCase)) {
-                relativePath = relativePath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-            }
-
-            return relativePath;
-        }
     }
 
     [FilePath("ProjectSettings/FbxExportSettings.asset",FilePathAttribute.Location.ProjectFolder)]
@@ -148,19 +115,7 @@ public static string GetRelativeSavePath() {
             if (string.IsNullOrEmpty(relativePath)) {
                 relativePath = kDefaultSavePath;
             }
-
-            // Normalize to the platform path separator.
-            relativePath = relativePath.Replace(Path.AltDirectorySeparatorChar,
-                    Path.DirectorySeparatorChar);
-
-            // Trim off trailing slashes. If all we had was slashes, we're at
-            // the root of the Application.dataPath so return "."
-            relativePath = relativePath.TrimEnd(Path.DirectorySeparatorChar);
-            if (string.IsNullOrEmpty(relativePath)) {
-                relativePath = ".";
-            }
-
-            return relativePath;
+            return NormalizeRelativePath(relativePath);
         }
 
         /// <summary>
@@ -183,6 +138,66 @@ public static void SetRelativeSavePath(string newPath) {
                 .TrimEnd(Path.DirectorySeparatorChar);
         }
 
+        /// <summary>
+        /// Convert an absolute path into a relative path like what you would
+        /// get from GetRelativeSavePath.
+        ///
+        /// Returns an empty string if the path is invalid.
+        /// The path uses platform path separators, and no trailing or leading
+        /// slashes.
+        /// </summary>
+        public static string ConvertToAssetRelativePath(string fullPathInAssets)
+        {
+            return GetRelativePath(Application.dataPath, fullPathInAssets);
+        }
+
+        private static string GetRelativePath(string fromDir, string toDir) {
+            // https://stackoverflow.com/questions/275689/how-to-get-relative-path-from-absolute-path
+            // With fixes to handle that fromDir and toDir are both directories (not files).
+            if (String.IsNullOrEmpty(fromDir)) throw new ArgumentNullException("fromDir");
+            if (String.IsNullOrEmpty(toDir))   throw new ArgumentNullException("toDir");
+
+            // MakeRelativeUri assumes the path is a file unless it ends with a
+            // path separator, so add one. Having multiple in a row is no problem.
+            fromDir += Path.DirectorySeparatorChar;
+            toDir += Path.DirectorySeparatorChar;
+
+            // Workaround for https://bugzilla.xamarin.com/show_bug.cgi?id=5921
+            fromDir += Path.DirectorySeparatorChar;
+
+            Uri fromUri = new Uri(fromDir);
+            Uri toUri = new Uri(toDir);
+
+            if (fromUri.Scheme != toUri.Scheme) { return null; } // path can't be made relative.
+
+            Uri relativeUri = fromUri.MakeRelativeUri(toUri);
+            String relativePath = Uri.UnescapeDataString(relativeUri.ToString());
+
+            if (string.IsNullOrEmpty(relativePath)) {
+                // The relative path is empty if it's the same directory.
+                relativePath = ".";
+            }
+
+            return NormalizeRelativePath(relativePath);
+        }
+
+        private static string NormalizeRelativePath(string relativePath)
+        {
+            // Normalize to the platform path separator.
+            relativePath = relativePath.Replace(
+                    Path.AltDirectorySeparatorChar,
+                    Path.DirectorySeparatorChar);
+
+            // Trim off leading and trailing slashes. If all we had was
+            // slashes, we're at the root of the Application.dataPath so return
+            // "."
+            relativePath = relativePath.Trim(Path.DirectorySeparatorChar);
+            if (string.IsNullOrEmpty(relativePath)) {
+                relativePath = ".";
+            }
+            return relativePath;
+        }
+
         [MenuItem("Edit/Project Settings/Fbx Export", priority = 300)]
         static void ShowManager()
         {