Fixed symbolic link validation (#687)

Made SymbolicLinker public to make it easier to Sync symbolic links in projects using the utility Made SymbolicLinks.IsActive set public to make it easier to toggle symbolic links on and off
XRTK · Nov 23, 2020 · 9a85eb4 · 9a85eb4
1 parent 72cc312
commit 9a85eb4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/MixedRealityPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/MixedRealityPreferences.cs
@@ -184,7 +184,7 @@ public static string SymbolicLinkSettingsPath
                     string.IsNullOrEmpty(symbolicLinkSettingsPath))
                 {
                     symbolicLinkSettingsPath = AssetDatabase
-                        .FindAssets($"t:{typeof(SymbolicLinkSettings).Name}")
+                        .FindAssets($"t:{nameof(SymbolicLinkSettings)}")
                         .Select(AssetDatabase.GUIDToAssetPath)
                         .OrderBy(x => x)
                         .FirstOrDefault();

diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SymbolicLinks/SymbolicLink.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SymbolicLinks/SymbolicLink.cs
@@ -33,7 +33,14 @@ public string TargetRelativePath
         public bool IsActive
         {
             get => isActive;
-            internal set => isActive = value;
+            set
+            {
+                if (isActive != value)
+                {
+                    isActive = value;
+                    SymbolicLinker.RunSync(true);
+                }
+            }
         }
     }
 }
diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SymbolicLinks/SymbolicLinker.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SymbolicLinks/SymbolicLinker.cs
@@ -15,7 +15,7 @@
 namespace XRTK.Editor.Utilities.SymbolicLinks
 {
     [InitializeOnLoad]
-    internal static class SymbolicLinker
+    public static class SymbolicLinker
     {
         /// <summary>
         /// Constructor.
@@ -48,7 +48,7 @@ static SymbolicLinker()
         /// <summary>
         /// Debug the symbolic linker utility.
         /// </summary>
-        public static bool DebugEnabled
+        private static bool DebugEnabled
         {
             get => MixedRealityPreferences.DebugSymbolicInfo;
             set => MixedRealityPreferences.DebugSymbolicInfo = value;
@@ -128,16 +128,10 @@ public static void RunSync(bool forceUpdate = false)
             {
                 if (string.IsNullOrEmpty(link.SourceRelativePath)) { continue; }
 
-                bool isValid = false;
                 var targetAbsolutePath = $"{ProjectRoot}{link.TargetRelativePath}";
                 var sourceAbsolutePath = $"{ProjectRoot}{link.SourceRelativePath}";
 
-                if (link.IsActive)
-                {
-                    isValid = VerifySymbolicLink(targetAbsolutePath);
-                }
-
-                if (isValid)
+                if (VerifySymbolicLink(targetAbsolutePath))
                 {
                     // If we already have the directory in our project, then skip.
                     if (link.IsActive) { continue; }
@@ -202,7 +196,7 @@ public static void RunSync(bool forceUpdate = false)
         /// </summary>
         /// <param name="sourceAbsolutePath"></param>
         /// <param name="targetAbsolutePath"></param>
-        public static bool AddLink(string sourceAbsolutePath, string targetAbsolutePath)
+        internal static bool AddLink(string sourceAbsolutePath, string targetAbsolutePath)
         {
             if (string.IsNullOrEmpty(sourceAbsolutePath) || string.IsNullOrEmpty(targetAbsolutePath))
             {
@@ -256,7 +250,7 @@ public static bool AddLink(string sourceAbsolutePath, string targetAbsolutePath)
         /// Disables a symbolic link in the settings.
         /// </summary>
         /// <param name="targetRelativePath"></param>
-        public static bool DisableLink(string targetRelativePath)
+        internal static bool DisableLink(string targetRelativePath)
         {
             var symbolicLink = Settings.SymbolicLinks.Find(link => link.TargetRelativePath == targetRelativePath);
 
@@ -282,7 +276,7 @@ public static bool DisableLink(string targetRelativePath)
         /// </summary>
         /// <param name="sourceRelativePath"></param>
         /// <param name="targetRelativePath"></param>
-        public static bool RemoveLink(string sourceRelativePath, string targetRelativePath)
+        internal static bool RemoveLink(string sourceRelativePath, string targetRelativePath)
         {
             if (!DisableLink(targetRelativePath))
             {