remp

Haruma-K · Haruma-K · commit d9189269917d · 2025-06-27T18:50:42.000+09:00
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/AssetPathBasedLabelProvider.cs b/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
 {
@@ -15,7 +16,7 @@ public void Setup()
         }
 
         public string Provide(string assetPath, Type assetType, bool isFolder, string address,
-            string addressableAssetGroupName)
+            AddressableAssetGroup addressableAssetGroup)
         {
             return ((IProvider<string>)this).Provide(assetPath, assetType, isFolder);
         }
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/ConstantLabelProvider.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/ConstantLabelProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
@@ -21,7 +22,7 @@ public void Setup()
         {
         }
 
-        public string Provide(string assetPath, Type assetType, bool isFolder, string address, string addressableAssetGroupName)
+        public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)
         {
             if (string.IsNullOrEmpty(_label))
                 return null;
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/CustomLabelProvider.cs b/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, string address, string addressableAssetGroupName)
+        public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)
         {
             if (labelProvider == null)
                 return null;
 
-            return labelProvider.Provide(assetPath, assetType, isFolder, address, addressableAssetGroupName);
+            return labelProvider.Provide(assetPath, assetType, isFolder, address, addressableAssetGroup);
         }
 
         public string GetDescription()
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/ILabelProvider.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/ILabelProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
 {
@@ -19,9 +20,9 @@ public interface ILabelProvider
         /// <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="addressableAssetGroupName">The name of the addressable asset group.</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, string addressableAssetGroupName);
+        string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup);
 
         /// <summary>
         ///     Get the description of this rule for display in the UI.
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/LabelProviderAsset.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/LabelProviderAsset.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules
@@ -8,7 +9,7 @@ public abstract class LabelProviderAsset : ScriptableObject, ILabelProvider
         public abstract void Setup();
 
         public abstract string Provide(string assetPath, Type assetType, bool isFolder, string address,
-            string addressableAssetGroupName);
+            AddressableAssetGroup addressableAssetGroup);
 
         public abstract string GetDescription();
     }
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LabelRules/LabelRule.cs b/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
@@ -85,7 +86,7 @@ public bool Validate(out LabelRuleValidationError error)
         /// <param name="assetType"></param>
         /// <param name="isFolder"></param>
         /// <param name="address">The address assigned to the addressable entry.</param>
-        /// <param name="addressableAssetGroupName">The name of the addressable asset group.</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.
@@ -97,7 +98,7 @@ public bool TryProvideLabel(
             Type assetType,
             bool isFolder,
             string address,
-            string addressableAssetGroupName,
+            AddressableAssetGroup addressableAssetGroup,
             out string label,
             bool checkIsPathValidForEntry = true
         )
@@ -114,7 +115,7 @@ public bool TryProvideLabel(
                 return false;
             }
 
