From 0c191eb32c41ffedd321951cda70b521e9b51c96 Mon Sep 17 00:00:00 2001
From: atravita-mods <94934860+atravita-mods@users.noreply.github.com>
Date: Sat, 15 Oct 2022 08:36:24 -0400
Subject: make asset name comparing lazy.

---
 .../AssetPathUtilities/AssetPartYielder.cs         | 67 ++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/SMAPI/Utilities/AssetPathUtilities/AssetPartYielder.cs

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

diff --git a/src/SMAPI/Utilities/AssetPathUtilities/AssetPartYielder.cs b/src/SMAPI/Utilities/AssetPathUtilities/AssetPartYielder.cs
new file mode 100644
index 00000000..a55a0ab4
--- /dev/null
+++ b/src/SMAPI/Utilities/AssetPathUtilities/AssetPartYielder.cs
@@ -0,0 +1,67 @@
+using System;
+
+using ToolkitPathUtilities = StardewModdingAPI.Toolkit.Utilities.PathUtilities;
+
+namespace StardewModdingAPI.Utilities.AssetPathUtilities;
+
+/// <summary>
+/// A helper class that yields out each bit of an asset path
+/// </summary>
+internal ref struct AssetPartYielder
+{
+    private ReadOnlySpan<char> remainder;
+
+    /// <summary>
+    /// Construct an instance.
+    /// </summary>
+    /// <param name="assetName">The asset name.</param>
+    internal AssetPartYielder(ReadOnlySpan<char> assetName)
+    {
+        this.remainder = AssetPartYielder.TrimLeadingPathSeperators(assetName);
+    }
+
+    /// <summary>
+    /// The remainder of the assetName (that hasn't been yielded out yet.)
+    /// </summary>
+    internal ReadOnlySpan<char> Remainder => this.remainder;
+
+    /// <summary>
+    /// The current segment.
+    /// </summary>
+    public ReadOnlySpan<char> Current { get; private set; } = default;
+
+    // this is just so it can be used in a foreach loop.
+    public AssetPartYielder GetEnumerator() => this;
+
+    /// <summary>
+    /// Moves the enumerator to the next element.
+    /// </summary>
+    /// <returns>True if there is a new</returns>
+    public bool MoveNext()
+    {
+        if (this.remainder.Length == 0)
+        {
+            return false;
+        }
+
+        int index = this.remainder.IndexOfAny(ToolkitPathUtilities.PossiblePathSeparators);
+
+        // no more seperator characters found, I'm done.
+        if (index < 0)
+        {
+            this.Current = this.remainder;
+            this.remainder = ReadOnlySpan<char>.Empty;
+            return true;
+        }
+
+        // Yield the next seperate character bit
+        this.Current = this.remainder[..index];
+        this.remainder = AssetPartYielder.TrimLeadingPathSeperators(this.remainder[(index + 1)..]);
+        return true;
+    }
+
+    private static ReadOnlySpan<char> TrimLeadingPathSeperators(ReadOnlySpan<char> span)
+    {
+        return span.TrimStart(new ReadOnlySpan<char>(ToolkitPathUtilities.PossiblePathSeparators));
+    }
+}
-- 
cgit 


From 70cde89480e43bb1369c1063c7b19f757784f269 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 16 Oct 2022 14:41:45 -0400
Subject: tweak naming in new code

---
 .../AssetPathUtilities/AssetNamePartEnumerator.cs  | 66 +++++++++++++++++++++
 .../AssetPathUtilities/AssetPartYielder.cs         | 67 ----------------------
 2 files changed, 66 insertions(+), 67 deletions(-)
 create mode 100644 src/SMAPI/Utilities/AssetPathUtilities/AssetNamePartEnumerator.cs
 delete mode 100644 src/SMAPI/Utilities/AssetPathUtilities/AssetPartYielder.cs

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

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


From eed1deb3c75ba2aeea94ea9a57f9fe7ad92a90ce Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 16 Oct 2022 14:41:45 -0400
Subject: apply conventions to asset part enumerator

---
 .../AssetPathUtilities/AssetNamePartEnumerator.cs  | 98 +++++++++++-----------
 1 file changed, 51 insertions(+), 47 deletions(-)

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

diff --git a/src/SMAPI/Utilities/AssetPathUtilities/AssetNamePartEnumerator.cs b/src/SMAPI/Utilities/AssetPathUtilities/AssetNamePartEnumerator.cs
index 0840617a..11987ed6 100644
--- a/src/SMAPI/Utilities/AssetPathUtilities/AssetNamePartEnumerator.cs
+++ b/src/SMAPI/Utilities/AssetPathUtilities/AssetNamePartEnumerator.cs
@@ -1,66 +1,70 @@
 using System;
 using ToolkitPathUtilities = StardewModdingAPI.Toolkit.Utilities.PathUtilities;
 
