fix: fixing log settings that have no namespace (#1014)

- removing duplicates
- updating settings from factory
- making sure classes with no namespace save/load correctly

Assets/Mirage/Editor/Logging/LogLevelsGUI.cs

@@ -36,6 +36,7 @@ public static LogSettingsSO DrawCreateNewButton()
         }
 
         readonly LogSettingsSO settings;
+        readonly LogSettingChecker checker;
         readonly Dictionary<string, bool> folderOutState = new Dictionary<string, bool>();
 
         /// <summary>
@@ -46,10 +47,13 @@ public static LogSettingsSO DrawCreateNewButton()
         public LogLevelsGUI(LogSettingsSO settings)
         {
             this.settings = settings;
+            checker = new LogSettingChecker(settings);
         }
 
         public void Draw()
         {
+            checker.Refresh();
+
             guiChanged = false;
 
             EditorGUI.BeginChangeCheck();
@@ -92,7 +96,7 @@ private void DrawAllLevelDropdown()
 
         private void DrawGroup(IGrouping<string, LogSettingsSO.LoggerSettings> group)
         {
-            string NameSpace = group.Key;
+            string NameSpace = group.Key ?? "<none>";
             if (!folderOutState.ContainsKey(NameSpace))
                 folderOutState[NameSpace] = false;
 

Assets/Mirage/Editor/Logging/LogSettingChecker.cs

@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using Mirage.Logging;
+using UnityEngine;
+
+namespace Mirage.EditorScripts.Logging
+{
+    /// <summary>
+    /// Removes duplicates and updates log settings from LogFactory
+    /// </summary>
+    public class LogSettingChecker
+    {
+        readonly LogSettingsSO settings;
+        readonly HashSet<string> duplicateChecker = new HashSet<string>();
+
+        public LogSettingChecker(LogSettingsSO settings)
+        {
+            this.settings = settings;
+        }
+
+        public void Refresh()
+        {
+            duplicateChecker.Clear();
+            RemoveDuplicates();
+            AddNewFromFactory();
+        }
+
+        void RemoveDuplicates()
+        {
+            for (int i = 0; i < settings.LogLevels.Count; i++)
+            {
+                bool added = duplicateChecker.Add(settings.LogLevels[i].FullName);
+                // is duplicate, remove it
+                if (!added)
+                {
+                    settings.LogLevels.RemoveAt(i);
+                    i--;
+                }
+            }
+        }
+
+        void AddNewFromFactory()
+        {
+            // try add new types
+            foreach (KeyValuePair<string, ILogger> logger in LogFactory.Loggers)
+            {
+                bool added = duplicateChecker.Add(logger.Key);
+                // is new, add it
+                if (added)
+                {
+                    settings.LogLevels.Add(new LogSettingsSO.LoggerSettings(logger.Key, logger.Value.filterLogType));
+                }
+            }
+        }
+    }
+}

Assets/Mirage/Runtime/Logging/LogSettingsSO.cs

@@ -14,7 +14,19 @@ public class LoggerSettings
         {
             public string Name;
             public string Namespace;
-            public string FullName => $"{Namespace}.{Name}";
+
+            private string fullNameCache;
+            public string FullName => fullNameCache;
+
+            static string CreateFullName(string name, string space)
+            {
+                // special case when namespace is null we just return null
+                // see GetNameAndNameSapceFromFullname
+                if (space == null)
+                    return name;
+                else
+                    return $"{space}.{name}";
+            }
 
             public LogType logLevel;
 
@@ -23,15 +35,26 @@ public LoggerSettings(string name, string Namespace, LogType level)
                 Name = name;
                 this.Namespace = Namespace;
                 logLevel = level;
+                fullNameCache = CreateFullName(Name, Namespace);
             }
             public LoggerSettings(string fullname, LogType level)
             {
-                (Name, Namespace) = GetNameAndNameSapceFromFullname(fullname);
+                (Name, Namespace) = GetNameAndNameSpaceFromFullname(fullname);
                 logLevel = level;
+                fullNameCache = CreateFullName(Name, Namespace);
             }
 
-            private static (string name, string @namespace) GetNameAndNameSapceFromFullname(string fullname)
+            private static (string name, string @namespace) GetNameAndNameSpaceFromFullname(string fullname)
             {
+                // NOTE we need to be able to recreate fullname from name/namespace
+                // so we cant always just use empty string for no namespace
+
+                if (!fullname.Contains("."))
+                {
+                    // if no `.` then return null
+                    return (fullname, null);
+                }
+
                 string[] parts = fullname.Split('.');
                 string name = parts.Last();
 
@@ -45,6 +68,7 @@ private static (string name, string @namespace) GetNameAndNameSapceFromFullname(
                     @namespace = string.Join(".", parts.Take(parts.Length - 1));
                 }
 
+                Debug.Assert(CreateFullName(name, @namespace) == fullname, "Could not re-create full name from created parted");
                 return (name, @namespace);
             }
         }