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

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();
+        }
+    }
+}

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

@@ -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/AssetPathBasedLabelProvider.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/ConstantLabelProvider.cs

@@ -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/CustomLabelProvider.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()

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

@@ -1,11 +1,33 @@
-using SmartAddresser.Editor.Core.Models.Shared;
+using System;
+using UnityEditor.AddressableAssets.Settings;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
 {
     /// <summary>
-    ///     Provide labels from asset information.
+    ///     Provides a label for addressable asset entries with awareness of address and group information.
     /// </summary>
-    public interface ILabelProvider : IProvider<string>
+    public interface ILabelProvider
     {
+        /// <summary>
+        ///     Setup the label provider.
+        /// </summary>
+        void Setup();
+
+        /// <summary>
+        ///     Provide a label for the addressable asset.
+        /// </summary>
+        /// <param name="assetPath">The asset path.</param>
+        /// <param name="assetType">The type of the asset.</param>
+        /// <param name="isFolder">The asset is folder or not.</param>
+        /// <param name="address">The address assigned to the addressable entry.</param>
+        /// <param name="addressableAssetGroup">The addressable asset group.</param>
+        /// <returns>Returns the label. If the label cannot be provided, returns null.</returns>
+        string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup);
+
+        /// <summary>
+        ///     Get the description of this rule for display in the UI.
+        /// </summary>
+        /// <returns></returns>
+        string GetDescription();
     }
 }

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

@@ -1,12 +1,16 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
 {
     public abstract class LabelProviderAsset : ScriptableObject, ILabelProvider
     {
         public abstract void Setup();
-        public abstract string Provide(string assetPath, Type assetType, bool isFolder);
+
+        public abstract string Provide(string assetPath, Type assetType, bool isFolder, string address,
+            AddressableAssetGroup addressableAssetGroup);
+
         public abstract string GetDescription();
     }
 }

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

@@ -4,6 +4,7 @@
 using SmartAddresser.Editor.Core.Models.Shared.AssetGroups.ValidationError;
 using SmartAddresser.Editor.Foundation.TinyRx.ObservableCollection;
 using SmartAddresser.Editor.Foundation.TinyRx.ObservableProperty;
+using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
@@ -79,12 +80,14 @@ public bool Validate(out LabelRuleValidationError error)
         }
 
         /// <summary>
-        ///     Create a label from asset information.
+        ///     Create a label from asset information with addressable context.
         /// </summary>
         /// <param name="assetPath"></param>
         /// <param name="assetType"></param>
         /// <param name="isFolder"></param>
-        /// <param name="label">If successful, assign the address. If not, null.</param>
+        /// <param name="address">The address assigned to the addressable entry.</param>
+        /// <param name="addressableAssetGroup">The addressable asset group.</param>
+        /// <param name="label">If successful, assign the label. If not, null.</param>
         /// <param name="checkIsPathValidForEntry">
         ///     If true, check if the asset path is valid for entry.
         ///     You can pass false if it is guaranteed to be valid.
@@ -94,11 +97,13 @@ public bool TryProvideLabel(
             string assetPath,
             Type assetType,
             bool isFolder,
+            string address,
+            AddressableAssetGroup addressableAssetGroup,
             out string label,
             bool checkIsPathValidForEntry = true
         )
         {
-            if (!_assetGroups.Contains(assetPath, assetType, isFolder))
+            if (!_assetGroups.Contains(assetPath, assetType, isFolder, address, addressableAssetGroup))
             {
                 label = null;
                 return false;
@@ -110,7 +115,7 @@ public bool TryProvideLabel(
                 return false;
             }
 
-            label = LabelProvider.Value.Provide(assetPath, assetType, isFolder);
+            label = LabelProvider.Value.Provide(assetPath, assetType, isFolder, address, addressableAssetGroup);
 
             if (string.IsNullOrEmpty(label))
             {

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LayoutRule.cs

@@ -105,11 +105,13 @@ out AddressableAssetGroup addressableGroup
         }
 
         /// <summary>
-        ///     Provide the labels.
+        ///     Provide the labels with addressable context.
         /// </summary>
         /// <param name="assetPath"></param>
         /// <param name="assetType"></param>
         /// <param name="isFolder"></param>
+        /// <param name="address">The address assigned to the addressable entry.</param>
+        /// <param name="addressableAssetGroup">The addressable asset group.</param>
         /// <param name="doSetup"></param>
         /// <param name="checkIsPathValidForEntry">
         ///     If true, check if the asset path is valid for entry.
@@ -120,6 +122,8 @@ public IReadOnlyCollection<string> ProvideLabels(
             string assetPath,
             Type assetType,
             bool isFolder,
+            string address,
+            AddressableAssetGroup addressableAssetGroup,
             bool doSetup,
             bool checkIsPathValidForEntry = true
         )
@@ -132,22 +136,22 @@ public IReadOnlyCollection<string> ProvideLabels(
                 if (doSetup)
                     labelRule.Setup();
 
-                if (labelRule.TryProvideLabel(assetPath, assetType, isFolder, out var label, checkIsPathValidForEntry))
+                if (labelRule.TryProvideLabel(assetPath, assetType, isFolder, address, addressableAssetGroup, out var label, checkIsPathValidForEntry))
                     labels.Add(label);
             }
 
             return labels;
         }
 
-        public string ProvideVersion(string assetPath, Type assetType, bool isFolder, bool doSetup)
+        public string ProvideVersion(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup, bool doSetup)
         {
             foreach (var versionRule in _versionRules)
             {
                 if (doSetup)
                     versionRule.Setup();
 
                 // Adopt the first matching version.
-                if (versionRule.TryProvideVersion(assetPath, assetType, isFolder, out var version))
+                if (versionRule.TryProvideVersion(assetPath, assetType, isFolder, address, addressableAssetGroup, out var version))
                     return version;
             }
 

Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/AddressBasedVersionProvider.cs

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