Merge pull request #78 from CyberAgentGameEntertainment/feature/group-based-filter

「アドレス」や「Addressableのグループ」を基にラベルやバージョンを振れるように

Author: Haruma-K

Assets/Development/Editor/Core/Tools/Addresser/Shared/AssetGroups/AssetGroupPanelDevelopmentWindow.cs

@@ -26,7 +26,8 @@ private void OnEnable()
                 _groupCollection.Add(new AssetGroup());
 
             _view = new AssetGroupPanelView();
-            _presenter = new AssetGroupPanelPresenter(_view, _history, _assetSaveService);
+            // Use Address rule type for development window
+            _presenter = new AssetGroupPanelPresenter(_view, _history, _assetSaveService, RuleType.Address);
             _presenter.SetupView(_groupCollection, 0);
         }
 

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/AddressRules/AddressRule.cs

@@ -122,7 +122,7 @@ public bool TryProvideAddress(
                 return false;
             }
 
-            if (!_assetGroups.Contains(assetPath, assetType, isFolder))
+            if (!_assetGroups.Contains(assetPath, assetType, isFolder, null, null))
             {
                 address = null;
                 return false;

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/AddressRules/IAddressProvider.cs

@@ -1,11 +1,16 @@
-using SmartAddresser.Editor.Core.Models.Shared;
+using System;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.AddressRules
 {
     /// <summary>
     ///     Provide addresses from asset information.
     /// </summary>
-    public interface IAddressProvider : IProvider<string>
+    public interface IAddressProvider
     {
+        void Setup();
+
+        string Provide(string assetPath, Type assetType, bool isFolder);
+
+        string GetDescription();
     }
 }

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/AddressBasedLabelProvider.cs

@@ -0,0 +1,29 @@
+using System;
+using SmartAddresser.Editor.Core.Models.Shared;
+using UnityEditor.AddressableAssets.Settings;
+
+namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
+{
+    /// <summary>
+    ///     Provide the label based on the addressable entry's address.
+    /// </summary>
+    [Serializable]
+    public sealed class AddressBasedLabelProvider : AddressBasedProvider, ILabelProvider
+    {
+        void ILabelProvider.Setup()
+        {
+            base.Setup();
+        }
+
+        string ILabelProvider.Provide(string assetPath, Type assetType, bool isFolder, string address,
+            AddressableAssetGroup addressableAssetGroup)
+        {
+            return base.Provide(address);
+        }
+
+        string ILabelProvider.GetDescription()
+        {
+            return base.GetDescription();
+        }
+    }
+}

…tor/Core/Models/Shared/IProvider.cs.meta …lRules/AddressBasedLabelProvider.cs.metaAssets/SmartAddresser/Editor/Core/Models/Shared/IProvider.cs.meta renamed to Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/AddressBasedLabelProvider.cs.meta Assets/SmartAddresser/Editor/Core/Models/Shared/IProvider.cs.meta renamed to Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/AddressBasedLabelProvider.cs.meta

@@ -0,0 +1,33 @@
+using System;
+using SmartAddresser.Editor.Core.Models.Shared;
+using UnityEditor.AddressableAssets.Settings;
+
+namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
+{
+    /// <summary>
+    ///     Provide the label based on the addressable asset group name.
+    /// </summary>
+    [Serializable]
+    public sealed class AddressableAssetGroupNameBasedLabelProvider : AddressableAssetGroupNameBasedProvider,
+        ILabelProvider
+    {
+        void ILabelProvider.Setup()
+        {
+            base.Setup();
+        }
+
+        string ILabelProvider.Provide(string assetPath, Type assetType, bool isFolder, string address,
+            AddressableAssetGroup addressableAssetGroup)
+        {
+            if (addressableAssetGroup == null)
+                return null;
+
+            return base.Provide(addressableAssetGroup.Name);
+        }
+
+        string ILabelProvider.GetDescription()
+        {
+            return base.GetDescription();
+        }
+    }
+}

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/AddressableAssetGroupNameBasedLabelProvider.cs

@@ -1,5 +1,6 @@
 using System;
 using SmartAddresser.Editor.Core.Models.Shared;
+using UnityEditor.AddressableAssets.Settings;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
 {
@@ -9,5 +10,20 @@ namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
     [Serializable]
     public sealed class AssetPathBasedLabelProvider : AssetPathBasedProvider, ILabelProvider
     {
+        void ILabelProvider.Setup()
+        {
+            base.Setup();
+        }
+
+        string ILabelProvider.Provide(string assetPath, Type assetType, bool isFolder, string address,
+            AddressableAssetGroup addressableAssetGroup)
+        {
+            return base.Provide(assetPath, assetType, isFolder);
+        }
+
+        string ILabelProvider.GetDescription()
+        {
+            return base.GetDescription();
+        }
     }
 }

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/AddressableAssetGroupNameBasedLabelProvider.cs.meta

@@ -1,5 +1,5 @@
 using System;
-using SmartAddresser.Editor.Core.Models.Shared;
+using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
@@ -18,11 +18,11 @@ public string Label
             set => _label = value;
         }
 
-        void IProvider<string>.Setup()
+        public void Setup()
         {
         }
 
-        string IProvider<string>.Provide(string assetPath, Type assetType, bool isFolder)
+        public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)
         {
             if (string.IsNullOrEmpty(_label))
                 return null;

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/AssetPathBasedLabelProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
 {
@@ -15,12 +16,12 @@ public void Setup()
             labelProvider.Setup();
         }
 
-        public string Provide(string assetPath, Type assetType, bool isFolder)
+        public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)
         {
             if (labelProvider == null)
                 return null;
 
-            return labelProvider.Provide(assetPath, assetType, isFolder);
+            return labelProvider.Provide(assetPath, assetType, isFolder, address, addressableAssetGroup);
         }
 
         public string GetDescription()