Refactor and feature enhancement

AssetEditor/App.xaml.cs

@@ -100,7 +100,7 @@ private void LoadCAPackFiles(ApplicationSettingsService settingsService)
             {
                 var packfileService = _serviceProvider.GetRequiredService<IPackFileService>();
                 var containerLoader = _serviceProvider.GetRequiredService<IPackFileContainerLoader>();
-                var loadRes = containerLoader.LoadAllCaFiles(settingsService.CurrentSettings.CurrentGame);
+                var loadRes = containerLoader.CreateFromGameEnum(PackFileContainerType.Cached, settingsService.CurrentSettings.CurrentGame);
 
                 if (loadRes == null)
                     MessageBox.Show($"Unable to load all CA packfiles in {gamePath}");

AssetEditor/UiCommands/OpenGamePackCommand.cs

@@ -50,7 +50,7 @@ public void Execute()
 
             using (new WaitCursor())
             {
-                var res = _packFileContainerLoader.LoadAllCaFiles(_game);
+                var res = _packFileContainerLoader.CreateFromGameEnum(PackFileContainerType.Cached, _game);
                 _packFileService.AddContainer(res);
             }
         }

AssetEditor/UiCommands/OpenPackFileCommand.cs

@@ -25,7 +25,7 @@ public void Execute()
 
             if (dialog.ShowDialog() != DialogResult.OK)
                 return;
-            var container = _packFileContainerLoader.Load(dialog.FileName);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, dialog.FileName, false);
             _packFileService.AddContainer(container, true);
         }
     }

AssetEditor/ViewModels/MenuBarViewModel.cs