-            label = LabelProvider.Value.Provide(assetPath, assetType, isFolder, address, addressableAssetGroupName);
+            label = LabelProvider.Value.Provide(assetPath, assetType, isFolder, address, addressableAssetGroup);
 
             if (string.IsNullOrEmpty(label))
             {
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LayoutRule.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LayoutRule.cs
@@ -111,7 +111,7 @@ out AddressableAssetGroup addressableGroup
         /// <param name="assetType"></param>
         /// <param name="isFolder"></param>
         /// <param name="address">The address assigned to the addressable entry.</param>
-        /// <param name="addressableAssetGroupName">The name of the addressable asset group.</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.
@@ -123,7 +123,7 @@ public IReadOnlyCollection<string> ProvideLabels(
             Type assetType,
             bool isFolder,
             string address,
-            string addressableAssetGroupName,
+            AddressableAssetGroup addressableAssetGroup,
             bool doSetup,
             bool checkIsPathValidForEntry = true
         )
@@ -136,22 +136,22 @@ public IReadOnlyCollection<string> ProvideLabels(
                 if (doSetup)
                     labelRule.Setup();
 
-                if (labelRule.TryProvideLabel(assetPath, assetType, isFolder, address, addressableAssetGroupName, 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, string address, string addressableAssetGroupName, 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, address, addressableAssetGroupName, out var version))
+                if (versionRule.TryProvideVersion(assetPath, assetType, isFolder, address, addressableAssetGroup, out var version))
                     return version;
             }
 
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/AssetPathBasedVersionProvider.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/AssetPathBasedVersionProvider.cs
@@ -1,5 +1,6 @@
 using System;
 using SmartAddresser.Editor.Core.Models.Shared;
+using UnityEditor.AddressableAssets.Settings;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.VersionRules
 {
@@ -14,7 +15,7 @@ public void Setup()
             ((IProvider<string>)this).Setup();
         }
 
-        public string Provide(string assetPath, Type assetType, bool isFolder, string address, string addressableAssetGroupName)
+        public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)
         {
             // Asset path based provider doesn't use address or addressableAssetGroupName
             return ((IProvider<string>)this).Provide(assetPath, assetType, isFolder);
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/ConstantVersionProvider.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/ConstantVersionProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.VersionRules
@@ -21,7 +22,7 @@ public void Setup()
         {
         }
 
-        public string Provide(string assetPath, Type assetType, bool isFolder, string address, string addressableAssetGroupName)
+        public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)
         {
             if (string.IsNullOrEmpty(_version))
                 return null;
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/CustomVersionProvider.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/CustomVersionProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.VersionRules
 {
@@ -15,12 +16,12 @@ public void Setup()
             versionProvider.Setup();
         }
 
-        public string Provide(string assetPath, Type assetType, bool isFolder, string address, string addressableAssetGroupName)
+        public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)
         {
             if (versionProvider == null)
                 return null;
             
-            return versionProvider.Provide(assetPath, assetType, isFolder, address, addressableAssetGroupName);
+            return versionProvider.Provide(assetPath, assetType, isFolder, address, addressableAssetGroup);
         }
 
         public string GetDescription()
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/IVersionProvider.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/IVersionProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.VersionRules
 {
@@ -19,9 +20,9 @@ public interface IVersionProvider
         /// <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="addressableAssetGroupName">The name of the addressable asset group.</param>
+        /// <param name="addressableAssetGroup">The addressable asset group.</param>
         /// <returns>Returns the version. If the version cannot be provided, returns null.</returns>
-        string Provide(string assetPath, Type assetType, bool isFolder, string address, string addressableAssetGroupName);
+        string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup);
 
         /// <summary>
         ///     Get the description of this rule for display in the UI.
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/VersionProviderAsset.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/VersionProviderAsset.cs
@@ -1,12 +1,13 @@
 using System;
+using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
 
 namespace SmartAddresser.Editor.Core.Models.LayoutRules.VersionRules
 {
     public abstract class VersionProviderAsset : ScriptableObject, IVersionProvider
     {
         public abstract void Setup();
-        public abstract string Provide(string assetPath, Type assetType, bool isFolder, string address, string addressableAssetGroupName);
+        public abstract string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup);
         public abstract string GetDescription();
     }
 }
diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/VersionRule.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/VersionRules/VersionRule.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.VersionRules
@@ -84,7 +85,7 @@ public bool Validate(out VersionRuleValidationError error)
         /// <param name="assetType"></param>
         /// <param name="isFolder"></param>
         /// <param name="address">The address assigned to the addressable entry.</param>
-        /// <param name="addressableAssetGroupName">The name of the addressable asset group.</param>
+        /// <param name="addressableAssetGroup">The addressable asset group.</param>
         /// <param name="version">If successful, assign the version. If not, null.</param>
         /// <param name="checkIsPathValidForEntry">
         ///     If true, check if the asset path is valid for entry.
@@ -96,7 +97,7 @@ public bool TryProvideVersion(
             Type assetType,
             bool isFolder,
             string address,
-            string addressableAssetGroupName,
+            AddressableAssetGroup addressableAssetGroup,
             out string version,
             bool checkIsPathValidForEntry = true
         )
@@ -113,7 +114,7 @@ public bool TryProvideVersion(
                 return false;
             }
 
