fix: Fix to get all collections from StringTableCollectionBundle

Assets/Plugins/LocalizationExtension/Editor/AssetTool/AssetFinding.cs

@@ -8,11 +8,16 @@ namespace Tsgcpp.Localization.Extension.Editor
 {
     public static class AssetFinding
     {
-        public static IReadOnlyList<T> FindAssetsInFolders<T>(IReadOnlyList<DefaultAsset> folders) where T : UnityEngine.Object
+        public static IReadOnlyList<T> FindAssets<T>(DefaultAsset folder) where T : UnityEngine.Object
+        {
+            return FindAssets<T>(new List<DefaultAsset> { folder });
+        }
+
+        public static IReadOnlyList<T> FindAssets<T>(IReadOnlyList<DefaultAsset> folders) where T : UnityEngine.Object
         {
             if (folders == null)
             {
-                throw new NullReferenceException("folders is null.");
+                return new List<T>();
             }
 
             var folderPathList = folders
@@ -22,10 +27,14 @@ public static IReadOnlyList<T> FindAssetsInFolders<T>(IReadOnlyList<DefaultAsset
                 .Where(path => Directory.Exists(path))
                 .ToList();
 
+            if (folderPathList.Count <= 0)
+            {
+                return new List<T>();
+            }
+
             var assets = AssetDatabase
-                .FindAssets($"t:{typeof(T).Name}")
+                .FindAssets($"t:{typeof(T).Name}", searchInFolders: folderPathList.ToArray())
                 .Select(AssetDatabase.GUIDToAssetPath)
-                .Where(path => folderPathList.Any(folderPath => path.StartsWith(folderPath)))
                 .OrderBy(path => path)
                 .Distinct()
                 .Select(AssetDatabase.LoadAssetAtPath<T>)

Assets/Plugins/LocalizationExtension/Editor/Google/StringTableCollection/StringTableCollectionBundle.cs

@@ -26,7 +26,7 @@ public sealed class StringTableCollectionBundle : ScriptableObject, ITargetFolde
         public float SleepSecondsPerRequest => _sleepSecondsPerRequest;
 
         public IReadOnlyList<StringTableCollection> StringTableCollections =>
-            AssetFinding.FindAssetsInFolders<StringTableCollection>(TargetFolders);
+            AssetFinding.FindAssets<StringTableCollection>(TargetFolders);
 
         public void PullAllLocales(
             bool removeMissingEntries = false,

Assets/Plugins/LocalizationExtension/Editor/Google/StringTableCollection/StringTableCollectionBundleEditor.cs

@@ -13,6 +13,10 @@ public sealed class StringTableCollectionBundleEditor : UnityEditor.Editor
     {
         private StringTableCollectionBundle Bundle => target as StringTableCollectionBundle;
 
+        private CacheListConverter<DefaultAsset, StringTableCollection> _stringTableCollectionsConverter = null;
+        public CacheListConverter<DefaultAsset, StringTableCollection> StringTableCollectionsConverter =>
+            _stringTableCollectionsConverter ??= new CacheListConverter<DefaultAsset, StringTableCollection>(actualConverter: new FolderToCollectionConverter(Bundle));
+
         public override void OnInspectorGUI()
         {
             DrawDefaultInspector();
@@ -30,7 +34,7 @@ public override void OnInspectorGUI()
         private void DrawToolsWithSheetsServiceProvider()
         {
             EditorGUILayout.LabelField("Tools (using SheetsServiceProvider)", EditorStyles.boldLabel);
-            using var h = new GUILayout.HorizontalScope();
+            using var h = new EditorGUILayout.HorizontalScope();
             if (GUILayout.Button("Pull All Locales"))
             {
                 var serviceProvider = GetSheetsServiceProvider();
@@ -47,7 +51,7 @@ private void DrawToolsWithSheetsServiceProvider()
         private void DrawToolsWithServiceAccount()
         {
             EditorGUILayout.LabelField("Tools (using Google Service Account)", EditorStyles.boldLabel);
-            using var h = new GUILayout.HorizontalScope();
+            using var h = new EditorGUILayout.HorizontalScope();
             if (GUILayout.Button("Pull All Locales"))
             {
                 PullWithGoogleServiceAccount();
@@ -60,9 +64,6 @@ private void DrawToolsWithServiceAccount()
         }
 
         private bool _showStringTableCollections = true;
-        private readonly CacheListConverter<DefaultAsset, StringTableCollection> _stringTableCollectionsConverter =
-            new CacheListConverter<DefaultAsset, StringTableCollection>(
-                actualConverter: new FolderToCollectionConverter());
 
         private void DrawStringTableCollections()
         {
@@ -80,7 +81,13 @@ private void DrawStringTableCollections()
             using var h = new EditorGUILayout.VerticalScope(GUI.skin.box);
             using var g = new EditorGUI.DisabledGroupScope(true);
 
-            var stringTableCollections = _stringTableCollectionsConverter.Convert(Bundle.TargetFolders);
+            var stringTableCollections = StringTableCollectionsConverter.Convert(Bundle.TargetFolders);
+            if (stringTableCollections.Count <= 0)
+            {
+                EditorGUILayout.LabelField("No \"StringTableCollection\"s.");
+                return;
+            }
+
             foreach (var collection in stringTableCollections)
             {
                 EditorGUILayout.ObjectField(collection, typeof(StringTableCollection), allowSceneObjects: false);
@@ -136,9 +143,16 @@ private ServiceAccountSheetsServiceProvider CreateServiceAccountSheetsServicePro
 
         private sealed class FolderToCollectionConverter : IListConverter<DefaultAsset, StringTableCollection>
         {
+            private readonly StringTableCollectionBundle _bundle;
+
+            public FolderToCollectionConverter(StringTableCollectionBundle bundle)
+            {
+                _bundle = bundle;
+            }
+
             public IReadOnlyList<StringTableCollection> Convert(IReadOnlyList<DefaultAsset> list)
             {
-                return AssetFinding.FindAssetsInFolders<StringTableCollection>(list);
+                return _bundle.StringTableCollections;
             }
         }
     }

Assets/Tests/LocalizationExtension/Editor/AssetTool/TestAsset.cs

@@ -0,0 +1,11 @@
+using UnityEngine;
+
+namespace Tests.Tsgcpp.Localization.Extension.Editor
+{
+    // [CreateAssetMenu(fileName = nameof(TestAsset), menuName = "Tsgcpp/Tests/TestAssetFinding/" + nameof(TestAsset), order = 1)]
+    public sealed class TestAsset : ScriptableObject
+    {
+        [SerializeField] private string _label;
+        public string Label => _label;
+    }
+}

Assets/Tests/LocalizationExtension/Editor/AssetTool/TestAssetFinding.cs

@@ -12,7 +12,35 @@ namespace Tests.Tsgcpp.Localization.Extension.Editor
     public class TestAssetFinding
     {
         [Test]
-        public void FindAssetsInFolders_ReturnsTextAsset_IfFolderContainsTextAsset_WhenOneFolder()
+        public void FindAssets_WithDefaultAssetArg_ReturnsAsset_IfFolderContainsAsset()
+        {
+            // Arrange
+            var folder = AssetDatabase.LoadAssetAtPath<DefaultAsset>("Assets/Tests/LocalizationExtension/Editor/Resources/Foo02/Bar01/Baz01");
+
+            // Act
+            var actual = AssetFinding.FindAssets<TestAsset>(folder);
+
+            // Assert
+            Assert.That(actual.Count, Is.EqualTo(2));
+            Assert.That(actual[0].Label, Is.EqualTo("02"));
+            Assert.That(actual[1].Label, Is.EqualTo("04"));
+        }
+
+        [Test]
+        public void FindAssets_WithDefaultAssetArg_ReturnsNoAssets_IfArgIsNull()
+        {
+            // Arrange
+            DefaultAsset folder = null;
+
+            // Act
+            var actual = AssetFinding.FindAssets<TestAsset>(folder);
+
+            // Assert
+            Assert.That(actual.Count, Is.EqualTo(0));
+        }
+
+        [Test]
+        public void FindAssets_WithListArg_ReturnsAsset_IfFolderContainsAsset_WhenOneFolder()
         {
             // Arrange
             var folders = new List<DefaultAsset>
@@ -21,16 +49,16 @@ public void FindAssetsInFolders_ReturnsTextAsset_IfFolderContainsTextAsset_WhenO
             };
 
             // Act
-            var actual = AssetFinding.FindAssetsInFolders<TextAsset>(folders);
+            var actual = AssetFinding.FindAssets<TestAsset>(folders);
 
             // Assert
             Assert.That(actual.Count, Is.EqualTo(2));
-            Assert.That(actual[0].text, Is.EqualTo("02"));
-            Assert.That(actual[1].text, Is.EqualTo("04"));
+            Assert.That(actual[0].Label, Is.EqualTo("02"));
+            Assert.That(actual[1].Label, Is.EqualTo("04"));
         }
 
         [Test]
-        public void FindAssetsInFolders_ReturnsTextAsset_IfFolderContainsTextAsset_WhenMultipleFolders()
+        public void FindAssets_WithListArg_ReturnsAsset_IfFolderContainsAsset_WhenMultipleFolders()
         {
             // Arrange
             var folders = new List<DefaultAsset>
@@ -41,18 +69,18 @@ public void FindAssetsInFolders_ReturnsTextAsset_IfFolderContainsTextAsset_WhenM
             };
 
             // Act
-            var actual = AssetFinding.FindAssetsInFolders<TextAsset>(folders);
+            var actual = AssetFinding.FindAssets<TestAsset>(folders);
 
             // Assert
             Assert.That(actual.Count, Is.EqualTo(4));
-            Assert.That(actual[0].text, Is.EqualTo("01"));
-            Assert.That(actual[1].text, Is.EqualTo("02"));
-            Assert.That(actual[2].text, Is.EqualTo("04"));
-            Assert.That(actual[3].text, Is.EqualTo("03"));
+            Assert.That(actual[0].Label, Is.EqualTo("01"));
+            Assert.That(actual[1].Label, Is.EqualTo("02"));
+            Assert.That(actual[2].Label, Is.EqualTo("04"));
+            Assert.That(actual[3].Label, Is.EqualTo("03"));
         }
 
         [Test]
-        public void FindAssetsInFolders_ReturnsUniquedTextAsset_IfTextAssetsAreDupulicated()
+        public void FindAssets_WithListArg_ReturnsUniquedAsset_IfAssetsAreDupulicated()
         {
             // Arrange
             var folders = new List<DefaultAsset>
@@ -63,17 +91,17 @@ public void FindAssetsInFolders_ReturnsUniquedTextAsset_IfTextAssetsAreDupulicat
             };
 
             // Act
-            var actual = AssetFinding.FindAssetsInFolders<TextAsset>(folders);
+            var actual = AssetFinding.FindAssets<TestAsset>(folders);
 
             // Assert
             Assert.That(actual.Count, Is.EqualTo(3));
-            Assert.That(actual[0].text, Is.EqualTo("02"));
-            Assert.That(actual[1].text, Is.EqualTo("04"));
-            Assert.That(actual[2].text, Is.EqualTo("03"));
+            Assert.That(actual[0].Label, Is.EqualTo("02"));
+            Assert.That(actual[1].Label, Is.EqualTo("04"));
+            Assert.That(actual[2].Label, Is.EqualTo("03"));
         }
 
         [Test]
-        public void FindAssetsInFolders_ReturnsNoTextAssets_IfTextAssetsDontExist()
+        public void FindAssets_WithListArg_ReturnsNoAssets_IfAssetsDontExist()
         {
             // Arrange
             var folders = new List<DefaultAsset>
@@ -82,31 +110,54 @@ public void FindAssetsInFolders_ReturnsNoTextAssets_IfTextAssetsDontExist()
             };
 
             // Act
-            var actual = AssetFinding.FindAssetsInFolders<TextAsset>(folders);
+            var actual = AssetFinding.FindAssets<TestAsset>(folders);
 
             // Assert
             Assert.That(actual.Count, Is.EqualTo(0));
         }
 
         [Test]
-        public void FindAssetsInFolders_ReturnsNoTextAssets_IfFoldersIsNone()
+        public void FindAssets_WithListArg_ReturnsNoAssets_IfNullList()
         {
             // Arrange
             var folders = new List<DefaultAsset>
             {
+                null,
             };
 
             // Act
-            var actual = AssetFinding.FindAssetsInFolders<TextAsset>(folders);
+            var actual = AssetFinding.FindAssets<TestAsset>(folders);
 
             // Assert
             Assert.That(actual.Count, Is.EqualTo(0));
         }
 
         [Test]
-        public void FindAssetsInFolders_ThrowsNullReferenceException_IfArgIsNull()
+        public void FindAssets_WithListArg_ReturnsNoAssets_IfArgIsNull()
         {
-            Assert.Throws<NullReferenceException>(() => AssetFinding.FindAssetsInFolders<TextAsset>(null));
+            // Arrange
+            List<DefaultAsset> folders = null;
+
+            // Act
+            var actual = AssetFinding.FindAssets<TestAsset>(folders);
+
+            // Assert
+            Assert.That(actual.Count, Is.EqualTo(0));
+        }
+
+        [Test]
+        public void FindAssets_WithListArg_ReturnsNoAssets_IfFoldersIsNone()
+        {
+            // Arrange
+            var folders = new List<DefaultAsset>
+            {
+            };
+
+            // Act
+            var actual = AssetFinding.FindAssets<TestAsset>(folders);
+
+            // Assert
+            Assert.That(actual.Count, Is.EqualTo(0));
         }
     }
 }

Assets/Tests/LocalizationExtension/Editor/Resources/Foo01/Bar01/TestAsset01.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f2fd2ba5cf501d149becb29e6e258529, type: 3}
+  m_Name: TestAsset01
+  m_EditorClassIdentifier: 
+  _label: 01

Assets/Tests/LocalizationExtension/Editor/Resources/Foo02/Bar01/Baz01/TestAsset02.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f2fd2ba5cf501d149becb29e6e258529, type: 3}
+  m_Name: TestAsset02
+  m_EditorClassIdentifier: 
+  _label: 02

Assets/Tests/LocalizationExtension/Editor/Resources/Foo02/Bar01/Baz01/TestAsset04.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f2fd2ba5cf501d149becb29e6e258529, type: 3}
+  m_Name: TestAsset04
+  m_EditorClassIdentifier: 
+  _label: 04