shortguid table linking now done automatically

Author: MattFiler

CathodeLib/Scripts/CATHODE/Commands/Helpers/CommandsUtils.cs

@@ -45,6 +45,13 @@ public CommandsUtils(Commands commands)
                 LoadInfo(_commands.Filepath);
 
             _nameID = ShortGuidUtils.Generate("name").AsUInt32;
+
+            ShortGuidUtils.LinkCommands(_commands);
+        }
+
+        ~CommandsUtils()
+        {
+            ShortGuidUtils.UnlinkCommands(_commands);
         }
 
         #region Generic Utility Functions
@@ -1284,20 +1291,28 @@ public ParameterVariant PinTypeToParameterVariant(CompositePinType type)
         private void LoadInfo(string filepath)
         {
             _compPurges = (CompositePurgeTable)CustomTable.ReadTable(filepath, CustomTableType.COMPOSITE_PURGE_STATES);
-            if (_compPurges == null) _compPurges = new CompositePurgeTable();
-            Console.WriteLine("Registered " + _compPurges.purged.Count + " pre-purged composites!");
+            if (_compPurges == null) 
+                _compPurges = new CompositePurgeTable();
+            else
+                Console.WriteLine("Registered " + _compPurges.purged.Count + " pre-purged composites!");
 
             _entityNames = (EntityNameTable)CustomTable.ReadTable(filepath, CustomTableType.ENTITY_NAMES);
-            if (_entityNames == null) _entityNames = new EntityNameTable();
-            Console.WriteLine("Loaded " + _entityNames.names.Count + " custom entity names!");
+            if (_entityNames == null) 
+                _entityNames = new EntityNameTable();
+            else
+                Console.WriteLine("Loaded " + _entityNames.names.Count + " custom entity names!");
 
             _modificationInfo = (CompositeModificationInfoTable)CustomTable.ReadTable(filepath, CustomTableType.COMPOSITE_MODIFICATION_INFO);
-            if (_modificationInfo == null) _modificationInfo = new CompositeModificationInfoTable();
-            Console.WriteLine("Loaded modification info for " + _modificationInfo.modification_info.Count + " composites!");
+            if (_modificationInfo == null) 
+                _modificationInfo = new CompositeModificationInfoTable();
+            else
+                Console.WriteLine("Loaded modification info for " + _modificationInfo.modification_info.Count + " composites!");
 
             _pinInfo = (CompositePinInfoTable)CustomTable.ReadTable(filepath, CustomTableType.COMPOSITE_PIN_INFO);
-            if (_pinInfo == null) _pinInfo = new CompositePinInfoTable();
-            Console.WriteLine("Loaded custom pin info for " + _pinInfo.composite_pin_infos.Count + " composites!");
+            if (_pinInfo == null) 
+                _pinInfo = new CompositePinInfoTable();
+            else
+                Console.WriteLine("Loaded custom pin info for " + _pinInfo.composite_pin_infos.Count + " composites!");
         }
         private void SaveInfo(string filepath)
         {

CathodeLib/Scripts/CATHODE/Commands/Helpers/ShortGuidUtils.cs

@@ -4,35 +4,21 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
 #if UNITY_EDITOR || UNITY_STANDALONE
 using UnityEngine;
 #endif
 
+[assembly: InternalsVisibleTo("CATHODE.Scripting")]
 namespace CATHODE.Scripting
 {
     public static class ShortGuidUtils
     {
         private static GuidNameTable _custom = new GuidNameTable();
 
-        public static Commands LinkedCommands => _commands;
-        private static Commands _commands;
-
-        /* Optionally, link a Commands file which can be used to save custom ShortGuids to */
-        public static void LinkCommands(Commands commands)
-        {
-            if (_commands != null)
-                _commands.OnSaveSuccess -= SaveCustomNames;
-
-            _commands = commands;
-            if (_commands == null) return;
-
-            _commands.OnSaveSuccess += SaveCustomNames;
-
-            LoadCustomNames(commands.Filepath);
-        }
-
         /* Generate a ShortGuid to interface with the Cathode scripting system */
         public static ShortGuid Generate(string value, bool cache = true)
         {
@@ -86,31 +72,60 @@ public static ShortGuid GenerateRandom()
         }
 
         /* Cache a pre-generated ShortGuid */
-        private static void Cache(ShortGuid guid, string value)
+        private static bool Cache(ShortGuid guid, string value)
         {
-            //TODO: need to fix this for BSPNOSTROMO_RIPLEY_PATCH (?)
-            if (_custom.cache.ContainsKey(value)) return;
+            if (_custom.cache.ContainsKey(value)) return false;
             _custom.cache.Add(value, guid);
             try
             {
+                //TODO: need to fix this for BSPNOSTROMO_RIPLEY_PATCH (?)
                 _custom.cacheReversed.Add(guid, value);
             }
             catch { }
+            return true;
         }
 
-        /* Pull non-vanilla ShortGuid from the CommandsPAK */
-        private static void LoadCustomNames(string filepath)
+        #region Commands Linking
+        private static List<Commands> _commands = new List<Commands>();
+
+        /* Utilised by CommandsUtils: this connects up a loaded Commands object, allowing generated ShortGuids to be stored for re-use next session */
+        internal static void LinkCommands(Commands commands)
         {
-            _custom = (GuidNameTable)CustomTable.ReadTable(filepath, CustomTableType.SHORT_GUIDS);
-            if (_custom == null) _custom = new GuidNameTable();
-            Console.WriteLine("Loaded " + _custom.cache.Count + " custom ShortGuids!");
+            if (_commands.FirstOrDefault(o => o.Filepath == commands.Filepath) != null)
+                return;
+
+            _commands.Add(commands);
+            commands.OnSaveSuccess += SaveCustomNames;
+            LoadCustomNames(commands.Filepath);
         }
+        internal static void UnlinkCommands(Commands commands)
+        {
+            Commands linkedCommands = _commands.FirstOrDefault(o => o.Filepath == commands.Filepath);
+            if (linkedCommands == null)
+                return;
+            _commands.Remove(linkedCommands);
+        }
+
+        /* Load/save custom shortguids */
+        private static void LoadCustomNames(string filepath)
+        {
+            GuidNameTable guids = (GuidNameTable)CustomTable.ReadTable(filepath, CustomTableType.SHORT_GUIDS);
+            if (guids == null)
+                return;
 
-        /* Write non-vanilla entity names to the CommandsPAK */
+            int added = 0;
+            foreach (KeyValuePair<string, ShortGuid> str in guids.cache)
+            {
+                if (Cache(str.Value, str.Key))
+                    added++;
+            }
+            Console.WriteLine("Loaded " + added + " ShortGuids!");
+        }
         private static void SaveCustomNames(string filepath)
         {
             CustomTable.WriteTable(filepath, CustomTableType.SHORT_GUIDS, _custom);
-            Console.WriteLine("Saved " + _custom.cache.Count + " custom ShortGuids!");
+            Console.WriteLine("Saved " + _custom.cache.Count + " ShortGuids!");
         }
+        #endregion
     }
 }