com.wallstop-studios.unity-helpers 2.0.0-rc81.9 → 2.0.0

package/Editor/PersistentDirectorySettings.cs

@@ -5,7 +5,6 @@ namespace WallstopStudios.UnityHelpers.Editor
     using UnityEngine;
     using UnityEditor;
     using System.Collections.Generic;
-    using System.Linq;
     using System.IO;
     using UnityEngine.Serialization;
     using WallstopStudios.UnityHelpers.Core.Helper;
@@ -119,12 +118,29 @@ namespace WallstopStudios.UnityHelpers.Editor
                 string[] guids = AssetDatabase.FindAssets(
                     "t:" + nameof(PersistentDirectorySettings)
                 );
-                List<string> candidatePaths = guids
-                    .Select(AssetDatabase.GUIDToAssetPath)
-                    .Where(p => !string.IsNullOrWhiteSpace(p))
-                    .Select(SanitizePath)
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
+                List<string> candidatePaths = new();
+                using (
+                    WallstopStudios
+                        .UnityHelpers.Utils.SetBuffers<string>.GetHashSetPool(
+                            StringComparer.OrdinalIgnoreCase
+                        )
+                        .Get(out HashSet<string> seen)
+                )
+                {
+                    for (int i = 0; i < guids.Length; i++)
+                    {
+                        string path = AssetDatabase.GUIDToAssetPath(guids[i]);
+                        if (string.IsNullOrWhiteSpace(path))
+                        {
+                            continue;
+                        }
+                        string sanitized = SanitizePath(path);
+                        if (seen.Add(sanitized))
+                        {
+                            candidatePaths.Add(sanitized);
+                        }
+                    }
+                }
 
                 PersistentDirectorySettings target =
                     AssetDatabase.LoadAssetAtPath<PersistentDirectorySettings>(targetAssetPath);
@@ -292,12 +308,48 @@ namespace WallstopStudios.UnityHelpers.Editor
                 return Array.Empty<DirectoryUsageData>();
             }
 
-            DirectoryUsageData[] sortedDirectories = context
-                .directories.OrderByDescending(directoryData => directoryData.count)
-                .ThenByDescending(directoryData => directoryData.lastUsedTicks)
-                .ToArray();
+            List<DirectoryUsageData> list = context.directories;
+            if (list == null || list.Count == 0)
+            {
+                return Array.Empty<DirectoryUsageData>();
+            }
+
+            DirectoryUsageData[] sortedDirectories = new DirectoryUsageData[list.Count];
+            for (int i = 0; i < list.Count; i++)
+            {
+                sortedDirectories[i] = list[i];
+            }
+            Array.Sort(
+                sortedDirectories,
+                static (a, b) =>
+                {
+                    int cmp = b.count.CompareTo(a.count);
+                    if (cmp != 0)
+                    {
+                        return cmp;
+                    }
+                    return b.lastUsedTicks.CompareTo(a.lastUsedTicks);
+                }
+            );
 
-            return topOnly ? sortedDirectories.Take(topN).ToArray() : sortedDirectories;
+            if (topOnly)
+            {
+                int n =
+                    topN < 0
+                        ? 0
+                        : (topN > sortedDirectories.Length ? sortedDirectories.Length : topN);
+                if (n == sortedDirectories.Length)
+                {
+                    return sortedDirectories;
+                }
+                DirectoryUsageData[] result = new DirectoryUsageData[n];
+                for (int i = 0; i < n; i++)
+                {
+                    result[i] = sortedDirectories[i];
+                }
+                return result;
+            }
+            return sortedDirectories;
         }
 
         private static void MergeSettings(

package/Editor/PrefabChecker.cs

@@ -6,7 +6,6 @@ namespace WallstopStudios.UnityHelpers.Editor
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
-    using System.Linq;
     using System.Reflection;
     using UnityEditor;
     using UnityEditorInternal;
@@ -117,6 +116,10 @@ namespace WallstopStudios.UnityHelpers.Editor
                     {
                         ExportLastReport();
                     }
+                    if (GUILayout.Button("Export Report (CSV)"))
+                    {
+                        ExportLastReportCsv();
+                    }
                 }
             }
             finally
