Wrap: Improve file performance lookup with pre-initialized Dictionary (…

…#119)
tsunamods-codes · Dec 3, 2022 · 5789085 · 5789085
1 parent 34c7395
commit 5789085
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 11 deletions.
diff --git a/7thWrapperLib/Profile.cs b/7thWrapperLib/Profile.cs
@@ -512,6 +512,11 @@ private IEnumerable<string> GetPathOverrideNamesInt(string path)
                 }
             }
         }
+
+        public IrosArc getArchive()
+        {
+            return _archive;
+        }
     }
 
     public abstract class ActiveWhen

diff --git a/7thWrapperLib/VFile.cs b/7thWrapperLib/VFile.cs
@@ -381,15 +381,16 @@ public void Ping() {
             }
         }
 
-        public static OverrideFile MapFile(string file, RuntimeProfile profile) {
-            foreach (var item in profile.Mods) {
-                foreach(var entry in item.GetOverrides(file)) {
-                    if (entry.CFolder == null || entry.CFolder.IsActive(file)) {
-                        DebugLogger.WriteLine($"File {file} overridden by {entry.Archive}{entry.File}");
-                        return entry;
-                    }
-                }
-            }
+        public static OverrideFile MapFile(string file, Dictionary<string, List<OverrideFile>> mappedFiles) {
+            if (mappedFiles.TryGetValue(file.ToLower(), out List<OverrideFile> mappedList))
+            {
+                foreach (var overrideFile in mappedList)
+                {
+                    if (overrideFile.CFolder == null || overrideFile.CFolder.IsActive(file))
+                        return overrideFile;
+                }
+            }
+
             return null;
         }
 

diff --git a/7thWrapperLib/Wrap.cs b/7thWrapperLib/Wrap.cs
@@ -16,6 +16,7 @@ The original developer is Iros <irosff@outlook.com>
 namespace _7thWrapperLib {
     public static class Wrap {
         private static Dictionary<IntPtr, VArchiveData> _varchives = new();
+        private static Dictionary<string, List<OverrideFile>> _mappedFiles = new();
         private static RuntimeProfile _profile;
         private static Process _process;
 
@@ -136,12 +137,100 @@ public static void Run(Process currentProcess, string profileFile = ".7thWrapper
                         }
                     }
                 }
+
+                foreach (var mod in _profile.Mods)
+                {
+                    foreach (var cFolder in mod.Conditionals)
+                    {
+                        var archive = mod.getArchive();
+                        if (archive == null)
+                            AddFolderFilesToMappedFiles(Path.Combine(mod.BaseFolder, cFolder.Folder), cFolder);
+                        else
+                            AddIROFilesToMappedFiles(cFolder.Folder, cFolder, archive);
+                    }
+
+                    foreach (var folder in mod.ExtraFolders)
+                    {
+                        var archive = mod.getArchive();
+                        if (archive == null)
+                            AddFolderFilesToMappedFiles(Path.Combine(mod.BaseFolder, folder), null);
+                        else
+                            AddIROFilesToMappedFiles(folder, null, archive);
+                    }
+
+                    if (mod.Conditionals.Count + mod.ExtraFolders.Count == 0)
+                    {
+                        var archive = mod.getArchive();
+                        if (archive == null)
+                            AddFolderFilesToMappedFiles(mod.BaseFolder, null);
+                        else
+                            AddIROFilesToMappedFiles("", null, archive);
+                    }
+                }
             } catch (Exception e) {
                 DebugLogger.WriteLine(e.ToString());
                 return;
             }
         }
 
+        private static void AddIROFilesToMappedFiles(string folderPath, ConditionalFolder cFolder, IrosArc archive)
+        {
+            foreach (string filename in archive.AllFileNames())
+            {
+                if (filename.StartsWith(folderPath, StringComparison.InvariantCultureIgnoreCase))
+                {
+                    int pathOffset = 1;
+                    if (folderPath.Length == 0) // Fix the offset when folderPath is empty string (no need to skip "/")
+                        pathOffset = 0;
+                    string fileKey = filename.Substring(folderPath.Length + pathOffset).ToLower();
+                    if (!_mappedFiles.ContainsKey(fileKey))
+                        _mappedFiles.Add(fileKey, new List<OverrideFile>());
+
+                    if (_mappedFiles.TryGetValue(fileKey, out List<OverrideFile> overrideFiles))
+                    {
+                        overrideFiles.Add(new OverrideFile()
+                        {
+                            File = filename,
+                            CFolder = cFolder,
+                            CName = fileKey,
+                            Size = archive.GetFileSize(filename),
+                            Archive = archive
+                        });
+                    }
+                }
+            }
+        }
+
+        private static void AddFolderFilesToMappedFiles(string folderPath, ConditionalFolder conditionalFolder)
+        {
+            try
+            {
+                DirectoryInfo di = new DirectoryInfo(folderPath);
+
+                foreach (FileInfo fi in di.GetFiles("*", SearchOption.AllDirectories))
+                {
+                    string fileKey = fi.FullName.Substring(folderPath.Length + 1).ToLower();
+                    if (!_mappedFiles.ContainsKey(fileKey))
+                        _mappedFiles.Add(fileKey, new List<OverrideFile>());
+
+                    if (_mappedFiles.TryGetValue(fileKey, out List<OverrideFile> overrideFiles))
+                    {
+                        overrideFiles.Add(new OverrideFile()
+                        {
+                            File = fi.FullName,
+                            CFolder = conditionalFolder,
+                            CName = fileKey
+                        });
+                    }
+                }
+            }
+            catch (DirectoryNotFoundException e)
+            {
+                DebugLogger.WriteLine(e.ToString());
+            }
+        }
+
+
         // ------------------------------------------------------------------------------------------------------
         public static int HCloseHandle(IntPtr hObject)
         {
@@ -248,15 +337,15 @@ public static IntPtr HCreateFileW(
                     if (lpFileName.StartsWith(path, StringComparison.InvariantCultureIgnoreCase))
                     {
                         string match = lpFileName.Substring(path.Length);
-                        OverrideFile mapped = LGPWrapper.MapFile(match, _profile);
+                        OverrideFile mapped = LGPWrapper.MapFile(match, _mappedFiles);
 
                         //DebugLogger.WriteLine($"Attempting match '{match}' for {lpFileName}...");
 
                         if (mapped == null)
                         {
                             // Attempt a second round, this time relaxing the path match replacing only the game folder path.
                             match = lpFileName.Substring(_profile.FF7Path.Length + 1);
-                            mapped = LGPWrapper.MapFile(match, _profile);
+                            mapped = LGPWrapper.MapFile(match, _mappedFiles);
 
                             //DebugLogger.WriteLine($"Attempting match '{match}' for {lpFileName}...");
                         }