From 3b4e81bf69e28c9bcc33c782f58e5099d73c4f91 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Mon, 19 Feb 2018 20:18:30 -0500
Subject: encapsulate path utilities for reuse, add unit tests

---
 src/SMAPI/Framework/Utilities/PathUtilities.cs | 59 ++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/SMAPI/Framework/Utilities/PathUtilities.cs

(limited to 'src/SMAPI/Framework/Utilities')

diff --git a/src/SMAPI/Framework/Utilities/PathUtilities.cs b/src/SMAPI/Framework/Utilities/PathUtilities.cs
new file mode 100644
index 00000000..4fa521f1
--- /dev/null
+++ b/src/SMAPI/Framework/Utilities/PathUtilities.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+
+namespace StardewModdingAPI.Framework.Utilities
+{
+    /// <summary>Provides utilities for normalising file paths.</summary>
+    internal static class PathUtilities
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The possible directory separator characters in a file path.</summary>
+        private static readonly char[] PossiblePathSeparators = new[] { '/', '\\', Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }.Distinct().ToArray();
+
+        /// <summary>The preferred directory separator chaeacter in an asset key.</summary>
+        private static readonly string PreferredPathSeparator = Path.DirectorySeparatorChar.ToString();
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Get the segments from a path (e.g. <c>/usr/bin/boop</c> => <c>usr</c>, <c>bin</c>, and <c>boop</c>).</summary>
+        /// <param name="path">The path to split.</param>
+        public static string[] GetSegments(string path)
+        {
+            return path.Split(PathUtilities.PossiblePathSeparators, StringSplitOptions.RemoveEmptyEntries);
+        }
+
+        /// <summary>Normalise path separators in a file path.</summary>
+        /// <param name="path">The file path to normalise.</param>
+        [Pure]
+        public static string NormalisePathSeparators(string path)
+        {
+            string[] parts = PathUtilities.GetSegments(path);
+            string normalised = string.Join(PathUtilities.PreferredPathSeparator, parts);
+            if (path.StartsWith(PathUtilities.PreferredPathSeparator))
+                normalised = PathUtilities.PreferredPathSeparator + normalised; // keep root slash
+            return normalised;
+        }
+
+        /// <summary>Get a directory or file path relative to a given source path.</summary>
+        /// <param name="sourceDir">The source folder path.</param>
+        /// <param name="targetPath">The target folder or file path.</param>
+        [Pure]
+        public static string GetRelativePath(string sourceDir, string targetPath)
+        {
+            // convert to URIs
+            Uri from = new Uri(sourceDir.TrimEnd(PathUtilities.PossiblePathSeparators) + "/");
+            Uri to = new Uri(targetPath.TrimEnd(PathUtilities.PossiblePathSeparators) + "/");
+            if (from.Scheme != to.Scheme)
+                throw new InvalidOperationException($"Can't get path for '{targetPath}' relative to '{sourceDir}'.");
+
+            // get relative path
+            return PathUtilities.NormalisePathSeparators(Uri.UnescapeDataString(from.MakeRelativeUri(to).ToString()));
+        }
+    }
+}
-- 
cgit 


From c38c2b2c41b97ae7f7e46a4010107221a0e47c91 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Mon, 19 Feb 2018 20:18:53 -0500
Subject: fix edge case in relative path logic

---
 src/SMAPI/Framework/Utilities/PathUtilities.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/Utilities')

diff --git a/src/SMAPI/Framework/Utilities/PathUtilities.cs b/src/SMAPI/Framework/Utilities/PathUtilities.cs
index 4fa521f1..0233d796 100644
--- a/src/SMAPI/Framework/Utilities/PathUtilities.cs
+++ b/src/SMAPI/Framework/Utilities/PathUtilities.cs
@@ -53,7 +53,10 @@ namespace StardewModdingAPI.Framework.Utilities
                 throw new InvalidOperationException($"Can't get path for '{targetPath}' relative to '{sourceDir}'.");
 
             // get relative path
-            return PathUtilities.NormalisePathSeparators(Uri.UnescapeDataString(from.MakeRelativeUri(to).ToString()));
+            string relative = PathUtilities.NormalisePathSeparators(Uri.UnescapeDataString(from.MakeRelativeUri(to).ToString()));
+            if (relative == "")
+                relative = "./";
+            return relative;
         }
     }
 }
-- 
cgit