- Ensure all semaphore slim lock references are structured as :

 Lock -> Try -> Finally(Unlock)
To ensure no deadlock cases exist due to unexpected errors.
- Batch cache updates to the end of the process for full-modlist enable/disable.

Author: Lunaretic

xivModdingFramework/Mods/Modding.cs

@@ -22,6 +22,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using xivModdingFramework.Cache;
 using xivModdingFramework.General.Enums;
 using xivModdingFramework.Helpers;
 using xivModdingFramework.Mods.DataContainers;
@@ -387,6 +388,7 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,
 
             if (modList == null || modList.modCount == 0) return;
 
+
             var modNum = 0;
             foreach (var modEntry in modList.Mods)
             {
@@ -412,20 +414,27 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,
                     // Standard mod.
                     if (enable && !modEntry.enabled)
                     {
-                        await index.UpdateDataOffset(modEntry.data.modOffset, modEntry.fullPath);
+                        await index.UpdateDataOffset(modEntry.data.modOffset, modEntry.fullPath, false);
                         modEntry.enabled = true;
                     }
                     else if (!enable && modEntry.enabled)
                     {
-                        await index.UpdateDataOffset(modEntry.data.originalOffset, modEntry.fullPath);
+                        await index.UpdateDataOffset(modEntry.data.originalOffset, modEntry.fullPath, false);
                         modEntry.enabled = false;
                     }
                 }
 
                 progress?.Report((++modNum, modList.Mods.Count, string.Empty));
             }
 
+
             SaveModList(modList);
+
+
+            // Do these as a batch query at the end.
+            progress?.Report((++modNum, modList.Mods.Count, "Adding modified files to Cache Queue..."));
+            var allPaths = modList.Mods.Select(x => x.fullPath).Where(x => !String.IsNullOrEmpty(x)).ToList();
+            await XivCache.QueueDependencyUpdate(allPaths);
         }
 
         /// <summary>

xivModdingFramework/SqPack/FileTypes/Dat.cs

@@ -97,9 +97,16 @@ public int CreateNewDat(XivDataFile dataFile)
         public int GetLargestDatNumber(XivDataFile dataFile)
         {
 
+            string[] allFiles = null;
             _lock.Wait();
-            var allFiles = Directory.GetFiles(_gameDirectory.FullName);
-            _lock.Release();
+            try
+            {
+                allFiles = Directory.GetFiles(_gameDirectory.FullName);
+            }
+            finally
+            {
+                _lock.Release();
+            }
 
             var dataFiles = from file in allFiles where file.Contains(dataFile.GetDataFileName()) && file.Contains(".dat") select file;
 
@@ -146,29 +153,35 @@ public async Task<List<string>> GetModdedDatList(XivDataFile dataFile)
             await Task.Run(async () =>
             {
                 await _lock.WaitAsync();
-                for (var i = 1; i < 20; i++)
+                try
                 {
-                    var datFilePath = $"{_gameDirectory}/{dataFile.GetDataFileName()}.win32.dat{i}";
-
-                    if (File.Exists(datFilePath))
+                    for (var i = 1; i < 20; i++)
                     {
-                        // Due to an issue where 060000 dat1 gets deleted, we are skipping it here
-                        if (datFilePath.Contains("060000.win32.dat1"))
-                        {
-                            continue;
-                        }
-                        using (var binaryReader = new BinaryReader(File.OpenRead(datFilePath)))
-                        {
-                            binaryReader.BaseStream.Seek(24, SeekOrigin.Begin);
+                        var datFilePath = $"{_gameDirectory}/{dataFile.GetDataFileName()}.win32.dat{i}";
 
-                            if (binaryReader.ReadByte() == 0)
+                        if (File.Exists(datFilePath))
+                        {
+                            // Due to an issue where 060000 dat1 gets deleted, we are skipping it here
+                            if (datFilePath.Contains("060000.win32.dat1"))
                             {
-                                datList.Add(datFilePath);
+                                continue;
+                            }
+                            using (var binaryReader = new BinaryReader(File.OpenRead(datFilePath)))
+                            {
+                                binaryReader.BaseStream.Seek(24, SeekOrigin.Begin);
+
+                                if (binaryReader.ReadByte() == 0)
+                                {
+                                    datList.Add(datFilePath);
+                                }
                             }
                         }
                     }
                 }
-                _lock.Release();
+                finally
+                {
+                    _lock.Release();
+                }
             });
             return datList;
         }
@@ -1317,22 +1330,27 @@ public async Task<int> WriteToDat(List<byte> importData, Mod modEntry, string in
 
 
             await _lock.WaitAsync();
-            // If there is an existing modlist entry, use that data to get the modDatPath
-            if (modEntry != null)
+            try
             {
-                datNum = ((modEntry.data.modOffset / 8) & 0x0F) / 2;
-                modDatPath = Path.Combine(_gameDirectory.FullName, $"{modEntry.datFile}{DatExtension}{datNum}");
-
-                if (!File.Exists(modDatPath))
+                // If there is an existing modlist entry, use that data to get the modDatPath
+                if (modEntry != null)
                 {
-                    _lock.Release();
-                    throw new Exception($"A mod entry is pointing to {Path.GetFileName(modDatPath)}, but the file does not exist.\n\n" +
-                                        $"It is recommended to do a Start Over.");
+                    datNum = ((modEntry.data.modOffset / 8) & 0x0F) / 2;
+                    modDatPath = Path.Combine(_gameDirectory.FullName, $"{modEntry.datFile}{DatExtension}{datNum}");
+
+                    if (!File.Exists(modDatPath))
+                    {
+                        throw new Exception($"A mod entry is pointing to {Path.GetFileName(modDatPath)}, but the file does not exist.\n\n" +
+                                            $"It is recommended to do a Start Over.");
+                    }
                 }
-            }
 
-            var fileLength = new FileInfo(modDatPath).Length;
-            _lock.Release();
+                var fileLength = new FileInfo(modDatPath).Length;
+            }
+            finally
+            {
+                _lock.Release();
+            }
 
             // Checks to make sure the offsets in the mod list are not 0
             // If they are 0, something went wrong in the import proccess (Technically shouldn't happen)
@@ -1606,7 +1624,7 @@ where entry.fullPath.Equals(modEntry.fullPath)
             }
 
             // Queue our dependency information updates.
-            XivCache.QueueDependencyUpdate(internalFilePath);
+            await XivCache.QueueDependencyUpdate(internalFilePath);
 
             return offset;
         }