@@ -1267,18 +1270,31 @@ namespace WallstopStudios.UnityHelpers.Editor
         }
 
         [Serializable]
-        private sealed class ScanReport
+        internal sealed class ScanReport
         {
             public readonly string[] folders;
             public readonly List<Item> items = new();
 
             public ScanReport(IEnumerable<string> folders)
             {
-                this.folders = folders?.ToArray() ?? Array.Empty<string>();
+                if (folders == null)
+                {
+                    this.folders = Array.Empty<string>();
+                    return;
+                }
+                // Manual copy to avoid LINQ
+                using (Buffers<string>.List.Get(out List<string> list))
+                {
+                    foreach (string s in folders)
+                    {
+                        list.Add(s);
+                    }
+                    this.folders = list.ToArray();
+                }
             }
 
             [Serializable]
-            public sealed class Item
+            internal sealed class Item
             {
                 public string path;
                 public string[] messages;
@@ -1286,7 +1302,11 @@ namespace WallstopStudios.UnityHelpers.Editor
 
             public void Add(string path, List<string> messages)
             {
-                items.Add(new Item { path = path, messages = messages.ToArray() });
+                string[] arr =
+                    messages != null && messages.Count > 0
+                        ? messages.ToArray()
+                        : Array.Empty<string>();
+                items.Add(new Item { path = path, messages = arr });
             }
         }
 
@@ -1324,6 +1344,53 @@ namespace WallstopStudios.UnityHelpers.Editor
                 this.LogError($"Failed to save report: {e.Message}");
             }
         }
+
+        private void ExportLastReportCsv()
+        {
+            if (_lastReport == null || _lastReport.items.Count == 0)
+            {
+                EditorUi.Info("Prefab Checker", "No report data to export.");
+                return;
+            }
+            string defaultPath = Application.dataPath + "/PrefabCheckerReport.csv";
+            string savePath = EditorUi.Suppress
+                ? defaultPath
+                : EditorUtility.SaveFilePanel(
+                    "Save Prefab Checker Report (CSV)",
+                    Application.dataPath,
+                    "PrefabCheckerReport",
+                    "csv"
+                );
+            if (string.IsNullOrWhiteSpace(savePath))
+            {
+                return;
+            }
+
+            try
+            {
+                using StreamWriter sw = new(savePath);
+                sw.WriteLine("Path,Message");
+                foreach (ScanReport.Item item in _lastReport.items)
+                {
+                    string path = item.path?.Replace('"', '\'') ?? string.Empty;
+                    if (item.messages == null || item.messages.Length == 0)
+                    {
+                        sw.WriteLine($"\"{path}\",\"\"");
+                        continue;
+                    }
+                    foreach (string m in item.messages)
+                    {
+                        string msg = (m ?? string.Empty).Replace('"', '\'');
+                        sw.WriteLine($"\"{path}\",\"{msg}\"");
+                    }
+                }
+                this.Log($"Saved report to: {savePath}");
+            }
+            catch (Exception e)
+            {
+                this.LogError($"Failed to save CSV: {e.Message}");
+            }
+        }
     }
 #endif
 }

package/Editor/Sprites/AnimationCopier.cs

@@ -119,16 +119,16 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
         private bool _unchangedFoldout;
         private bool _orphansFoldout;
         private Vector2 _previewScroll;
-        private string _filterText = string.Empty;
-        private bool _filterUseRegex;
-        private bool _sortAscending = true;
+        internal string _filterText = string.Empty;
+        internal bool _filterUseRegex;
+        internal bool _sortAscending = true;
 
