com.wallstop-studios.unity-helpers 2.0.0-rc73.3 → 2.0.0-rc73.5

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/Runtime/Core/Helper/PathHelper.cs

@@ -1,6 +1,7 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo(assemblyName: "WallstopStudios.UnityHelpers.Styles")]
+[assembly: InternalsVisibleTo(assemblyName: "WallstopStudios.UnityHelpers.Editor")]
 
 namespace WallstopStudios.UnityHelpers.Core.Helper
 {
@@ -8,7 +9,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
     {
         public static string SanitizePath(this string path)
         {
-            return path.Replace('\\', '/');
+            return path?.Replace('\\', '/');
         }
     }
 }

package/Styles/Elements/Progress/MarchingAntsProgressBar.cs

@@ -13,16 +13,16 @@
             Vertical = 1,
         }
 
-        public const string ussClassName = "marching-ants-progress-bar";
-        public const string ussTrackClassName = ussClassName + "__track";
-        public const string ussFillContainerClassName = ussClassName + "__fill-container";
-        public const string ussFillClassName = ussClassName + "__fill";
-        public const string ussTrackColorVarName = "--ants-track-color";
-        public const string ussProgressColorVarName = "--ants-progress-color";
-        public const string ussThicknessVarName = "--ants-thickness";
-        public const string ussBorderRadiusVarName = "--ants-border-radius";
-        public const string ussDashOnVarName = "--ants-dash-on";
-        public const string ussDashOffVarName = "--ants-dash-off";
+        public const string USSClassName = "marching-ants-progress-bar";
+        public const string USSTrackClassName = USSClassName + "__track";
+        public const string USSFillContainerClassName = USSClassName + "__fill-container";
+        public const string USSFillClassName = USSClassName + "__fill";
+        public const string USSTrackColorVarName = "--ants-track-color";
+        public const string USSProgressColorVarName = "--ants-progress-color";
+        public const string USSThicknessVarName = "--ants-thickness";
+        public const string USSBorderRadiusVarName = "--ants-border-radius";
+        public const string USSDashOnVarName = "--ants-dash-on";
+        public const string USSDashOffVarName = "--ants-dash-off";
 
         private readonly VisualElement _trackElement;
         private readonly VisualElement _fillContainer;
@@ -288,9 +288,9 @@
 
         public MarchingAntsProgressBar()
         {
-            AddToClassList(ussClassName);
+            AddToClassList(USSClassName);
             _trackElement = new VisualElement { name = "track", pickingMode = PickingMode.Ignore };
-            _trackElement.AddToClassList(ussTrackClassName);
+            _trackElement.AddToClassList(USSTrackClassName);
             _trackElement.style.position = Position.Absolute;
             _trackElement.style.left = 0;
             _trackElement.style.top = 0;
@@ -303,7 +303,7 @@
                 name = "fill-container",
                 pickingMode = PickingMode.Ignore,
             };
-            _fillContainer.AddToClassList(ussFillContainerClassName);
+            _fillContainer.AddToClassList(USSFillContainerClassName);
             _fillContainer.style.overflow = Overflow.Hidden;
             _fillContainer.style.position = Position.Absolute;
             _fillContainer.style.left = 0;
@@ -312,7 +312,7 @@
             _fillContainer.style.height = Length.Percent(100);
             Add(_fillContainer);
             _fillElement = new VisualElement { name = "fill", pickingMode = PickingMode.Ignore };
-            _fillElement.AddToClassList(ussFillClassName);
+            _fillElement.AddToClassList(USSFillClassName);
             _fillElement.style.position = Position.Absolute;
             _fillElement.style.left = 0;
             _fillElement.style.top = 0;
@@ -453,7 +453,7 @@
         {
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<Color>(ussTrackColorVarName),
+                    new CustomStyleProperty<Color>(USSTrackColorVarName),
                     out Color tc
                 )
             )
@@ -463,7 +463,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<Color>(ussProgressColorVarName),
+                    new CustomStyleProperty<Color>(USSProgressColorVarName),
                     out Color pc
                 )
             )
@@ -473,7 +473,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussThicknessVarName),
+                    new CustomStyleProperty<float>(USSThicknessVarName),
                     out float th
                 )
             )
@@ -483,7 +483,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussBorderRadiusVarName),
+                    new CustomStyleProperty<float>(USSBorderRadiusVarName),
                     out float br
                 )
             )
@@ -493,7 +493,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussDashOnVarName),
+                    new CustomStyleProperty<float>(USSDashOnVarName),
                     out float don
                 )
             )
@@ -503,7 +503,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussDashOffVarName),
+                    new CustomStyleProperty<float>(USSDashOffVarName),
                     out float doff
                 )
             )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc73.3",
+  "version": "2.0.0-rc73.5",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -39,3 +39,5 @@
 
 
 
+
+