- Bugfixes for Delete and Add file descriptor functions - Check for file access for both indices *BEFORE* writing to either index.

- Change StartOver function to begin with attempt to restore indexes, rather than start with attempt to disable mods. (Massive perf improvement on start overs)

Author: Lunaretic

xivModdingFramework/Helpers/ProblemChecker.cs

@@ -162,8 +162,6 @@ public Task PerformStartOver(DirectoryInfo backupsDirectory, IProgress<string> p
         {
             return Task.Run(async () =>
             {
-                progress?.Report("Deleting mods...");
-
                 var modding = new Modding(_gameDirectory);
                 var backupsRestored = false;
 
@@ -173,45 +171,30 @@ public Task PerformStartOver(DirectoryInfo backupsDirectory, IProgress<string> p
 
                 try
                 {
-                    // Try to restore the index entries to their original values by deleting any files added by TexTools
-                    // and setting mods to disabled
-                    await modding.DeleteAllFilesAddedByTexTools();
-                    await modding.ToggleAllMods(false);
-                    progress?.Report("Restoring index file backups...");
-                }
-                catch(Exception ex)
-                {
-                    // If an exception occurred due to a corrupted modlist which couldn't be deserealized restore the backup index
-                    // files by force
+                    // Try restoring the indexes FIRST.
                     backupsRestored = await RestoreBackups(backupsDirectory);
+                    progress?.Report("Restoring index file backups...");
 
                     if (!backupsRestored)
                     {
                         throw new Exception("Start Over Failed: Index backups missing/outdated.");
                     }
                 }
-                finally
+                catch(Exception ex)
                 {
-                    // If no exception occured, restore the backups anyway just to be safe but don't throw an exception if it fails
-                    // due to outdated or missing backups since setting back the original index values should be enough hopefully
-                    if (!backupsRestored)
+                    try
                     {
-                        backupsRestored = await RestoreBackups(backupsDirectory);
-
-                        // If backups were not restored that means they were missing/outdated so try to make new backups now
-                        if (!backupsRestored)
-                        {
-                            try
-                            {
-                                await BackupIndexFiles(backupsDirectory);
-                            }
-                            catch (Exception ex)
-                            {
-                                throw new Exception("Start Over Failed: Failed to update outdated backups.\n\n" + ex.Message);
-                            }
-                        }
+                        // If the index restore failed, try just disabling.
+                        await modding.DeleteAllFilesAddedByTexTools();
+                        await modding.ToggleAllMods(false);
+                        progress?.Report("Index restore failed, attempting to delete all mods instead...");
+                    } catch
+                    {
+                        throw new Exception("Start Over Failed: Index Backups Invalid and Unable to Disable all mods.");
                     }
-
+                }
+                finally
+                {
                     progress?.Report("Deleting modded dat files...");
 
                     var dat = new Dat(_gameDirectory);

xivModdingFramework/SqPack/FileTypes/Index.cs

@@ -776,6 +776,38 @@ public async Task<bool> DeleteFileDescriptor(string fullPath, XivDataFile dataFi
             var oldChildren = await XivCache.GetChildFiles(fullPath);
 
             await _semaphoreSlim.WaitAsync();
+
+            // Test both index files for write access.
+            try
+            {
+                var indexPath = Path.Combine(_gameDirectory.FullName, $"{dataFile.GetDataFileName()}{IndexExtension}");
+                using (var fs = new FileStream(indexPath, FileMode.Open))
+                {
+                    var canRead = fs.CanRead;
+                    var canWrite = fs.CanWrite;
+                    if (!canRead || !canWrite)
+                    {
+                        throw new Exception();
+                    }
+                }
+                var index2Path = Path.Combine(_gameDirectory.FullName, $"{dataFile.GetDataFileName()}{Index2Extension}");
+                using (var fs = new FileStream(index2Path, FileMode.Open))
+                {
+                    var canRead = fs.CanRead;
+                    var canWrite = fs.CanWrite;
+                    if (!canRead || !canWrite)
+                    {
+                        throw new Exception();
+                    }
+                }
+            }
+            catch
+            {
+                _semaphoreSlim.Release();
+                throw new Exception("Unable to update Index files.  File(s) are currently in use.");
+            }
+
+
             fullPath = fullPath.Replace("\\", "/");
             var pathHash = HashGenerator.GetHash(fullPath.Substring(0, fullPath.LastIndexOf("/", StringComparison.Ordinal)));
             var fileHash = HashGenerator.GetHash(Path.GetFileName(fullPath));
@@ -1048,6 +1080,37 @@ public async Task<bool> DeleteFileDescriptor(string fullPath, XivDataFile dataFi
         public async Task<bool> AddFileDescriptor(string fullPath, int dataOffset, XivDataFile dataFile)
         {
             await _semaphoreSlim.WaitAsync();
+
+            // Test both index files for write access.
+            try
+            {
+                var indexPath = Path.Combine(_gameDirectory.FullName, $"{dataFile.GetDataFileName()}{IndexExtension}");
+                using (var fs = new FileStream(indexPath, FileMode.Open))
+                {
+                    var canRead = fs.CanRead;
+                    var canWrite = fs.CanWrite;
+                    if (!canRead || !canWrite)
+                    {
+                        throw new Exception();
+                    }
+                }
+                var index2Path = Path.Combine(_gameDirectory.FullName, $"{dataFile.GetDataFileName()}{Index2Extension}");
+                using (var fs = new FileStream(index2Path, FileMode.Open))
+                {
+                    var canRead = fs.CanRead;
+                    var canWrite = fs.CanWrite;
+                    if (!canRead || !canWrite)
+                    {
+                        throw new Exception();
+                    }
+                }
+            }
+            catch
+            {
+                _semaphoreSlim.Release();
+                throw new Exception("Unable to update Index files.  File(s) are currently in use.");
+            }
+
             fullPath = fullPath.Replace("\\", "/");
             var pathHash = HashGenerator.GetHash(fullPath.Substring(0, fullPath.LastIndexOf("/", StringComparison.Ordinal)));
             var fileHash = HashGenerator.GetHash(Path.GetFileName(fullPath));