From be1df8e7050ff5872799f6bee7f8cb419d7a3f38 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Sep 2020 14:51:52 -0400
Subject: simplify path separator normalization

It no longer tries to clean up the path (e.g. "path/to///file/" => "path/to/file"), which means it can more intuitively handle cases like this:
     asset.AssetName.StartsWith(PathUtilities.NormalizePathSeparators("Characters/Dialogue/"))
---
 src/SMAPI.Toolkit/Utilities/PathUtilities.cs | 32 +++++++++++-----------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'src/SMAPI.Toolkit/Utilities')

diff --git a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
index 34940d4f..bd5fafbc 100644
--- a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
+++ b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
@@ -45,18 +45,10 @@ namespace StardewModdingAPI.Toolkit.Utilities
         [Pure]
         public static string NormalizePathSeparators(string path)
         {
-            string normalized = string.Join(PathUtilities.PreferredPathSeparator, PathUtilities.GetSegments(path));
-
-            // keep root
-#if SMAPI_FOR_WINDOWS
-            if (path.StartsWith(PathUtilities.WindowsUncRoot))
-                normalized = PathUtilities.WindowsUncRoot + normalized;
-            else
-#endif
-            if (path.StartsWith(PathUtilities.PreferredPathSeparator) || path.StartsWith(PathUtilities.WindowsUncRoot))
-                normalized = PathUtilities.PreferredPathSeparator + normalized;
+            if (string.IsNullOrWhiteSpace(path))
+                return path;
 
-            return normalized;
+            return string.Join(PathUtilities.PreferredPathSeparator, path.Split(PathUtilities.PossiblePathSeparators));
         }
 
         /// <summary>Get a directory or file path relative to a given source path. If no relative path is possible (e.g. the paths are on different drives), an absolute path is returned.</summary>
@@ -79,16 +71,18 @@ namespace StardewModdingAPI.Toolkit.Utilities
             // get relative path
             string relative = PathUtilities.NormalizePathSeparators(Uri.UnescapeDataString(from.MakeRelativeUri(to).ToString()));
 
-            // set empty path to './'
+            // normalize
             if (relative == "")
-                relative = "./";
-
-            // fix root
-            if (relative.StartsWith("file:") && !targetPath.Contains("file:"))
+                relative = ".";
+            else
             {
-                relative = relative.Substring("file:".Length);
-                if (targetPath.StartsWith(PathUtilities.WindowsUncRoot) && !relative.StartsWith(PathUtilities.WindowsUncRoot))
-                    relative = PathUtilities.WindowsUncRoot + relative.TrimStart('\\');
+                // trim trailing slash from URL
+                if (relative.EndsWith(PathUtilities.PreferredPathSeparator))
+                    relative = relative.Substring(0, relative.Length - PathUtilities.PreferredPathSeparator.Length);
+
+                // fix root
+                if (relative.StartsWith("file:") && !targetPath.Contains("file:"))
+                    relative = relative.Substring("file:".Length);
             }
 
             return relative;
-- 
cgit