-            version = VersionProvider.Value.Provide(assetPath, assetType, isFolder, address, addressableAssetGroupName);
+            version = VersionProvider.Value.Provide(assetPath, assetType, isFolder, address, addressableAssetGroup);
 
             if (string.IsNullOrEmpty(version))
             {
diff --git a/Assets/SmartAddresser/Editor/Core/Models/Services/ApplyLayoutRuleService.cs b/Assets/SmartAddresser/Editor/Core/Models/Services/ApplyLayoutRuleService.cs
@@ -141,13 +141,11 @@ private bool TryAddEntry(
             if (addressableGroup == null)
                 return false;
 
-            var addressableGroupName = addressableGroup.Name;
-
             // Check the version if it is specified.
             if (!string.IsNullOrEmpty(versionExpression))
             {
                 var comparator = _versionExpressionParser.CreateComparator(versionExpression);
-                var versionText = layoutRule.ProvideVersion(assetPath, assetType, isFolder, address, addressableGroupName, doSetup);
+                var versionText = layoutRule.ProvideVersion(assetPath, assetType, isFolder, address, addressableGroup, doSetup);
 
                 if (string.IsNullOrEmpty(versionText) && layoutRule.Settings.ExcludeUnversioned.Value)
                     return false;
@@ -161,11 +159,11 @@ private bool TryAddEntry(
 
             // Set group and address.
             var entryAdapter =
-                _addressableSettingsAdapter.CreateOrMoveEntry(addressableGroupName, assetGuid, invokeModificationEvent);
+                _addressableSettingsAdapter.CreateOrMoveEntry(addressableGroup.Name, assetGuid, invokeModificationEvent);
             entryAdapter.SetAddress(address, invokeModificationEvent);
 
-            // Provide labels with addressable context (address and group name).
-            var labels = layoutRule.ProvideLabels(assetPath, assetType, isFolder, address, addressableGroupName, doSetup);
+            // Provide labels with addressable context (address and group).
+            var labels = layoutRule.ProvideLabels(assetPath, assetType, isFolder, address, addressableGroup, doSetup);
             
             // Add labels to addressable settings if not exists.
             var addressableLabels = _addressableSettingsAdapter.GetLabels();
diff --git a/Assets/SmartAddresser/Editor/Core/Models/Services/BuildLayoutService.cs b/Assets/SmartAddresser/Editor/Core/Models/Services/BuildLayoutService.cs
@@ -87,14 +87,13 @@ IReadOnlyList<bool> isFolders
                         continue;
 
                     // Labels
-                    var groupName = addressRule.AddressableGroup?.Name ?? string.Empty;
-                    var labels = layoutRule.ProvideLabels(assetPath, assetType, isFolder, address, groupName, false, false).ToArray();
+                    var labels = layoutRule.ProvideLabels(assetPath, assetType, isFolder, address, addressRule.AddressableGroup, false, false).ToArray();
 
                     // Versions
                     var versions = new List<string>();
                     foreach (var versionRule in layoutRule.VersionRules)
                     {
-                        if (!versionRule.TryProvideVersion(assetPath, assetType, isFolder, address, groupName, out var version, false))
+                        if (!versionRule.TryProvideVersion(assetPath, assetType, isFolder, address, addressRule.AddressableGroup, out var version, false))
                             continue;
 
                         versions.Add(version);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using SmartAddresser.Editor.Core.Models.Shared;`
	`3`	`+using UnityEditor.AddressableAssets.Settings;`
`3`	`4`
`4`	`5`	`namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules`
`5`	`6`	`{`
`@@ -15,7 +16,7 @@ public void Setup()`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`public string Provide(string assetPath, Type assetType, bool isFolder, string address,`
`18`		`- string addressableAssetGroupName)`
	`19`	`+ AddressableAssetGroup addressableAssetGroup)`
`19`	`20`	`{`
`20`	`21`	`return ((IProvider<string>)this).Provide(assetPath, assetType, isFolder);`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using UnityEditor.AddressableAssets.Settings;`
`2`	`3`	`using UnityEngine;`
`3`	`4`
`4`	`5`	`namespace SmartAddresser.Editor.Core.Models.LayoutRules.LabelRules`
`@@ -21,7 +22,7 @@ public void Setup()`
`21`	`22`	`{`
`22`	`23`	`}`
`23`	`24`
`24`		`- public string Provide(string assetPath, Type assetType, bool isFolder, string address, string addressableAssetGroupName)`
	`25`	`+ public string Provide(string assetPath, Type assetType, bool isFolder, string address, AddressableAssetGroup addressableAssetGroup)`
`25`	`26`	`{`
`26`	`27`	`if (string.IsNullOrEmpty(_label))`
`27`	`28`	`return null;`