StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #884 from atravita-mods/develop 

AssetName.StartsWith - fix yet another case with the trailing slash
This commit is contained in:
Jesse Plamondon-Willard 2022-11-11 21:25:01 -05:00 committed by GitHub
parent a52f888c3f ad2dcc2879
commit 1894cd831e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/SMAPI.Tests/Core/AssetNameTests.cs
View File

@ -265,6 +265,25 @@ namespace SMAPI.Tests.Core
return name.StartsWith(otherAssetName, allowPartialWord: true, allowSubfolder: allowSubfolder);
}
// The enumerator strips the trailing path separator, so each of these cases has to be handled on each branch.
[TestCase("Mods/SomeMod", "Mods/", false, ExpectedResult = true)]
[TestCase("Mods/SomeMod", "Mods", false, ExpectedResult = false)]
[TestCase("Mods/Jasper/Data", "Mods/Jas/", false, ExpectedResult = false)]
[TestCase("Mods/Jasper/Data", "Mods/Jas", false, ExpectedResult = false)]
[TestCase("Mods/Jas", "Mods/Jas/", false, ExpectedResult = false)]
[TestCase("Mods/Jas", "Mods/Jas", false, ExpectedResult = true)]
public bool StartsWith_PrefixHasSeparator(string mainAssetName, string otherAssetName, bool allowSubfolder)
{
// arrange
mainAssetName = PathUtilities.NormalizeAssetName(mainAssetName);
// act
AssetName name = AssetName.Parse(mainAssetName, _ => null);
// assert value
return name.StartsWith(otherAssetName, allowPartialWord: true, allowSubfolder: allowSubfolder);
}
/****
** GetHashCode

10
src/SMAPI/Framework/Content/AssetName.cs
View File

@ -162,8 +162,14 @@ namespace StardewModdingAPI.Framework.Content
if (prefixHasMore)
return false;
// match if subfolder paths are fine (e.g. prefix 'Data/Events' with target 'Data/Events/Beach')
return allowSubfolder;
// match: every segment in the prefix matched and subfolders are allowed (e.g. prefix 'Data/Events' with target 'Data/Events/Beach')
if (allowSubfolder)
return true;
// Special case: the prefix ends with a path separator, but subfolders aren't allowed. This case
// matches if there's no further path separator in the asset name *after* the current separator.
// For example, the prefix 'A/B/' matches 'A/B/C' but not 'A/B/C/D'.
return pathSeparators.Contains(trimmedPrefix[^1]) && curParts.Remainder.Length == 0;
}
// previous segments matched exactly and both reached the end