-namespace StardewModdingAPI.Utilities.AssetPathUtilities;
-
-/// <summary>
-/// A helper class that yields out each bit of an asset path
-/// </summary>
-internal ref struct AssetNamePartEnumerator
+namespace StardewModdingAPI.Utilities.AssetPathUtilities
 {
-    private ReadOnlySpan<char> RemainderImpl;
-
-    /// <summary>
-    /// Construct an instance.
-    /// </summary>
-    /// <param name="assetName">The asset name.</param>
-    internal AssetNamePartEnumerator(ReadOnlySpan<char> assetName)
+    /// <summary>Handles enumerating the normalized segments in an asset name.</summary>
+    internal ref struct AssetNamePartEnumerator
     {
-        this.RemainderImpl = AssetNamePartEnumerator.TrimLeadingPathSeparators(assetName);
-    }
+        /*********
+        ** Fields
+        *********/
+        /// <summary>The backing field for <see cref="Remainder"/>.</summary>
+        private ReadOnlySpan<char> RemainderImpl;
 
-    /// <summary>
-    /// The remainder of the assetName (that hasn't been yielded out yet.)
-    /// </summary>
-    internal ReadOnlySpan<char> Remainder => this.RemainderImpl;
 
-    /// <summary>
-    /// The current segment.
-    /// </summary>
-    public ReadOnlySpan<char> Current { get; private set; } = default;
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The remainder of the asset name being enumerated, ignoring segments which have already been yielded.</summary>
+        public ReadOnlySpan<char> Remainder => this.RemainderImpl;
 
-    // this is just so it can be used in a foreach loop.
-    public AssetNamePartEnumerator GetEnumerator() => this;
+        /// <summary>Get the current segment.</summary>
+        public ReadOnlySpan<char> Current { get; private set; } = default;
 
-    /// <summary>
-    /// Moves the enumerator to the next element.
-    /// </summary>
-    /// <returns>True if there is a new</returns>
-    public bool MoveNext()
-    {
-        if (this.RemainderImpl.Length == 0)
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="assetName">The asset name to enumerate.</param>
+        public AssetNamePartEnumerator(ReadOnlySpan<char> assetName)
         {
-            return false;
+            this.RemainderImpl = AssetNamePartEnumerator.TrimLeadingPathSeparators(assetName);
         }
 
-        int index = this.RemainderImpl.IndexOfAny(ToolkitPathUtilities.PossiblePathSeparators);
-
-        // no more separator characters found, I'm done.
-        if (index < 0)
+        /// <summary>Move the enumerator to the next segment.</summary>
+        /// <returns>Returns true if a new value was found (accessible via <see cref="Current"/>).</returns>
+        public bool MoveNext()
         {
-            this.Current = this.RemainderImpl;
-            this.RemainderImpl = ReadOnlySpan<char>.Empty;
+            if (this.RemainderImpl.Length == 0)
+                return false;
+
+            int index = this.RemainderImpl.IndexOfAny(ToolkitPathUtilities.PossiblePathSeparators);
+
+            // no more separator characters found, I'm done.
+            if (index < 0)
+            {
+                this.Current = this.RemainderImpl;
+                this.RemainderImpl = ReadOnlySpan<char>.Empty;
+                return true;
+            }
+
+            // Yield the next separate character bit
+            this.Current = this.RemainderImpl[..index];
+            this.RemainderImpl = AssetNamePartEnumerator.TrimLeadingPathSeparators(this.RemainderImpl[(index + 1)..]);
             return true;
         }
 
-        // Yield the next separate character bit
-        this.Current = this.RemainderImpl[..index];
-        this.RemainderImpl = AssetNamePartEnumerator.TrimLeadingPathSeparators(this.RemainderImpl[(index + 1)..]);
-        return true;
-    }
 
-    private static ReadOnlySpan<char> TrimLeadingPathSeparators(ReadOnlySpan<char> span)
-    {
-        return span.TrimStart(new ReadOnlySpan<char>(ToolkitPathUtilities.PossiblePathSeparators));
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Trim path separators at the start of the given path or segment.</summary>
+        /// <param name="span">The path or segment to trim.</param>
+        private static ReadOnlySpan<char> TrimLeadingPathSeparators(ReadOnlySpan<char> span)
+        {
+            return span.TrimStart(new ReadOnlySpan<char>(ToolkitPathUtilities.PossiblePathSeparators));
+        }
     }
 }
-- 
cgit