fix: clean group name internally (close: #27)

favoyang · May 18, 2020 · f99b399 · f99b399
1 parent c366986
commit f99b399
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/Editor/AddressableImportRule.cs b/Editor/AddressableImportRule.cs
@@ -56,6 +56,15 @@ public class AddressableImportRule
     [Tooltip("The group name in which the Addressable will be added. Leave blank for the default group.")]
     public string groupName;
 
+    /// <summary>
+    /// Cleaned group name.
+    /// </summary>
+    string CleanedGroupName {
+        get {
+            return groupName.Trim().Replace('/', '-').Replace('\\', '-');
+        }
+    }
+
     /// <summary>
     /// Defines if labels will be added or replaced.
     /// </summary>
@@ -134,7 +143,7 @@ public string ParseGroupReplacement(string assetPath)
         if (string.IsNullOrWhiteSpace(path) || string.IsNullOrWhiteSpace(groupName))
             return null;
         // Parse path elements.
-        var replacement = AddressableImportRegex.ParsePath(assetPath, groupName);
+        var replacement = AddressableImportRegex.ParsePath(assetPath, CleanedGroupName);
         // Parse this.path regex.
         if (matchType == AddressableImportRuleMatchType.Regex) {
             string pathRegex = path;

diff --git a/Tests/Editor/AddressableImportRuleTests.cs b/Tests/Editor/AddressableImportRuleTests.cs
@@ -58,14 +58,30 @@ public void ParseGroupReplacementTest()
             rule.path = " ";
             rule.groupName = "somegroup";
             Assert.IsNull(rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
-            // Test empy groupName
+            // Test empty groupName
             rule.matchType = AddressableImportRuleMatchType.Wildcard;
-            rule.path = @"Assets/Sprites/*/*.png";
+            rule.path = "Assets/Sprites/*/*.png";
             rule.groupName = "";
             Assert.IsNull(rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
             rule.path = "Assets/Sprites/*/*.png";
             rule.groupName = " ";
             Assert.IsNull(rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
+            // Test empty spaces in groupName
+            rule.matchType = AddressableImportRuleMatchType.Wildcard;
+            rule.path = "Assets/Sprites/*/*.png";
+            rule.groupName = " group-a";
+            Assert.AreEqual("group-a", rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
+            rule.groupName = "group-a ";
+            Assert.AreEqual("group-a", rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
+            rule.groupName = " group-a ";
+            Assert.AreEqual("group-a", rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
+            // Test splash in groupName
+            rule.matchType = AddressableImportRuleMatchType.Wildcard;
+            rule.path = "Assets/Sprites/*/*.png";
+            rule.groupName = "group/a";
+            Assert.AreEqual("group-a", rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
+            rule.groupName = @"group\a ";
+            Assert.AreEqual("group-a", rule.ParseGroupReplacement("Assets/Sprites/cat/cat.png"));
             // Test static groupName
             rule.matchType = AddressableImportRuleMatchType.Wildcard;
             rule.path = "Assets/Sprites/*/*.png";