-        private enum AnimationStatus
+        public enum AnimationStatus
         {
-            Unknown,
-            New,
-            Changed,
-            Unchanged,
+            Unknown = 0,
+            New = 1,
+            Changed = 2,
+            Unchanged = 3,
         }
 
         internal enum CopyMode
@@ -138,7 +138,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             New,
         }
 
-        private sealed class AnimationFileInfo
+        internal sealed class AnimationFileInfo
         {
             public string RelativePath { get; set; }
             public string FullPath { get; set; }
@@ -291,12 +291,37 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             bool canAnalyze = ArePathsValid();
             bool analysisDone = !_analysisNeeded;
 
-            int selectedNew = _newAnimations.Count(a => a.Selected);
-            int selectedChanged = _changedAnimations.Count(a => a.Selected);
+            int selectedNew = 0;
+            foreach (AnimationFileInfo newAnimation in _newAnimations)
+            {
+                if (newAnimation.Selected)
+                {
+                    ++selectedNew;
+                }
+            }
+
+            int selectedChanged = 0;
+            foreach (AnimationFileInfo changedAnimation in _changedAnimations)
+            {
+                if (changedAnimation.Selected)
+                {
+                    ++selectedChanged;
+                }
+            }
+
+            int selectedUnchanged = 0;
+            foreach (AnimationFileInfo unchangedAnimation in _unchangedAnimations)
+            {
+                if (unchangedAnimation.Selected)
+                {
+                    ++selectedUnchanged;
+                }
+            }
+
             int selectedAll =
                 selectedNew
                 + selectedChanged
-                + (_includeUnchangedInCopyAll ? _unchangedAnimations.Count(a => a.Selected) : 0);
+                + (_includeUnchangedInCopyAll ? selectedUnchanged : 0);
 
             bool canCopyNew = canAnalyze && analysisDone && selectedNew > 0;
             bool canCopyChanged = canAnalyze && analysisDone && selectedChanged > 0;
@@ -342,14 +367,8 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             if (GUILayout.Button($"Copy All ({totalToCopyAll})"))
             {
                 string overwriteWarning =
-                    selectedChanged
-                        + (
-                            _includeUnchangedInCopyAll
-                                ? _unchangedAnimations.Count(a => a.Selected)
-                                : 0
-                        )
-                    > 0
-                        ? $" This will overwrite {selectedChanged + (_includeUnchangedInCopyAll ? _unchangedAnimations.Count(a => a.Selected) : 0)} existing files."
+                    selectedChanged + (_includeUnchangedInCopyAll ? selectedUnchanged : 0) > 0
+                        ? $" This will overwrite {selectedChanged + (_includeUnchangedInCopyAll ? selectedUnchanged : 0)} existing files."
                         : "";
                 if (
                     Confirm(
@@ -372,8 +391,8 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
 
             bool canAnalyze = ArePathsValid();
             bool analysisDone = !_analysisNeeded;
-            bool hasUnchanged = _unchangedAnimations.Any();
-            bool hasOrphans = _destinationOrphans.Any();
+            bool hasUnchanged = _unchangedAnimations.Count > 0;
+            bool hasOrphans = _destinationOrphans.Count > 0;
 
             _dryRun = EditorGUILayout.ToggleLeft("Dry Run (no changes)", _dryRun);
 
@@ -943,9 +962,15 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 return;
             }
 
-            List<AnimationFileInfo> animationsToDelete = _unchangedAnimations
-                .Where(a => a is { Selected: true })
-                .ToList();
+            List<AnimationFileInfo> animationsToDelete = new List<AnimationFileInfo>();
+            for (int i = 0; i < _unchangedAnimations.Count; i++)
+            {
+                AnimationFileInfo a = _unchangedAnimations[i];
+                if (a != null && a.Selected)
+                {
+                    animationsToDelete.Add(a);
+                }
+            }
 
             if (animationsToDelete.Count == 0)
             {
@@ -1192,9 +1217,8 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 return;
             }
             IEnumerable<AnimationFileInfo> filtered = ApplyFilterAndSort(items);
-            AnimationFileInfo[] animationFileInfos =
-                filtered as AnimationFileInfo[] ?? filtered.ToArray();
-            int count = animationFileInfos.Length;
+            IList<AnimationFileInfo> animationFileInfos = filtered.AsList();
+            int count = animationFileInfos.Count;
             if (count == 0)
             {
                 using (new EditorGUILayout.HorizontalScope())
@@ -1217,36 +1241,41 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 {
                     if (GUILayout.Button("Select All", GUILayout.Width(100)))
                     {
-                        foreach (AnimationFileInfo info in animationFileInfos)
+                        for (int i = 0; i < animationFileInfos.Count; i++)
                         {
+                            AnimationFileInfo info = animationFileInfos[i];
                             info.Selected = true;
                         }
                     }
                     if (GUILayout.Button("Select None", GUILayout.Width(100)))
                     {
-                        foreach (AnimationFileInfo info in animationFileInfos)
+                        for (int i = 0; i < animationFileInfos.Count; i++)
                         {
+                            AnimationFileInfo info = animationFileInfos[i];
                             info.Selected = false;
                         }
                     }
                     if (GUILayout.Button("Select Filtered", GUILayout.Width(120)))
                     {
-                        foreach (AnimationFileInfo info in animationFileInfos)
+                        for (int i = 0; i < animationFileInfos.Count; i++)
                         {
+                            AnimationFileInfo info = animationFileInfos[i];
                             info.Selected = true;
                         }
                     }
                     if (GUILayout.Button("Clear Filtered", GUILayout.Width(120)))
                     {
-                        foreach (AnimationFileInfo info in animationFileInfos)
+                        for (int i = 0; i < animationFileInfos.Count; i++)
                         {
+                            AnimationFileInfo info = animationFileInfos[i];
                             info.Selected = false;
                         }
                     }
                 }
 
-                foreach (AnimationFileInfo info in animationFileInfos)
+                for (int i = 0; i < animationFileInfos.Count; i++)
                 {
+                    AnimationFileInfo info = animationFileInfos[i];
                     using (new EditorGUILayout.HorizontalScope())
                     {
                         info.Selected = EditorGUILayout.Toggle(info.Selected, GUILayout.Width(20));
@@ -1272,38 +1301,77 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             }
         }
 
-        private IEnumerable<AnimationFileInfo> ApplyFilterAndSort(List<AnimationFileInfo> items)
+        internal IEnumerable<AnimationFileInfo> ApplyFilterAndSort(List<AnimationFileInfo> items)
         {
-            IEnumerable<AnimationFileInfo> query = items;
-            if (!string.IsNullOrWhiteSpace(_filterText))
+            if (items == null || items.Count == 0)
+            {
+                yield break;
+            }
+
+            using (Buffers<AnimationFileInfo>.List.Get(out List<AnimationFileInfo> filtered))
             {
-                if (_filterUseRegex)
+                if (string.IsNullOrWhiteSpace(_filterText))
+                {
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        AnimationFileInfo it = items[i];
+                        if (it != null)
+                        {
+                            filtered.Add(it);
+                        }
+                    }
+                }
+                else if (_filterUseRegex)
                 {
                     try
                     {
-                        Regex rx = new(_filterText, RegexOptions.IgnoreCase);
-                        query = query.Where(i =>
-                            i is { FileName: not null } && rx.IsMatch(i.FileName)
-                        );
+                        Regex rx = new Regex(_filterText, RegexOptions.IgnoreCase);
+                        for (int i = 0; i < items.Count; i++)
+                        {
+                            AnimationFileInfo it = items[i];
+                            if (it != null && it.FileName != null && rx.IsMatch(it.FileName))
+                            {
+                                filtered.Add(it);
+                            }
+                        }
                     }
                     catch (Exception ex)
                     {
                         this.LogWarn($"Invalid regex '{_filterText}': {ex.Message}");
-                        query = Enumerable.Empty<AnimationFileInfo>();
                     }
                 }
                 else
                 {
-                    query = query.Where(i =>
-                        i is { FileName: not null }
-                        && i.FileName.IndexOf(_filterText, StringComparison.OrdinalIgnoreCase) >= 0
-                    );
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        AnimationFileInfo it = items[i];
+                        if (
+                            it != null
+                            && it.FileName != null
+                            && it.FileName.IndexOf(_filterText, StringComparison.OrdinalIgnoreCase)
+                                >= 0
+                        )
+                        {
+                            filtered.Add(it);
+                        }
+                    }
+                }
+
+                filtered.Sort(
+                    (a, b) =>
+                    {
+                        string an = a?.FileName ?? string.Empty;
+                        string bn = b?.FileName ?? string.Empty;
+                        int cmp = string.Compare(an, bn, StringComparison.OrdinalIgnoreCase);
+                        return _sortAscending ? cmp : -cmp;
+                    }
+                );
+
+                for (int i = 0; i < filtered.Count; i++)
+                {
+                    yield return filtered[i];
                 }
             }
-            query = _sortAscending
-                ? query.OrderBy(i => i.FileName, StringComparer.OrdinalIgnoreCase)
-                : query.OrderByDescending(i => i.FileName, StringComparer.OrdinalIgnoreCase);
-            return query;
         }
 
         internal void MirrorDeleteDestinationAnimations()
@@ -1313,9 +1381,15 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 return;
             }
 
-            List<AnimationFileInfo> toDelete = _destinationOrphans
-                .Where(a => a is { Selected: true })
-                .ToList();
+            List<AnimationFileInfo> toDelete = new List<AnimationFileInfo>();
+            for (int i = 0; i < _destinationOrphans.Count; i++)
+            {
+                AnimationFileInfo a = _destinationOrphans[i];
+                if (a != null && a.Selected)
+                {
+                    toDelete.Add(a);
+                }
+            }
             if (toDelete.Count == 0)
             {
                 Info("Nothing to Delete", "No destination orphans are selected.");
@@ -1456,15 +1530,17 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                     bool useSource
                 )
                 {
-                    AnimationFileInfo[] arr = ApplyFilterAndSort(list.ToList()).ToArray();
-                    sb.AppendLine($"== {inputTitle} ({arr.Length}) ==");
-                    foreach (AnimationFileInfo info in arr)
+                    var arr = ApplyFilterAndSort(list.ToList()).AsList();
+                    sb.AppendLine($"== {inputTitle} ({arr.Count}) ==");
+                    for (int i = 0; i < arr.Count; i++)
                     {
+                        AnimationFileInfo info = arr[i];
                         string path = useSource ? info.RelativePath : info.DestinationRelativePath;
                         sb.AppendLine(
                             $"[{(info.Selected ? 'x' : ' ')}] {info.FileName}  ->  {path}"
                         );
                     }
+
                     sb.AppendLine();
                 }
 

package/Editor/Sprites/AnimationCreator.cs

@@ -4,7 +4,6 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using System.Linq;
     using System.Text.RegularExpressions;
     using UnityEditor;
     using UnityEngine;
@@ -485,9 +484,17 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 bool matchesSearch = true;
                 if (searchTerms.Length > 0)
                 {
-                    matchesSearch = searchTerms.All(term =>
-                        currentName.Contains(term, StringComparison.OrdinalIgnoreCase)
-                    );
+                    for (int si = 0; si < searchTerms.Length; si++)
+                    {
+                        if (
+                            currentName.IndexOf(searchTerms[si], StringComparison.OrdinalIgnoreCase)
+                            < 0
+                        )
+                        {
+                            matchesSearch = false;
+                            break;
+                        }
+                    }
                 }
 
                 if (matchesSearch)
@@ -614,10 +621,21 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 );
             }
 