@@ -168,7 +168,7 @@ void CreateRecentPackFilesItems()
                 path,
                 () =>
                 {
-                    var container = _packFileContainerLoader.Load(path);
+                    var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, path, false);
                     if (container == null)
                     {
                         System.Windows.MessageBox.Show($"Unable to load packfiles {path}");

Editors/Ipc/IpcEditor/ExternalPackLoader.cs

@@ -40,7 +40,7 @@ public Task<PackLoadResult> EnsureLoadedAsync(string packPathOnDisk, Cancellatio
 
             try
             {
-                var container = _packFileContainerLoader.Load(normalizedDiskPath);
+                var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, normalizedDiskPath, true);
                 if (container == null)
                     return Task.FromResult(PackLoadResult.Fail("Pack file could not be loaded"));
 

Editors/Kitbashing/KitbasherEditor/DevConfig/Kitbash_Karl.cs

@@ -34,7 +34,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.LoadCaPacksByDefault = false;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\Karl_and_celestialgeneral.pack";
 
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             container.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

Editors/Kitbashing/KitbasherEditor/DevConfig/Kitbash_MeshFitter.cs

@@ -46,7 +46,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.LoadCaPacksByDefault = false;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\AnimationTransfer_bear.pack";
 
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             container.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

Editors/Kitbashing/KitbasherEditor/DevConfig/Kitbash_Ox.cs

@@ -33,7 +33,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.LoadCaPacksByDefault = false;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\cinderbreath.pack";
 
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             container.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

Editors/Kitbashing/KitbasherEditor/DevConfig/Kitbash_Rat.cs

@@ -45,7 +45,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.LoadCaPacksByDefault = false;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\Throt.pack";
 
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             container.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

Editors/Kitbashing/KitbasherEditor/DevConfig/Kitbash_RomeShield.cs

@@ -33,7 +33,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.CurrentGame = GameTypeEnum.Rome2;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\Rome_Man_And_Shield_Pack";
 
-            var container = _packFileContainerLoader.LoadSystemFolderAsPackFileContainer(packFile);
+            var container = _packFileContainerLoader.CreateFromSystemFolder(packFile);
             container.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

Editors/MetaDataEditor/AnimationMeta/DevConfig/AnimMetaTool.cs

@@ -26,7 +26,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.LoadCaPacksByDefault = false;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\Throt.pack";
 
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             container!.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

Editors/MetaDataEditor/AnimationMeta/DevConfig/SuperView_Rat.cs

@@ -28,7 +28,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.CurrentGame = GameTypeEnum.Warhammer3;
             currentSettings.LoadCaPacksByDefault = false;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\Throt.pack";
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             container!.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

Editors/Reports/DeepSearch/DeepSearchReport.cs

@@ -73,7 +73,7 @@ public List<string> DeepSearch(string searchStr, bool caseSensetive)
                       {
                           using (var reader = new BinaryReader(fileStram, Encoding.ASCII))
                           {
-                              var pfc = _loader.Load(packFilePath);
+                              var pfc = _loader.CreateFromPackFile(PackFileContainerType.Normal, packFilePath, true);
 
                               _logger.Here().Information($"Searching through packfile {currentIndex}/{files.Count} -  {packFilePath} {pfc.GetFileCount()} files");
 

Editors/SkeletonEditor/Editor.VisualSkeletonEditor/DevConfig/SkeletonTool.cs

@@ -28,7 +28,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
             currentSettings.LoadCaPacksByDefault = false;
 
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\Karl_and_celestialgeneral.pack";
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             Guard.IsNotNull(container, "Failed to load pack file container for development config.");   
             container.IsCaPackFile = true;
             _packFileService.AddContainer(container);

Editors/TextureEditor/DevConfig/Texture_Karl.cs

@@ -31,7 +31,7 @@ public void OverrideSettings(ApplicationSettings currentSettings)
         {
             currentSettings.LoadCaPacksByDefault = false;
             var packFile = ResourceLoader.GetDevelopmentDataFolder() + "\\Karl_and_celestialgeneral.pack";
-            var container = _packFileContainerLoader.Load(packFile);
+            var container = _packFileContainerLoader.CreateFromPackFile(PackFileContainerType.Normal, packFile, true);
             container.IsCaPackFile = true;
             _packFileService.AddContainer(container);
         }

GameWorld/GameWorldCore/GameWorld.CoreTest/Services/SkeletonAnimationLookUpHelperKarlPackTests.cs

@@ -6,6 +6,7 @@
 using Shared.Core.Events.Global;
 using Shared.Core.PackFiles;
 using Shared.Core.PackFiles.Models;
+using Shared.Core.PackFiles.Serialization.CacheDatabase;
 using Shared.Core.PackFiles.Utility;
 using Shared.Core.Services;
 using Shared.Core.Settings;
@@ -32,9 +33,9 @@ public void LoadAndUnload_KarlPack_UpdatesSkeletonAndAnimationLookup()
                 .Returns(() => containers.ToList());
 
             var settingsService = new ApplicationSettingsService(GameTypeEnum.Warhammer3);
-            var loader = new PackFileContainerLoader(settingsService, new Mock<IStandardDialogs>().Object, new LocalizationManager());
+            var loader = new PackFileContainerLoader(settingsService, new Mock<IStandardDialogs>().Object, new LocalizationManager(), new PackFileContainerCacheHelper());
             var karlPackPath = PathHelper.GetDataFile("Karl_and_celestialgeneral.pack");
-            var karlContainer = loader.Load(karlPackPath);
+            var karlContainer = loader.CreateFromPackFile(PackFileContainerType.Normal, karlPackPath, false);
 
             Assert.That(karlContainer, Is.Not.Null);
 

Shared/SharedCore/Shared.Core/DependencyInjectionContainer.cs

@@ -6,6 +6,7 @@
 using Shared.Core.Events;
 using Shared.Core.Misc;
 using Shared.Core.PackFiles;
+using Shared.Core.PackFiles.Serialization.CacheDatabase;
 using Shared.Core.PackFiles.Utility;
 using Shared.Core.Services;
 using Shared.Core.Settings;
@@ -32,9 +33,9 @@ public override void Register(IServiceCollection services)
             services.AddSingleton<TouchedFilesRecorder>();
             services.AddScoped<IUiCommandFactory, UiCommandFactory>();
             services.AddScoped<CommandManager>();
-
 
 
+
             services.AddScoped<IEventHub, LocalScopeEventHub>();
             services.AddSingleton<IGlobalEventHub, GlobalEventHub>();
             services.AddScoped<IExceptionService, ExceptionService>();
@@ -43,6 +44,7 @@ public override void Register(IServiceCollection services)
 
 
             services.AddSingleton<LocalizationManager>();
+            services.AddScoped<IPackFileContainerCacheHelper, PackFileContainerCacheHelper>();
             services.AddTransient<IPackFileContainerLoader, PackFileContainerLoader>();
         }
     }