com.wallstop-studios.unity-helpers 2.0.0-rc73 → 2.0.0-rc73.10

package/Editor/AnimationCopier.cs

@@ -9,6 +9,7 @@
     using UnityEditor;
     using UnityEngine;
     using Core.Extension;
+    using Core.Helper;
 
     public sealed class AnimationCopierWindow : EditorWindow
     {
@@ -58,7 +59,7 @@
             public string DestinationRelativePath { get; set; }
         }
 
-        [MenuItem("Tools/Wallstop Studios/Unity Helpers/Animation Copier Window", priority = -2)]
+        [MenuItem("Tools/Wallstop Studios/Unity Helpers/Animation Copier", priority = -2)]
         public static void ShowWindow()
         {
             GetWindow<AnimationCopierWindow>("Animation Copier");
@@ -185,7 +186,7 @@
                     if (newRelPath != null)
                     {
                         relativePath = newRelPath;
-                        fullPath = selectedPath.Replace(Path.DirectorySeparatorChar, '/');
+                        fullPath = selectedPath.SanitizePath();
                         EditorPrefs.SetString(prefKey, relativePath);
                         this.Log($"{label} set to: {relativePath}");
                         ValidatePaths();
@@ -436,7 +437,10 @@
                     string sourceRelPath = AssetDatabase.GUIDToAssetPath(guid);
                     if (
                         string.IsNullOrWhiteSpace(sourceRelPath)
-                        || !sourceRelPath.StartsWith(_animationSourcePathRelative)
+                        || !sourceRelPath.StartsWith(
+                            _animationSourcePathRelative,
+                            StringComparison.OrdinalIgnoreCase
+                        )
                     )
                     {
                         continue;
@@ -460,7 +464,7 @@
                         FileName = Path.GetFileName(sourceRelPath),
                         RelativeDirectory = GetRelativeSubPath(
                             _animationSourcePathRelative,
-                            directoryName.Replace(Path.DirectorySeparatorChar, '/')
+                            directoryName.SanitizePath()
                         ),
                         Hash = CalculateFileHash(sourceFullPath),
                     };
@@ -469,7 +473,7 @@
                             fileInfo.RelativeDirectory,
                             fileInfo.FileName
                         )
-                        .Replace(Path.DirectorySeparatorChar, '/');
+                        .SanitizePath();
                     _sourceAnimations.Add(fileInfo);
 
                     EditorUtility.DisplayProgressBar(
@@ -505,7 +509,10 @@
                     else
                     {
                         string destHash = CalculateFileHash(destFullPath);
-                        if (string.IsNullOrEmpty(sourceInfo.Hash) || string.IsNullOrEmpty(destHash))
+                        if (
+                            string.IsNullOrWhiteSpace(sourceInfo.Hash)
+                            || string.IsNullOrWhiteSpace(destHash)
+                        )
                         {
                             this.LogWarn(
                                 $"Could not compare '{sourceInfo.FileName}' due to hashing error. Treating as 'Changed'."
@@ -593,8 +600,32 @@
 
             int successCount = 0;
             int errorCount = 0;
-            AssetDatabase.StartAssetEditing();
+            foreach (AnimationFileInfo animInfo in animationsToCopy)
+            {
+                string destinationAssetPath = animInfo.DestinationRelativePath;
+                string destDirectory = Path.GetDirectoryName(destinationAssetPath).SanitizePath();
+
+                if (
+                    string.IsNullOrWhiteSpace(destDirectory)
+                    || AssetDatabase.IsValidFolder(destDirectory)
+                )
+                {
+                    continue;
+                }
 
+                try
+                {
+                    EnsureDirectoryExists(destDirectory);
+                }
+                catch (Exception ex)
+                {
+                    this.LogError(
+                        $"Failed to create destination directory '{destDirectory}' for animation '{animInfo.FileName}'. Error: {ex.Message}. Skipping."
+                    );
+                }
+            }
+
+            AssetDatabase.StartAssetEditing();
             try
             {
                 for (int i = 0; i < animationsToCopy.Count; i++)
@@ -615,27 +646,6 @@
 
                     string sourceAssetPath = animInfo.RelativePath;
                     string destinationAssetPath = animInfo.DestinationRelativePath;
-                    string destDirectory = Path.GetDirectoryName(destinationAssetPath);
-
-                    if (
-                        !string.IsNullOrEmpty(destDirectory)
-                        && !AssetDatabase.IsValidFolder(destDirectory)
-                    )
-                    {
-                        try
-                        {
-                            EnsureDirectoryExists(destDirectory);
-                        }
-                        catch (Exception ex)
-                        {
-                            this.LogError(
-                                $"Failed to create destination directory '{destDirectory}' for animation '{animInfo.FileName}'. Error: {ex.Message}. Skipping."
-                            );
-                            errorCount++;
-                            continue;
-                        }
-                    }
-
                     bool copySuccessful = AssetDatabase.CopyAsset(
                         sourceAssetPath,
                         destinationAssetPath
@@ -784,7 +794,7 @@
                 return null;
             }
 
-            fullPath = fullPath.Replace(Path.DirectorySeparatorChar, '/');
+            fullPath = fullPath.SanitizePath();
             if (
                 fullPath.EndsWith("/Assets", StringComparison.OrdinalIgnoreCase)
                 && Path.GetFileName(fullPath).Equals("Assets", StringComparison.OrdinalIgnoreCase)
@@ -793,7 +803,7 @@
                 return "Assets";
             }
 
-            string assetsPath = Application.dataPath.Replace(Path.DirectorySeparatorChar, '/');
+            string assetsPath = Application.dataPath.SanitizePath();
             if (fullPath.StartsWith(assetsPath, StringComparison.OrdinalIgnoreCase))
             {
                 if (fullPath.Length == assetsPath.Length)
@@ -828,7 +838,7 @@
 
             if (relativePath.Equals("Assets", StringComparison.OrdinalIgnoreCase))
             {
-                return Application.dataPath.Replace(Path.DirectorySeparatorChar, '/');
+                return Application.dataPath.SanitizePath();
             }
 
             if (relativePath.StartsWith("Assets/", StringComparison.OrdinalIgnoreCase))
@@ -837,7 +847,7 @@
                     0,
                     Application.dataPath.Length - "Assets".Length
                 );
-                return (projectRoot + relativePath).Replace(Path.DirectorySeparatorChar, '/');
+                return (projectRoot + relativePath).SanitizePath();
             }
             return null;
         }
@@ -866,28 +876,28 @@
             return string.Empty;
         }
 
-        private static string CalculateFileHash(string filePath)
+        private string CalculateFileHash(string filePath)
         {
             try
             {
-                using (MD5 md5 = MD5.Create())
-                using (FileStream stream = File.OpenRead(filePath))
-                {
-                    byte[] hashBytes = md5.ComputeHash(stream);
-                    return BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
-                }
+                using MD5 md5 = MD5.Create();
+                using FileStream stream = File.OpenRead(filePath);
+                byte[] hashBytes = md5.ComputeHash(stream);
+                return BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
             }
             catch (IOException ioEx)
             {
-                Debug.LogError(
-                    $"[AnimationCopierWindow] IO Error calculating hash for {filePath}: {ioEx.Message}"
+                this.LogError(
+                    $"[AnimationCopierWindow] IO Error calculating hash for {filePath}.",
+                    ioEx
                 );
                 return string.Empty;
             }
             catch (Exception ex)
             {
-                Debug.LogError(
-                    $"[AnimationCopierWindow] Error calculating hash for {filePath}: {ex.Message}"
+                this.LogError(
+                    $"[AnimationCopierWindow] Error calculating hash for {filePath}.",
+                    ex
                 );
                 return string.Empty;
             }
@@ -899,6 +909,7 @@
             {
                 return;
             }
+
             if (!relativeDirectoryPath.StartsWith("Assets/"))
             {
                 if (relativeDirectoryPath.Equals("Assets", StringComparison.OrdinalIgnoreCase))
@@ -920,17 +931,15 @@
                 return;
             }
 
-            string parentPath = Path.GetDirectoryName(relativeDirectoryPath)
-                ?.Replace(Path.DirectorySeparatorChar, '/');
-
+            string parentPath = Path.GetDirectoryName(relativeDirectoryPath).SanitizePath();
             if (
-                string.IsNullOrEmpty(parentPath)
+                string.IsNullOrWhiteSpace(parentPath)
                 || parentPath.Equals("Assets", StringComparison.OrdinalIgnoreCase)
             )
             {
                 string folderNameToCreate = Path.GetFileName(relativeDirectoryPath);
                 if (
-                    !string.IsNullOrEmpty(folderNameToCreate)
+                    !string.IsNullOrWhiteSpace(folderNameToCreate)
                     && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
                 )
                 {
@@ -940,10 +949,9 @@
             }
 
             EnsureDirectoryExists(parentPath);
-
             string currentFolderName = Path.GetFileName(relativeDirectoryPath);
             if (
-                !string.IsNullOrEmpty(currentFolderName)
+                !string.IsNullOrWhiteSpace(currentFolderName)
                 && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
             )
             {

package/Editor/AnimationCreator.cs

@@ -7,8 +7,10 @@
     using System.IO;
     using System.Linq;
     using System.Text.RegularExpressions;
+    using Core.Helper;
     using UnityEditor;
     using UnityEngine;
+    using Utils;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -25,6 +27,8 @@
 
     public sealed class AnimationCreatorWindow : EditorWindow
     {
+        private static readonly char[] WhiteSpaceSplitters = { ' ', '\t', '\n', '\r' };
+
         private SerializedObject _serializedObject;
         private SerializedProperty _animationDataProp;
         private SerializedProperty _animationSourcesProp;
@@ -87,7 +91,7 @@
             else if (
                 _animationSourcesProp.arraySize == 0
                 || _animationSourcesProp.FindPropertyRelative("Array.size").intValue == 0
-                || animationSources.TrueForAll(s => s == null)
+                || animationSources.TrueForAll(Objects.Null)
             )
             {
                 EditorGUILayout.HelpBox(
@@ -136,7 +140,7 @@
                 return;
             }
 
-            absolutePath = absolutePath.Replace("\\", "/");
+            absolutePath = absolutePath.SanitizePath();
             if (absolutePath.StartsWith(Application.dataPath, StringComparison.OrdinalIgnoreCase))
             {
                 string relativePath =
@@ -205,10 +209,7 @@
             int listSize = _animationDataProp.arraySize;
             string[] searchTerms = string.IsNullOrWhiteSpace(_searchString)
                 ? Array.Empty<string>()
-                : _searchString.Split(
-                    new[] { ' ', '\t', '\n', '\r' },
-                    StringSplitOptions.RemoveEmptyEntries
-                );
+                : _searchString.Split(WhiteSpaceSplitters, StringSplitOptions.RemoveEmptyEntries);
 
             List<int> matchingIndices = new();
             for (int i = 0; i < listSize; ++i)
@@ -219,7 +220,7 @@
                 );
 
                 string currentName =
-                    nameProp != null ? (nameProp.stringValue ?? string.Empty) : string.Empty;
+                    nameProp != null ? nameProp.stringValue ?? string.Empty : string.Empty;
 
                 bool matchesSearch = true;
                 if (searchTerms.Length > 0)
@@ -245,7 +246,7 @@
 
             if (_animationDataIsExpanded)
             {
-                EditorGUI.indentLevel++;
+                using GUIIndentScope indent = new();
                 if (matchCount > 0)
                 {
                     foreach (int index in matchingIndices)
@@ -273,8 +274,6 @@
                         MessageType.Info
                     );
                 }
-
-                EditorGUI.indentLevel--;
             }
         }
 
@@ -439,14 +438,14 @@
             }
 
             EditorGUILayout.Space();
-            using (new EditorGUI.DisabledScope(animationData == null || animationData.Count == 0))
+            using (new EditorGUI.DisabledScope(animationData is not { Count: > 0 }))
             {
                 if (GUILayout.Button("Create Animations"))
                 {
                     CreateAnimations();
                 }
             }
-            if (animationData == null || animationData.Count == 0)
+            if (animationData is not { Count: > 0 })
             {
                 EditorGUILayout.HelpBox(
                     "Add Animation Data entries before creating.",
@@ -457,7 +456,7 @@
 
         private void CreateAnimations()
         {
-            if (animationData is not { Count: not 0 })
+            if (animationData is not { Count: > 0 })
             {
                 this.LogError($"No animation data to create.");
                 return;
@@ -532,7 +531,7 @@
                     }
 
                     List<Sprite> frames = data.frames;
-                    if (frames is not { Count: not 0 })
+                    if (frames is not { Count: > 0 })
                     {
                         this.LogWarn(
                             $"Ignoring animation '{animationName}' because it has no frames."
@@ -596,7 +595,7 @@
 
                     string firstFramePath = AssetDatabase.GetAssetPath(validFrames[0]);
                     string assetPath =
-                        Path.GetDirectoryName(firstFramePath)?.Replace("\\", "/") ?? "Assets";
+                        Path.GetDirectoryName(firstFramePath).SanitizePath() ?? "Assets";
                     if (!assetPath.EndsWith("/"))
                     {
                         assetPath += "/";
@@ -659,7 +658,7 @@
             _matchedSpriteCount = 0;
             _unmatchedSpriteCount = 0;
 
-            if (animationSources is not { Count: not 0 } || _compiledRegex == null)
+            if (animationSources is not { Count: > 0 } || _compiledRegex == null)
             {
                 if (_compiledRegex == null && !string.IsNullOrWhiteSpace(spriteNameRegex))
                 {
@@ -667,7 +666,7 @@
                         $"Cannot find sprites, regex pattern '{spriteNameRegex}' is invalid."
                     );
                 }
-                else if (animationSources is not { Count: not 0 })
+                else if (animationSources is not { Count: > 0 })
                 {
                     this.LogWarn($"Cannot find sprites, no animation sources specified.");
                 }
@@ -675,13 +674,8 @@
             }
 
             List<string> searchPaths = new();
-            foreach (Object source in animationSources)
+            foreach (Object source in animationSources.Where(Objects.NotNull))
             {
-                if (source == null)
-                {
-                    continue;
-                }
-
                 string path = AssetDatabase.GetAssetPath(source);
                 if (!string.IsNullOrWhiteSpace(path) && AssetDatabase.IsValidFolder(path))
                 {
@@ -781,8 +775,7 @@
                     }
 
                     string assetPath = AssetDatabase.GetAssetPath(sprite);
-                    string directoryPath =
-                        Path.GetDirectoryName(assetPath)?.Replace("\\", "/") ?? "";
+                    string directoryPath = Path.GetDirectoryName(assetPath).SanitizePath() ?? "";
                     string frameName = sprite.name;
 
                     int splitIndex = frameName.LastIndexOf('_');

package/Editor/AnimationEventEditor.cs

@@ -9,6 +9,7 @@
     using UnityEngine;
     using Core.Attributes;
     using Core.Helper;
+    using Utils;
     using WallstopStudios.UnityHelpers.Utils;
 
     // https://gist.githubusercontent.com/yujen/5e1cd78e2a341260b38029de08a449da/raw/ac60c1002e0e14375de5b2b0a167af00df3f74b4/SeniaAnimationEventEditor.cs
@@ -172,16 +173,15 @@
 
                 DrawSpritePreview(item);
 
-                EditorGUI.indentLevel++;
-                RenderAnimationEventItem(item, frame, frameRate);
-
-                if (i != stateCopy.Count - 1)
+                using (new GUIIndentScope())
                 {
-                    DrawGuiLine(height: 3, color: new Color(0f, 1f, 0.3f, 1f));
-                    EditorGUILayout.Space();
+                    RenderAnimationEventItem(item, frame, frameRate);
+                    if (i != stateCopy.Count - 1)
+                    {
+                        DrawGuiLine(height: 3, color: new Color(0f, 1f, 0.3f, 1f));
+                        EditorGUILayout.Space();
+                    }
                 }
-
-                EditorGUI.indentLevel--;
             }
 
             EditorGUILayout.EndScrollView();
@@ -320,8 +320,7 @@
         private void RenderAnimationEventItem(AnimationEventItem item, int frame, float frameRate)
         {
             int index = _state.IndexOf(item);
-            EditorGUILayout.BeginHorizontal();
-            try
+            using (new GUIHorizontalScope())
             {
                 if (
                     1 <= index
@@ -369,10 +368,6 @@
                     return;
                 }
             }
-            finally
-            {
-                EditorGUILayout.EndHorizontal();
-            }
 
             IReadOnlyDictionary<Type, IReadOnlyList<MethodInfo>> lookup = FilterLookup(item);
 
@@ -541,7 +536,7 @@
             ParameterInfo[] arrayParameterInfo = item.selectedMethod.GetParameters();
             if (arrayParameterInfo.Length == 1)
             {
-                EditorGUI.indentLevel++;
+                using GUIIndentScope indent = new();
 
                 Type paramType = arrayParameterInfo[0].ParameterType;
                 if (paramType == typeof(int))
@@ -602,8 +597,6 @@
                         true
                     );
                 }
-
-                EditorGUI.indentLevel--;
             }
         }
 
@@ -686,8 +679,7 @@
             }
             else if (!item.isTextureReadable && !string.IsNullOrEmpty(spriteName))
             {
-                EditorGUILayout.BeginHorizontal();
-                try
+                using (new GUIHorizontalScope())
                 {
                     GUILayout.Label($"Sprite '{spriteName}' required \"Read/Write\" enabled");
                     if (item.sprite != null && GUILayout.Button("Fix"))
@@ -711,10 +703,6 @@
                         EditorUtility.SetDirty(item.sprite);
                     }
                 }
-                finally
-                {
-                    EditorGUILayout.EndHorizontal();
-                }
             }
             else if (item.isInvalidTextureRect && !string.IsNullOrEmpty(spriteName))
             {

package/Editor/FitTextureSizeWindow.cs

@@ -40,7 +40,7 @@
                 nameof(_textureSourcePaths)
             );
 
-            if (_textureSourcePaths != null && _textureSourcePaths.Count != 0)
+            if (_textureSourcePaths is { Count: > 0 })
             {
                 return;
             }
@@ -336,6 +336,14 @@
                         _ = updatedImporters.Remove(textureImporter);
                     }
                 }
+            }
+            finally
+            {
+                if (applyChanges)
+                {
+                    AssetDatabase.StopAssetEditing();
+                }
+                EditorUtility.ClearProgressBar();
 
                 if (applyChanges)
                 {
@@ -356,14 +364,6 @@
                     }
                 }
             }
-            finally
-            {
-                if (applyChanges)
-                {
-                    AssetDatabase.StopAssetEditing();
-                }
-                EditorUtility.ClearProgressBar();
-            }
             return changedCount;
         }
     }

package/Editor/PrefabChecker.cs

@@ -12,6 +12,7 @@
     using Core.Attributes;
     using Core.Extension;
     using Core.Helper;
+    using Utils;
     using WallstopStudios.UnityHelpers.Utils;
     using Object = UnityEngine.Object;
 
@@ -91,7 +92,8 @@
         {
             EditorGUILayout.LabelField("Validation Checks", EditorStyles.boldLabel);
 
-            var drawRightAlignedToggle = SetupDrawRightAlignedToggle();
+            Func<GUIContent, bool, float?, bool, bool> drawRightAlignedToggle =
+                SetupDrawRightAlignedToggle();
 
             float targetAlignmentX = 0f;
             bool alignmentCalculated = false;
@@ -147,23 +149,16 @@
             GUI.enabled = wasEnabled && _checkNullObjectReferences;
             try
             {
-                EditorGUI.indentLevel++;
-                try
-                {
-                    DrawAndAlign(
-                        new GUIContent(
-                            "Only if [ValidateAssignment]",
-                            "Only report null object references if the field has the [ValidateAssignment] attribute."
-                        ),
-                        () => _onlyCheckNullObjectsWithAttribute,
-                        v => _onlyCheckNullObjectsWithAttribute = v,
-                        true
-                    );
-                }
-                finally
-                {
-                    EditorGUI.indentLevel--;
-                }
+                using GUIIndentScope indent = new();
+                DrawAndAlign(
+                    new GUIContent(
+                        "Only if [ValidateAssignment]",
+                        "Only report null object references if the field has the [ValidateAssignment] attribute."
+                    ),
+                    () => _onlyCheckNullObjectsWithAttribute,
+                    v => _onlyCheckNullObjectsWithAttribute = v,
+                    true
+                );
             }
             finally
             {
@@ -373,7 +368,7 @@
 
         private void RunChecks()
         {
-            if (_assetPaths == null || _assetPaths.Count == 0)
+            if (_assetPaths is not { Count: > 0 })
             {
                 this.LogError($"No asset paths specified. Add folders containing prefabs.");
                 return;