Now check scope existence before adding registry

This avoid replacing internal-registry that using same scope

Author: lawwong

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenXRAndroidWaveSettings.cs

@@ -196,7 +196,7 @@ public override void OnPreferenceGUI()
 
                         if (GUILayout.Button(new GUIContent("Add Wave XR Plugin - OpenXR", "Add " + WAVE_XR_OPENXR_PACKAGE + " to Package Manager"), GUILayout.ExpandWidth(false)))
                         {
-                            if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
+                            if (!CheckScopeExists(RegistryToolSettings.Instance().Registry.Scopes))
                             {
                                 ManifestUtils.AddRegistry(RegistryToolSettings.Instance().Registry);
                             }

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs

@@ -16,6 +16,8 @@
 using UnityEditor.Callbacks;
 using UnityEngine;
 using UnityEngine.Rendering;
+using System.Collections.Generic;
+using HTC.UnityPlugin.Utility;
 
 namespace HTC.UnityPlugin.Vive
 {
@@ -228,7 +230,7 @@ public override void OnPreferenceGUI()
 
                         if (GUILayout.Button(new GUIContent("Add Wave XR Plugin", "Add " + WAVE_XR_PACKAGE_NAME + " to Package Manager"), GUILayout.ExpandWidth(false)))
                         {
-                            if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
+                            if (!CheckScopeExists(RegistryToolSettings.Instance().Registry.Scopes))
                             {
                                 ManifestUtils.AddRegistry(RegistryToolSettings.Instance().Registry);
                             }
@@ -290,11 +292,11 @@ public override void OnPreferenceGUI()
                         GUI.enabled = false;
                         EditorGUILayout.ToggleLeft(new GUIContent(enableWaveXRRenderModelTitle, VIUSettings.ENABLE_WAVE_XR_RENDER_MODEL_TOOLTIP + ". Required Wave XR Plugin Essence"), false, GUILayout.ExpandWidth(true));
                         GUI.enabled = true;
-                        
+
                         s_guiChanged |= EditorGUI.EndChangeCheck();
                         if (GUILayout.Button(new GUIContent("Add Wave XR Plugin Essence", "Add " + WAVE_XR_PACKAGE_ESSENCE_NAME + " to Package Manager"), GUILayout.ExpandWidth(false)))
                         {
-                            if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
+                            if (!CheckScopeExists(RegistryToolSettings.Instance().Registry.Scopes))
                             {
                                 ManifestUtils.AddRegistry(RegistryToolSettings.Instance().Registry);
                             }
@@ -338,7 +340,7 @@ public override void OnPreferenceGUI()
                         s_guiChanged |= EditorGUI.EndChangeCheck();
                         if (GUILayout.Button(new GUIContent("Update Wave XR Plugin Native", "Update " + WAVE_XR_PACKAGE_NATIVE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))
                         {
-                            if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
+                            if (!CheckScopeExists(RegistryToolSettings.Instance().Registry.Scopes))
                             {
                                 ManifestUtils.AddRegistry(RegistryToolSettings.Instance().Registry);
                             }
@@ -382,7 +384,7 @@ public override void OnPreferenceGUI()
                         s_guiChanged |= EditorGUI.EndChangeCheck();
                         if (GUILayout.Button(new GUIContent("Update Wave XR Plugin Native", "Update " + WAVE_XR_PACKAGE_NATIVE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))
                         {
-                            if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
+                            if (!CheckScopeExists(RegistryToolSettings.Instance().Registry.Scopes))
                             {
                                 ManifestUtils.AddRegistry(RegistryToolSettings.Instance().Registry);
                             }
@@ -502,5 +504,60 @@ public void OnPreprocessBuild(BuildReport report)
             }
 #endif
         }
+
+        [Serializable]
+        private class UPMMenifestInfo
+        {
+            [Serializable]
+            public struct ScopedRegistry
+            {
+                public string name;
+                public string url;
+                public List<string> scopes;
+            }
+
+            public List<ScopedRegistry> scopedRegistries;
+        }
+
+        private static UPMMenifestInfo menifestInfoTemp = new UPMMenifestInfo();
+        private static bool CheckScopeExists(List<string> scopes)
+        {
+            if (scopes == null || scopes.Count == 0) { return true; }
+
+            var allScopes = ListPool<string>.Get();
+            try
+            {
+                var manifestString = File.ReadAllText(RegistryToolSettings.Instance().ProjectManifestPath);
+                JsonUtility.FromJsonOverwrite(manifestString, menifestInfoTemp);
+
+                if (menifestInfoTemp.scopedRegistries == null || menifestInfoTemp.scopedRegistries.Count == 0) { return false; }
+                foreach (var reg in menifestInfoTemp.scopedRegistries)
+                {
+                    var regScopes = reg.scopes;
+                    if (regScopes == null || regScopes.Count == 0) { continue; }
+                    allScopes.AddRange(regScopes);
+                }
+
+                if (allScopes.Count > 0)
+                {
+                    foreach (var scope in scopes)
+                    {
+                        if (!allScopes.Contains(scope)) { return false; }
+                    }
+                    return true;
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.LogException(e);
+            }
+            finally
+            {
+                ListPool<string>.Release(allScopes);
+                allScopes = null;
+            }
+
+            return false;
+        }
     }
 }