summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/Content
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2022-04-16 18:29:52 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2022-04-16 18:29:52 -0400
commit7dec51923418b269e111a266edb319ff3b0cb118 (patch)
tree4bce2c8927b8292be7f403802cd0ed0dffc59f60 /src/SMAPI/Framework/Content
parent20224d293d03d34860505980cabdb4bc5cf13319 (diff)
downloadSMAPI-7dec51923418b269e111a266edb319ff3b0cb118.tar.gz
SMAPI-7dec51923418b269e111a266edb319ff3b0cb118.tar.bz2
SMAPI-7dec51923418b269e111a266edb319ff3b0cb118.zip
fix broken unit tests
Diffstat (limited to 'src/SMAPI/Framework/Content')
-rw-r--r--src/SMAPI/Framework/Content/AssetName.cs16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/SMAPI/Framework/Content/AssetName.cs b/src/SMAPI/Framework/Content/AssetName.cs
index 4c691b9a..148354a1 100644
--- a/src/SMAPI/Framework/Content/AssetName.cs
+++ b/src/SMAPI/Framework/Content/AssetName.cs
@@ -119,25 +119,27 @@ namespace StardewModdingAPI.Framework.Content
if (prefix is null)
return false;
+ string rawTrimmed = prefix.Trim();
+
// asset keys can't have a leading slash, but NormalizeAssetName will trim them
- {
- string trimmed = prefix.TrimStart();
- if (trimmed.StartsWith('/') || trimmed.StartsWith('\\'))
- return false;
- }
+ if (rawTrimmed.StartsWith('/') || rawTrimmed.StartsWith('\\'))
+ return false;
// normalize prefix
{
string normalized = PathUtilities.NormalizeAssetName(prefix);
- string trimmed = prefix.TrimEnd();
- if (trimmed.EndsWith('/') || trimmed.EndsWith('\\'))
+ // keep trailing slash
+ if (rawTrimmed.EndsWith('/') || rawTrimmed.EndsWith('\\'))
normalized += PathUtilities.PreferredAssetSeparator;
prefix = normalized;
}
// compare
+ if (prefix.Length == 0)
+ return true;
+
return
this.Name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)
&& (