- Added additional safety checks when applying Metadata files.

Author: Lunaretic

xivModdingFramework/Mods/FileTypes/ItemMetadata.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
@@ -88,6 +89,31 @@ public ItemMetadata(XivDependencyRoot root)
             Root = root;
         }
 
+        /// <summary>
+        /// Validates this metadata file to ensure it is being written to the correct location.
+        /// </summary>
+        public void Validate(string path)
+        {
+            const string prefix = "INVALID METADATA ERROR: ";
+            if (Root == null)
+            {
+                throw new InvalidDataException(prefix + "Internal Root is NULL.");
+            }
+
+            if(Root.Info.GetRootFile() != path)
+            {
+                throw new InvalidDataException(prefix + "Internal file path not match destination file path.");
+            }
+
+            foreach(var entry in EstEntries)
+            {
+                if(entry.Value.SetId != Root.Info.PrimaryId && entry.Value.SetId != Root.Info.SecondaryId)
+                {
+                    throw new InvalidDataException(prefix + "Extra Skeleton Table entries do not match internal set number.");
+                }
+            }
+        }
+
         /// <summary>
         /// Gets the metadata file for an IItem entry
         /// </summary>

xivModdingFramework/Mods/Modding.cs

@@ -379,6 +379,8 @@ public async Task<bool> ToggleModUnsafe(bool enable, Mod mod, bool includeIntern
                         var data = await dat.GetType2Data(mod.fullPath, false);
                         var meta = await ItemMetadata.Deserialize(data);
 
+                        meta.Validate(mod.fullPath);
+
                         // And write that metadata to the actual constituent files.
                         await ItemMetadata.ApplyMetadata(meta);
                     }

xivModdingFramework/SqPack/FileTypes/Dat.cs

@@ -1863,10 +1863,13 @@ where entry.fullPath.Equals(modEntry.fullPath)
             var ext = Path.GetExtension(internalFilePath);
             if(ext == ".meta")
             {
+                
                 // Retreive the uncompressed meta entry we just wrote.
                 var data = await GetType2Data(offset, dataFile);
                 var meta = await ItemMetadata.Deserialize(data);
 
+                meta.Validate(internalFilePath);
+
                 // And write that metadata to the actual constituent files.
                 await ItemMetadata.ApplyMetadata(meta);
             }