-            bool canBulkName =
-                animationData is { Count: > 0 }
-                && animationData.Any(data => data.frames?.Count > 0)
-                && !string.IsNullOrWhiteSpace(text);
+            bool canBulkName = animationData is { Count: > 0 } && !string.IsNullOrWhiteSpace(text);
+            if (canBulkName)
+            {
+                bool anyFrames = false;
+                for (int i = 0; i < animationData.Count; i++)
+                {
+                    List<Sprite> fr = animationData[i]?.frames;
+                    if (fr != null && fr.Count > 0)
+                    {
+                        anyFrames = true;
+                        break;
+                    }
+                }
+                canBulkName = anyFrames;
+            }
 
             using (new EditorGUI.DisabledScope(!canBulkName))
             {
@@ -694,16 +712,25 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 }
             }
 
-            if (
-                !canBulkName
-                && animationData is { Count: > 0 }
-                && animationData.Any(data => data.frames?.Count > 0)
-            )
+            if (!canBulkName && animationData is { Count: > 0 })
             {
-                EditorGUILayout.HelpBox(
-                    "Enter text in the 'Text' field above to enable bulk naming operations.",
-                    MessageType.Info
-                );
+                bool anyFrames = false;
+                for (int i = 0; i < animationData.Count; i++)
+                {
+                    List<Sprite> fr = animationData[i]?.frames;
+                    if (fr != null && fr.Count > 0)
+                    {
+                        anyFrames = true;
+                        break;
+                    }
+                }
+                if (anyFrames)
+                {
+                    EditorGUILayout.HelpBox(
+                        "Enter text in the 'Text' field above to enable bulk naming operations.",
+                        MessageType.Info
+                    );
+                }
             }
 
             EditorGUILayout.Space();
