chore: remove dead code and fix tests

bdunderscore · Nov 28, 2024 · 7867747 · 7867747
1 parent acdfd4c
commit 7867747
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 66 deletions.
diff --git a/Editor/API/BuildContext.cs b/Editor/API/BuildContext.cs
@@ -170,40 +170,6 @@ public SerializationScope OpenSerializationScope()
             return new SerializationScope(AssetSaver);
         }
 
-        private static readonly Regex WindowsReservedFileNames = new Regex(
-            "(CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])([.].*)?",
-            RegexOptions.IgnoreCase
-        );
-
-        private static readonly Regex WindowsReservedFileCharacters = new Regex(
-            "[<>:\"/\\\\|?*\x00-\x1f]",
-            RegexOptions.IgnoreCase
-        );
-
-        private static readonly Regex StripLeadingTrailingWhitespace = new Regex(
-            "^[\\s]*((?=\\S).*\\S)[\\s]*$"
-        );
-
-        internal static string FilterAvatarName(string avatarName)
-        {
-            avatarName = WindowsReservedFileCharacters.Replace(avatarName, "_");
-
-            if (WindowsReservedFileNames.IsMatch(avatarName))
-            {
-                avatarName = "_" + avatarName;
-            }
-
-            var match = StripLeadingTrailingWhitespace.Match(avatarName);
-            if (match.Success)
-            {
-                avatarName = match.Groups[1].Value;
-            } else {
-                avatarName = Guid.NewGuid().ToString();
-            }
-
-            return avatarName;
-        }
-
         public bool IsTemporaryAsset(UnityObject obj)
         {
             return AssetSaver.IsTemporaryAsset(obj);

diff --git a/Editor/API/Serialization/AssetSaver.cs b/Editor/API/Serialization/AssetSaver.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using nadena.dev.ndmf.runtime;
@@ -43,18 +44,8 @@ internal AssetSaver(string generatedAssetsRoot, string avatarName, int assetsPer
             // Ensure directory exists recursively
             if (!AssetDatabase.IsValidFolder(subAssetPath))
             {
-                var parts = subAssetPath.Split('/');
-                var currentPath = parts[0];
-
-                for (var i = 1; i < parts.Length; i++)
-                {
-                    if (!AssetDatabase.IsValidFolder(currentPath + "/" + parts[i]))
-                    {
-                        AssetDatabase.CreateFolder(currentPath, parts[i]);
-                    }
-
-                    currentPath += "/" + parts[i];
-                }
+                Directory.CreateDirectory(subAssetPath);
+                AssetDatabase.Refresh();
             }
 
             var rootAssetPath = AssetDatabase.GenerateUniqueAssetPath(rootPath + "/" + avatarName + ".asset");
@@ -137,7 +128,7 @@ public bool IsTemporaryAsset(UnityEngine.Object? obj)
             "^[\\s]*((?=\\S).*\\S)[\\s]*$"
         );
 
-        internal static string FilterAssetName(string assetName, string fallbackName)
+        internal static string FilterAssetName(string assetName, string? fallbackName = null)
         {
             assetName = WindowsReservedFileCharacters.Replace(assetName, "_");
 
@@ -151,12 +142,7 @@ internal static string FilterAssetName(string assetName, string fallbackName)
             {
                 assetName = match.Groups[1].Value;
             } else {
-                assetName = Guid.NewGuid().ToString();
-            }
-
-            if (string.IsNullOrWhiteSpace(assetName))
-            {
-                assetName = fallbackName;
+                assetName = fallbackName ?? Guid.NewGuid().ToString();
             }
 
             return assetName;

diff --git a/UnitTests~/AvatarNameFilterTests.cs b/UnitTests~/AvatarNameFilterTests.cs
@@ -1,6 +1,7 @@
 using System;
 using nadena.dev.ndmf;
 using NUnit.Framework;
+using UnityEditor;
 
 namespace UnitTests
 {
@@ -11,51 +12,56 @@ public void TestAvatarNameFilter()
         {
             Assert.AreEqual(
                 "foo",
-                BuildContext.FilterAvatarName("foo")
+                AssetSaver.FilterAssetName("foo")
             );
 
             Assert.AreEqual(
                 "_con",
-                BuildContext.FilterAvatarName("con")
+                AssetSaver.FilterAssetName("con")
             );
 
             Assert.AreEqual(
                 "_LPT4",
-                BuildContext.FilterAvatarName("LPT4")
+                AssetSaver.FilterAssetName("LPT4")
             );
 
             Assert.AreEqual(
                 "_AUX.avatar",
-                BuildContext.FilterAvatarName("AUX.avatar")
+                AssetSaver.FilterAssetName("AUX.avatar")
             );
 
             Assert.AreEqual(
                 "foo_bar",
-                BuildContext.FilterAvatarName("foo/bar")
+                AssetSaver.FilterAssetName("foo/bar")
             );
 
             Assert.AreEqual(
                 "foo_bar_baz_quux",
-                BuildContext.FilterAvatarName("foo\\bar?baz*quux")
+                AssetSaver.FilterAssetName("foo\\bar?baz*quux")
             );
 
             Assert.AreEqual(
                 "foo",
-                BuildContext.FilterAvatarName(" foo")
+                AssetSaver.FilterAssetName(" foo")
             );
 
             Assert.AreEqual(
                 "foo",
-                BuildContext.FilterAvatarName("foo ")
+                AssetSaver.FilterAssetName("foo ")
             );
             Assert.AreEqual(
                 "f",
-                BuildContext.FilterAvatarName(" f ")
+                AssetSaver.FilterAssetName(" f ")
             );
 
             Assert.AreEqual(
                 Guid.NewGuid().ToString().Length,
-                BuildContext.FilterAvatarName("   ").Length
+                AssetSaver.FilterAssetName("   ").Length
+            );
+
+            Assert.AreEqual(
+                "fallback",
+                AssetSaver.FilterAssetName("   ", "fallback")
             );
         }
     }

diff --git a/UnitTests~/SerializationSweepTest.cs b/UnitTests~/SerializationSweepTest.cs
@@ -42,10 +42,14 @@ public void testSerialization()
             bc.Serialize();
 
             var path = AssetDatabase.GetAssetPath(testScriptable1);
+            var pathParts = path.Split('/');
+            Assert.AreEqual("_assets", pathParts[^2]);
+            var avatarRootPath = string.Join("/", pathParts[..^2]);
+
             Assert.IsFalse(string.IsNullOrEmpty(path));
-            Assert.AreEqual(path, AssetDatabase.GetAssetPath(testScriptable2));
-            Assert.AreEqual(path, AssetDatabase.GetAssetPath(testScriptable3));
-            Assert.AreEqual(path, AssetDatabase.GetAssetPath(testScriptable4));
+            Assert.IsTrue(AssetDatabase.GetAssetPath(testScriptable2).StartsWith(avatarRootPath));
+            Assert.IsTrue(AssetDatabase.GetAssetPath(testScriptable3).StartsWith(avatarRootPath));
+            Assert.IsTrue(AssetDatabase.GetAssetPath(testScriptable4).StartsWith(avatarRootPath));
 
             Assert.IsTrue(string.IsNullOrEmpty(AssetDatabase.GetAssetPath(testComponent)));
             Assert.IsTrue(string.IsNullOrEmpty(AssetDatabase.GetAssetPath(root)));