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

tweak naming in new code

This commit is contained in:
Jesse Plamondon-Willard 2022-10-16 14:41:45 -04:00
parent 0c191eb32c
commit 70cde89480
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
2 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
using System; using System;
using StardewModdingAPI.Toolkit.Utilities; using StardewModdingAPI.Toolkit.Utilities;
using StardewModdingAPI.Utilities.AssetPathUtilities; using StardewModdingAPI.Utilities.AssetPathUtilities;
using StardewValley; using StardewValley;
using ToolkitPathUtilities = StardewModdingAPI.Toolkit.Utilities.PathUtilities; using ToolkitPathUtilities = StardewModdingAPI.Toolkit.Utilities.PathUtilities;
namespace StardewModdingAPI.Framework.Content namespace StardewModdingAPI.Framework.Content
@ -98,24 +96,24 @@ namespace StardewModdingAPI.Framework.Content
if (string.IsNullOrWhiteSpace(assetName)) if (string.IsNullOrWhiteSpace(assetName))
return false; return false;
AssetPartYielder compareTo = new(useBaseName ? this.BaseName : this.Name); AssetNamePartEnumerator curParts = new(useBaseName ? this.BaseName : this.Name);
AssetPartYielder compareFrom = new(assetName); AssetNamePartEnumerator otherParts = new(assetName);
while (true) while (true)
{ {
bool otherHasMore = compareFrom.MoveNext(); bool otherHasMore = otherParts.MoveNext();
bool iHaveMore = compareTo.MoveNext(); bool curHasMore = curParts.MoveNext();
// neither of us have any more to yield, I'm done. // neither of us have any more to yield, I'm done.
if (!otherHasMore && !iHaveMore) if (!otherHasMore && !curHasMore)
return true; return true;
// One of us has more but the other doesn't, this isn't a match. // One of us has more but the other doesn't, this isn't a match.
if (otherHasMore ^ iHaveMore) if (otherHasMore ^ curHasMore)
return false; return false;
// My next bit doesn't match their next bit, this isn't a match. // My next bit doesn't match their next bit, this isn't a match.
if (!compareTo.Current.Equals(compareFrom.Current, StringComparison.OrdinalIgnoreCase)) if (!curParts.Current.Equals(otherParts.Current, StringComparison.OrdinalIgnoreCase))
return false; return false;
// continue checking. // continue checking.
@ -144,59 +142,59 @@ namespace StardewModdingAPI.Framework.Content
ReadOnlySpan<char> trimmed = prefix.AsSpan().Trim(); ReadOnlySpan<char> trimmed = prefix.AsSpan().Trim();
// just because most ReadOnlySpan/Span APIs expect a ReadOnlySpan/Span, easier to read. // just because most ReadOnlySpan/Span APIs expect a ReadOnlySpan/Span, easier to read.
ReadOnlySpan<char> seperators = new(ToolkitPathUtilities.PossiblePathSeparators); ReadOnlySpan<char> pathSeparators = new(ToolkitPathUtilities.PossiblePathSeparators);
// asset keys can't have a leading slash, but AssetPathYielder won't yield that. // asset keys can't have a leading slash, but AssetPathYielder won't yield that.
if (seperators.Contains(trimmed[0])) if (pathSeparators.Contains(trimmed[0]))
return false; return false;
if (trimmed.Length == 0) if (trimmed.Length == 0)
return true; return true;
AssetPartYielder compareTo = new(this.Name); AssetNamePartEnumerator curParts = new(this.Name);
AssetPartYielder compareFrom = new(trimmed); AssetNamePartEnumerator prefixParts = new(trimmed);
while (true) while (true)
{ {
bool otherHasMore = compareFrom.MoveNext(); bool prefixHasMore = prefixParts.MoveNext();
bool iHaveMore = compareTo.MoveNext(); bool curHasMore = curParts.MoveNext();
// Neither of us have any more to yield, I'm done. // Neither of us have any more to yield, I'm done.
if (!otherHasMore && !iHaveMore) if (!prefixHasMore && !curHasMore)
return true; return true;
// the prefix is actually longer than the asset name, this can't be true. // the prefix is actually longer than the asset name, this can't be true.
if (otherHasMore && !iHaveMore) if (prefixHasMore && !curHasMore)
return false; return false;
// they're done, I have more. (These are going to be word boundaries, I don't need to check that). // they're done, I have more. (These are going to be word boundaries, I don't need to check that).
if (!otherHasMore && iHaveMore) if (!prefixHasMore && curHasMore)
{ {
return allowSubfolder || !compareTo.Remainder.Contains(seperators, StringComparison.Ordinal); return allowSubfolder || !curParts.Remainder.Contains(pathSeparators, StringComparison.Ordinal);
} }
// check my next segment against theirs. // check my next segment against theirs.
if (otherHasMore && iHaveMore) if (prefixHasMore && curHasMore)
{ {
// my next segment doesn't match theirs. // my next segment doesn't match theirs.
if (!compareTo.Current.StartsWith(compareFrom.Current, StringComparison.OrdinalIgnoreCase)) if (!curParts.Current.StartsWith(prefixParts.Current, StringComparison.OrdinalIgnoreCase))
return false; return false;
// my next segment starts with theirs but isn't an exact match. // my next segment starts with theirs but isn't an exact match.
if (compareTo.Current.Length != compareFrom.Current.Length) if (curParts.Current.Length != prefixParts.Current.Length)
{ {
// something like "Maps/" would require an exact match. // something like "Maps/" would require an exact match.
if (seperators.Contains(trimmed[^1])) if (pathSeparators.Contains(trimmed[^1]))
return false; return false;
// check for partial word. // check for partial word.
if (!allowPartialWord if (!allowPartialWord
&& char.IsLetterOrDigit(compareFrom.Current[^1]) // last character in suffix is not word separator && char.IsLetterOrDigit(prefixParts.Current[^1]) // last character in suffix is not word separator
&& char.IsLetterOrDigit(compareTo.Current[compareFrom.Current.Length]) // and the first character after it isn't either. && char.IsLetterOrDigit(curParts.Current[prefixParts.Current.Length]) // and the first character after it isn't either.
) )
return false; return false;
return allowSubfolder || !compareTo.Remainder.Contains(seperators, StringComparison.Ordinal); return allowSubfolder || !curParts.Remainder.Contains(pathSeparators, StringComparison.Ordinal);
} }
// exact matches should continue checking. // exact matches should continue checking.

31
src/SMAPI/Utilities/AssetPathUtilities/AssetPartYielder.cs → src/SMAPI/Utilities/AssetPathUtilities/AssetNamePartEnumerator.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using ToolkitPathUtilities = StardewModdingAPI.Toolkit.Utilities.PathUtilities; using ToolkitPathUtilities = StardewModdingAPI.Toolkit.Utilities.PathUtilities;
namespace StardewModdingAPI.Utilities.AssetPathUtilities; namespace StardewModdingAPI.Utilities.AssetPathUtilities;
@ -7,23 +6,23 @@ namespace StardewModdingAPI.Utilities.AssetPathUtilities;
/// <summary> /// <summary>
/// A helper class that yields out each bit of an asset path /// A helper class that yields out each bit of an asset path
/// </summary> /// </summary>
internal ref struct AssetPartYielder internal ref struct AssetNamePartEnumerator
{ {
private ReadOnlySpan<char> remainder; private ReadOnlySpan<char> RemainderImpl;
/// <summary> /// <summary>
/// Construct an instance. /// Construct an instance.
/// </summary> /// </summary>
/// <param name="assetName">The asset name.</param> /// <param name="assetName">The asset name.</param>
internal AssetPartYielder(ReadOnlySpan<char> assetName) internal AssetNamePartEnumerator(ReadOnlySpan<char> assetName)
{ {
this.remainder = AssetPartYielder.TrimLeadingPathSeperators(assetName); this.RemainderImpl = AssetNamePartEnumerator.TrimLeadingPathSeparators(assetName);
} }
/// <summary> /// <summary>
/// The remainder of the assetName (that hasn't been yielded out yet.) /// The remainder of the assetName (that hasn't been yielded out yet.)
/// </summary> /// </summary>
internal ReadOnlySpan<char> Remainder => this.remainder; internal ReadOnlySpan<char> Remainder => this.RemainderImpl;
/// <summary> /// <summary>
/// The current segment. /// The current segment.
@ -31,7 +30,7 @@ internal ref struct AssetPartYielder
public ReadOnlySpan<char> Current { get; private set; } = default; public ReadOnlySpan<char> Current { get; private set; } = default;
// this is just so it can be used in a foreach loop. // this is just so it can be used in a foreach loop.
public AssetPartYielder GetEnumerator() => this; public AssetNamePartEnumerator GetEnumerator() => this;
/// <summary> /// <summary>
/// Moves the enumerator to the next element. /// Moves the enumerator to the next element.
@ -39,28 +38,28 @@ internal ref struct AssetPartYielder
/// <returns>True if there is a new</returns> /// <returns>True if there is a new</returns>
public bool MoveNext() public bool MoveNext()
{ {
if (this.remainder.Length == 0) if (this.RemainderImpl.Length == 0)
{ {
return false; return false;
} }
int index = this.remainder.IndexOfAny(ToolkitPathUtilities.PossiblePathSeparators); int index = this.RemainderImpl.IndexOfAny(ToolkitPathUtilities.PossiblePathSeparators);
// no more seperator characters found, I'm done. // no more separator characters found, I'm done.
if (index < 0) if (index < 0)
{ {
this.Current = this.remainder; this.Current = this.RemainderImpl;
this.remainder = ReadOnlySpan<char>.Empty; this.RemainderImpl = ReadOnlySpan<char>.Empty;
return true; return true;
} }
// Yield the next seperate character bit // Yield the next separate character bit
this.Current = this.remainder[..index]; this.Current = this.RemainderImpl[..index];
this.remainder = AssetPartYielder.TrimLeadingPathSeperators(this.remainder[(index + 1)..]); this.RemainderImpl = AssetNamePartEnumerator.TrimLeadingPathSeparators(this.RemainderImpl[(index + 1)..]);
return true; return true;
} }
private static ReadOnlySpan<char> TrimLeadingPathSeperators(ReadOnlySpan<char> span) private static ReadOnlySpan<char> TrimLeadingPathSeparators(ReadOnlySpan<char> span)
{ {
return span.TrimStart(new ReadOnlySpan<char>(ToolkitPathUtilities.PossiblePathSeparators)); return span.TrimStart(new ReadOnlySpan<char>(ToolkitPathUtilities.PossiblePathSeparators));
} }