@@ -747,7 +774,16 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 foreach (AnimationData data in animationData)
                 {
                     string lowerName = (data.animationName ?? string.Empty).ToLowerInvariant();
-                    if (searchTerms.All(term => lowerName.Contains(term)))
+                    bool allMatch = true;
+                    for (int i = 0; i < searchTerms.Length; i++)
+                    {
+                        if (lowerName.IndexOf(searchTerms[i], StringComparison.Ordinal) < 0)
+                        {
+                            allMatch = false;
+                            break;
+                        }
+                    }
+                    if (allMatch)
                     {
                         dataToCreate.Add(data);
                     }
@@ -987,8 +1023,13 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             }
 
             List<string> searchPaths = new();
-            foreach (Object source in animationSources.Where(Objects.NotNull))
+            for (int i = 0; i < animationSources.Count; i++)
             {
+                Object source = animationSources[i];
+                if (source == null)
+                {
+                    continue;
+                }
                 string path = AssetDatabase.GetAssetPath(source);
                 if (!string.IsNullOrWhiteSpace(path) && AssetDatabase.IsValidFolder(path))
                 {
@@ -1291,7 +1332,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                         continue;
                     }
 
-                    bool hasAnyIndex = entries.Any(e => e.index >= 0);
+                    bool hasAnyIndex = entries.Exists(e => e.index >= 0);
                     if (strictNumericOrdering)
                     {
                         if (hasAnyIndex)
@@ -1445,7 +1486,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 string dir = kvp.Key;
                 foreach ((string baseKey, List<(int index, Sprite sprite)> entries) in kvp.Value)
                 {
-                    bool hasAnyIndex = entries.Any(e => e.index >= 0);
+                    bool hasAnyIndex = entries.Exists(e => e.index >= 0);
                     if (strictNumericOrdering)
                     {
                         if (hasAnyIndex)
@@ -1517,7 +1558,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                         folder = folderName,
                         baseName = baseKey,
                         count = entries.Count,
-                        hasIndex = entries.Any(e => e.index >= 0),
+                        hasIndex = entries.Exists(e => e.index >= 0),
                     };
                     _autoParsePreview.Add(rec);
                 }