Fixed string extensions (backslahses and forward slashes were inverte…

…d) (#844) # XRTK - Mixed Reality Toolkit Pull Request ## Overview  Back slash and forward slash string extensions were inverted, needed to be fixed. ## Submodule Changes - XRTK/com.xrtk.lumin#112 - XRTK/com.xrtk.oculus#118 - XRTK/com.xrtk.sdk#240 - XRTK/com.xrtk.wmr#140
XRTK · May 19, 2021 · 75e6ab8 · 75e6ab8
1 parent 262fa99
commit 75e6ab8
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 41 deletions.
diff --git a/Editor/MixedRealityPreferences.cs b/Editor/MixedRealityPreferences.cs
@@ -112,7 +112,7 @@ public static string ProfileGenerationPath
             set
             {
                 var newPath = value;
-                var root = Path.GetFullPath(Application.dataPath).ToBackSlashes();
+                var root = Path.GetFullPath(Application.dataPath).ForwardSlashes();
 
                 if (!newPath.Contains(root))
                 {

diff --git a/Editor/PackageInstaller.cs b/Editor/PackageInstaller.cs
@@ -27,7 +27,7 @@ namespace XRTK.Editor
 {
     public static class PackageInstaller
     {
-        private static string ProjectRootPath => Directory.GetParent(Application.dataPath).FullName.ToForwardSlashes();
+        private static string ProjectRootPath => Directory.GetParent(Application.dataPath).FullName.BackSlashes();
 
         /// <summary>
         /// Attempt to copy any assets found in the source path into the project.
@@ -56,8 +56,8 @@ public static bool TryInstallAssets(Dictionary<string, string> installationPaths
 
             foreach (var installationPath in installationPaths)
             {
-                var sourcePath = installationPath.Key.ToForwardSlashes();
-                var destinationPath = installationPath.Value.ToForwardSlashes();
+                var sourcePath = installationPath.Key.BackSlashes();
+                var destinationPath = installationPath.Value.BackSlashes();
                 installedDirectories.Add(destinationPath);
 
                 if (Directory.Exists(destinationPath))
@@ -70,7 +70,7 @@ public static bool TryInstallAssets(Dictionary<string, string> installationPaths
                     for (int i = 0; i < installedAssets.Count; i++)
                     {
                         EditorUtility.DisplayProgressBar("Verifying assets...", Path.GetFileNameWithoutExtension(installedAssets[i]), i / (float)installedAssets.Count);
-                        installedAssets[i] = installedAssets[i].Replace($"{ProjectRootPath}\\", string.Empty).ToForwardSlashes();
+                        installedAssets[i] = installedAssets[i].Replace($"{ProjectRootPath}\\", string.Empty).BackSlashes();
                     }
 
                     EditorUtility.ClearProgressBar();
@@ -187,9 +187,9 @@ private static void AddConfigurations(List<string> profiles)
 
         private static string CopyAsset(this string rootPath, string sourceAssetPath, string destinationPath)
         {
-            sourceAssetPath = sourceAssetPath.ToForwardSlashes();
-            destinationPath = $"{destinationPath}{sourceAssetPath.Replace(Path.GetFullPath(rootPath), string.Empty)}".ToForwardSlashes();
-            destinationPath = Path.Combine(ProjectRootPath, destinationPath).ToForwardSlashes();
+            sourceAssetPath = sourceAssetPath.BackSlashes();
+            destinationPath = $"{destinationPath}{sourceAssetPath.Replace(Path.GetFullPath(rootPath), string.Empty)}".BackSlashes();
+            destinationPath = Path.Combine(ProjectRootPath, destinationPath).BackSlashes();
 
             if (!File.Exists(destinationPath))
             {

diff --git a/Editor/Utilities/GitUtilities.cs b/Editor/Utilities/GitUtilities.cs
@@ -59,7 +59,7 @@ public static string RepositoryRootDir
                 {
                     if (new Process().Run($@"cd ""{Application.dataPath}"" && git rev-parse --show-toplevel", out var rootDir))
                     {
-                        projectRootDir = rootDir.ToBackSlashes().Replace("\n", string.Empty);
+                        projectRootDir = rootDir.ForwardSlashes().Replace("\n", string.Empty);
                     }
                 }
 
@@ -99,7 +99,7 @@ public static void WritePathToGitIgnore(string ignoredPath)
             }
 
             var rootDir = RepositoryRootDir;
-            ignoredPath = ignoredPath.Replace($"{rootDir.ToBackSlashes()}/", string.Empty);
+            ignoredPath = ignoredPath.Replace($"{rootDir.ForwardSlashes()}/", string.Empty);
             var directory = ignoredPath.Replace(Path.GetFileName(ignoredPath), Path.GetFileNameWithoutExtension(ignoredPath));
             directory = directory.Substring(0, directory.LastIndexOf("/", StringComparison.Ordinal));
             var gitIgnoreFilePath = $"{rootDir}\\.gitignore";

diff --git a/Editor/Utilities/MixedRealityServiceWizard.cs b/Editor/Utilities/MixedRealityServiceWizard.cs
@@ -179,7 +179,7 @@ private void OnGUI()
                 outputPath = EditorUtility.OpenFolderPanel("Generation Location", outputPath, string.Empty);
                 var namespaceRoot = $"{Application.productName.Replace("-Core", string.Empty)}";
 
-                @namespace = outputPath.Replace($"{Directory.GetParent(Application.dataPath).FullName.ToBackSlashes()}/", string.Empty);
+                @namespace = outputPath.Replace($"{Directory.GetParent(Application.dataPath).FullName.ForwardSlashes()}/", string.Empty);
 
                 if (@namespace.StartsWith("Assets/"))
                 {

diff --git a/Editor/Utilities/SymbolicLinks/SymbolicLink.cs b/Editor/Utilities/SymbolicLinks/SymbolicLink.cs
@@ -23,28 +23,28 @@ public SymbolicLink(string sourceRelativePath, string targetRelativePath)
 
         public string SourceRelativePath
         {
-            get => sourceRelativePath.ToBackSlashes();
-            internal set => sourceRelativePath = value.ToBackSlashes();
+            get => sourceRelativePath.ForwardSlashes();
+            internal set => sourceRelativePath = value.ForwardSlashes();
         }
 
         public string SourceAbsolutePath
         {
-            get => $"{SymbolicLinker.ProjectRoot}{sourceRelativePath}".ToBackSlashes();
-            internal set => sourceRelativePath = value.ToBackSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
+            get => $"{SymbolicLinker.ProjectRoot}{sourceRelativePath}".ForwardSlashes();
+            internal set => sourceRelativePath = value.ForwardSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
         }
 
         [SerializeField]
         private string targetRelativePath;
 
         public string TargetRelativePath
         {
-            get => targetRelativePath.ToBackSlashes();
-            internal set => targetRelativePath = value.ToBackSlashes();
+            get => targetRelativePath.ForwardSlashes();
+            internal set => targetRelativePath = value.ForwardSlashes();
         }
         public string TargetAbsolutePath
         {
-            get => $"{SymbolicLinker.ProjectRoot}{targetRelativePath}".ToBackSlashes();
-            internal set => targetRelativePath = value.ToBackSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
+            get => $"{SymbolicLinker.ProjectRoot}{targetRelativePath}".ForwardSlashes();
+            internal set => targetRelativePath = value.ForwardSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
         }
 
         [SerializeField]

diff --git a/Editor/Utilities/SymbolicLinks/SymbolicLinker.cs b/Editor/Utilities/SymbolicLinks/SymbolicLinker.cs
@@ -297,7 +297,7 @@ private static void OnProjectWindowItemGui(string guid, Rect rect)
                 var path = AssetDatabase.GUIDToAssetPath(guid);
 
                 if (!string.IsNullOrEmpty(path) &&
-                    ValidateSymbolicPath(Path.GetFullPath(path).ToBackSlashes()))
+                    ValidateSymbolicPath(Path.GetFullPath(path).ForwardSlashes()))
                 {
                     GUI.Label(rect, LINK_ICON_TEXT, SymlinkMarkerStyle);
                 }

diff --git a/Editor/Utilities/SymbolicLinks/SymbolicLinkerWindow.cs b/Editor/Utilities/SymbolicLinks/SymbolicLinkerWindow.cs
@@ -52,11 +52,11 @@ private static void CreateSymbolicLink()
 
             if (string.IsNullOrEmpty(path) || !Directory.Exists(path))
             {
-                targetPath = $"{Application.dataPath}/ThirdParty".ToBackSlashes();
+                targetPath = $"{Application.dataPath}/ThirdParty".ForwardSlashes();
             }
             else
             {
-                targetPath = Path.GetFullPath(path).ToBackSlashes();
+                targetPath = Path.GetFullPath(path).ForwardSlashes();
             }
 
             window.titleContent = new GUIContent("Import Module");
@@ -79,7 +79,7 @@ private static bool DisableSymbolicLinkValidation()
                 return false;
             }
 
-            path = Path.GetFullPath(path).ToBackSlashes();
+            path = Path.GetFullPath(path).ForwardSlashes();
 
             if (SymbolicLinker.Settings == null) { return false; }
 
@@ -97,7 +97,7 @@ private static void DisableSymbolicLink()
 
             var path = AssetDatabase.GUIDToAssetPath(guids[0]);
 
-            path = Path.GetFullPath(path).ToBackSlashes();
+            path = Path.GetFullPath(path).ForwardSlashes();
             var symbolicLink = SymbolicLinker.Settings.SymbolicLinks.Find(link => link.TargetAbsolutePath == path);
 
             if (symbolicLink == null) { return; }
@@ -133,15 +133,15 @@ private void OnGUI()
 
             if (GUILayout.Button("Choose Source Path"))
             {
-                sourcePath = EditorUtility.OpenFolderPanel("Source Path", Application.dataPath, string.Empty).ToBackSlashes();
+                sourcePath = EditorUtility.OpenFolderPanel("Source Path", Application.dataPath, string.Empty).ForwardSlashes();
             }
 
             GUILayout.Space(10);
             GUILayout.TextField(targetPath, textFieldGUIStyle);
 
             if (GUILayout.Button("Choose Target Path"))
             {
-                targetPath = EditorUtility.OpenFolderPanel("Target Path", targetPath, string.Empty).ToBackSlashes();
+                targetPath = EditorUtility.OpenFolderPanel("Target Path", targetPath, string.Empty).ForwardSlashes();
             }
 
             GUILayout.Space(8);

diff --git a/Runtime/Extensions/StringExtensions.cs b/Runtime/Extensions/StringExtensions.cs
@@ -15,10 +15,6 @@ public static class StringExtensions
     {
         public const string WhiteSpace = " ";
 
-        public const string BackSlash = "\\";
-
-        public const string ForwardSlash = "/";
-
         /// <summary>
         /// Encodes the string to base 64 ASCII.
         /// </summary>
@@ -79,28 +75,24 @@ public static string ToProperCase(this string value)
         }
 
         /// <summary>
-        /// Replaces all forward slashes in the string with back slashes.
+        /// Replaces all back slashes in the string with forward slashes.
         /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static string ToBackSlashes(this string value) // TODO FIX -> ToForwardSlashes
+        public static string ForwardSlashes(this string value)
         {
-            return value.Replace(BackSlash, ForwardSlash);
+            return value.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
         }
 
         /// <summary>
-        /// Replaces all back slashes in the string with forward slashes.
+        /// Replaces all forward slashes in the string with back slashes.
         /// </summary>
-        /// <param name="value"></param>
-        public static string ToForwardSlashes(this string value) // TODO FIX -> ToBackSlashes
+        public static string BackSlashes(this string value)
         {
-            return value.Replace(ForwardSlash, BackSlash);
+            return value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
         }
 
         /// <summary>
         /// Returns the URI path, excluding the filename
         /// </summary>
-        /// <param name="value"></param>
         public static string PathFromURI(this string value)
         {
             return value.Substring(0, value.LastIndexOf("/", StringComparison.Ordinal) + 1);
@@ -109,7 +101,6 @@ public static string PathFromURI(this string value)
         /// <summary>
         /// Returns the filename from a URI path
         /// </summary>
-        /// <param name="value"></param>
         public static string FilenameFromURI(this string value)
         {
             return value.Substring(value.LastIndexOf("/", StringComparison.Ordinal) + 1, value.Length - value.LastIndexOf("/", StringComparison.Ordinal) - 1);