From 8321cbf6eba7ca3fa46d6e452fd9ebff6baa99d0 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 12 Aug 2021 21:26:10 -0400
Subject: update for asset name format change

MonoGame uses Linux-style paths for assets on all platforms, which breaks the previous equivalence between path and asset name formats.
---
 src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs |  8 ++------
 src/SMAPI.Toolkit/Utilities/PathUtilities.cs    |  2 +-
 src/SMAPI/Framework/Content/ContentCache.cs     | 14 ++++----------
 3 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
index c18f47a5..ab4c2618 100644
--- a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
+++ b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
@@ -182,18 +182,14 @@ namespace SMAPI.Tests.Utilities
         [TestCaseSource(nameof(PathUtilitiesTests.SamplePaths))]
         public void NormalizeAssetName(SamplePath path)
         {
-            if (Path.IsPathRooted(path.OriginalPath) || path.OriginalPath.StartsWith("/") || path.OriginalPath.StartsWith("\\"))
+            if (Path.IsPathRooted(path.OriginalPath) || path.OriginalPath.StartsWith('/') || path.OriginalPath.StartsWith('\\'))
                 Assert.Ignore("Absolute paths can't be used as asset names.");
 
             // act
             string normalized = PathUtilities.NormalizeAssetName(path.OriginalPath);
 
             // assert
-#if SMAPI_FOR_WINDOWS
-            Assert.AreEqual(path.NormalizedOnWindows, normalized);
-#else
-            Assert.AreEqual(path.NormalizedOnUnix, normalized);
-#endif
+            Assert.AreEqual(path.NormalizedOnUnix, normalized); // MonoGame uses the Linux format
         }
 
         /****
diff --git a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
index c17bb354..1d378042 100644
--- a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
+++ b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
@@ -27,7 +27,7 @@ namespace StardewModdingAPI.Toolkit.Utilities
         public static readonly char PreferredPathSeparator = Path.DirectorySeparatorChar;
 
         /// <summary>The preferred directory separator character in an asset key.</summary>
-        public static readonly char PreferredAssetSeparator = PathUtilities.PreferredPathSeparator;
+        public static readonly char PreferredAssetSeparator = '/';
 
 
         /*********
diff --git a/src/SMAPI/Framework/Content/ContentCache.cs b/src/SMAPI/Framework/Content/ContentCache.cs
index 87d15e32..8e0c6228 100644
--- a/src/SMAPI/Framework/Content/ContentCache.cs
+++ b/src/SMAPI/Framework/Content/ContentCache.cs
@@ -17,9 +17,6 @@ namespace StardewModdingAPI.Framework.Content
         /// <summary>The underlying asset cache.</summary>
         private readonly IDictionary<string, object> Cache;
 
-        /// <summary>Applies platform-specific asset key normalization so it's consistent with the underlying cache.</summary>
-        private readonly Func<string, string> NormalizeAssetNameForPlatform;
-
 
         /*********
         ** Accessors
@@ -47,11 +44,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="reflection">Simplifies access to private game code.</param>
         public ContentCache(LocalizedContentManager contentManager, Reflector reflection)
         {
-            // init
             this.Cache = reflection.GetField<Dictionary<string, object>>(contentManager, "loadedAssets").GetValue();
-
-            // get key normalization logic
-            this.NormalizeAssetNameForPlatform = PathUtilities.NormalizePath; //this.NormalizeAssetNameForPlatform = key => key.Replace('\\', '/'); // based on MonoGame's ContentManager.Load<T> logic
         }
 
         /****
@@ -68,23 +61,24 @@ namespace StardewModdingAPI.Framework.Content
         /****
         ** Normalize
         ****/
-        /// <summary>Normalize path separators in a file path. For asset keys, see <see cref="NormalizeKey"/> instead.</summary>
+        /// <summary>Normalize path separators in an asset name.</summary>
         /// <param name="path">The file path to normalize.</param>
         [Pure]
         public string NormalizePathSeparators(string path)
         {
-            return PathUtilities.NormalizePath(path);
+            return PathUtilities.NormalizeAssetName(path);
         }
 
         /// <summary>Normalize a cache key so it's consistent with the underlying cache.</summary>
         /// <param name="key">The asset key.</param>
+        /// <remarks>This is equivalent to <see cref="NormalizePathSeparators"/> with added file extension logic.</remarks>
         [Pure]
         public string NormalizeKey(string key)
         {
             key = this.NormalizePathSeparators(key);
             return key.EndsWith(".xnb", StringComparison.OrdinalIgnoreCase)
                 ? key.Substring(0, key.Length - 4)
-                : this.NormalizeAssetNameForPlatform(key);
+                : key;
         }
 
         /****
-- 
cgit