From e7b7e5195345982eca0e1da2cbf2734d03f3a4f5 Mon Sep 17 00:00:00 2001
From: erri120 <erri120@protonmail.com>
Date: Fri, 26 Mar 2021 12:11:43 +0100
Subject: [PATCH] Update OMODFramework to 3.x

---
 .../FileExtractor2/FileExtractor.cs           | 50 +++++++------------
 .../Wabbajack.VirtualFileSystem.csproj        |  2 +-
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/Wabbajack.VirtualFileSystem/FileExtractor2/FileExtractor.cs b/Wabbajack.VirtualFileSystem/FileExtractor2/FileExtractor.cs
index 80f051bf..9762660b 100644
--- a/Wabbajack.VirtualFileSystem/FileExtractor2/FileExtractor.cs
+++ b/Wabbajack.VirtualFileSystem/FileExtractor2/FileExtractor.cs
@@ -120,47 +120,31 @@ namespace Wabbajack.VirtualFileSystem
             var dest = await TempFolder.Create();
             Utils.Log($"Extracting {(string)tmpFile.Path}");
 
-            Framework.Settings.TempPath = (string)dest.Dir;
-            Framework.Settings.CodeProgress = new OMODProgress();
-
-            var omod = new OMOD((string)tmpFile.Path);
-            omod.GetDataFiles();
-            omod.GetPlugins();
+            using var omod = new OMOD((string) tmpFile.Path);
 
             var results = new Dictionary<RelativePath, T>();
-            foreach (var file in dest.Dir.EnumerateFiles())
+            
+            omod.ExtractFilesParallel((string) dest.Dir, 4);
+            if (omod.HasEntryFile(OMODEntryFileType.PluginsCRC))
+                omod.ExtractFiles(false, (string) dest.Dir);
+
+            var files = omod.GetDataFiles();
+            if (omod.HasEntryFile(OMODEntryFileType.PluginsCRC))
+                files.UnionWith(omod.GetPluginFiles());
+            
+            foreach (var compressedFile in files)
             {
-                var path = file.RelativeTo(dest.Dir);
-                if (!shouldExtract(path)) continue;
+                var abs = compressedFile.Name.RelativeTo(dest.Dir);
+                var rel = abs.RelativeTo(dest.Dir); 
+                if (!shouldExtract(rel)) continue;
 
-                var result = await mapfn(path, new ExtractedNativeFile(file));
-                results.Add(path, result);
+                var result = await mapfn(rel, new ExtractedNativeFile(abs));
+                results.Add(rel, result);
             }
-
+            
             return results;
         }
 
-        private class OMODProgress : ICodeProgress
-        {
-            private long _total;
-
-            public void SetProgress(long inSize, long outSize)
-            {
-                Utils.Status("Extracting OMOD", Percent.FactoryPutInRange(inSize, _total));
-            }
-
-            public void Init(long totalSize, bool compressing)
-            {
-                _total = totalSize;
-            }
-
-            public void Dispose()
-            {
-                //
-            }
-        }
-
-
         private static async Task<Dictionary<RelativePath,T>> GatheringExtractWithBSA<T>(IStreamFactory sFn, Definitions.FileType sig, Predicate<RelativePath> shouldExtract, Func<RelativePath,IExtractedFile,ValueTask<T>> mapfn)
         {
             var archive = await BSADispatch.OpenRead(sFn, sig);
diff --git a/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj b/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
index 853b2700..73d499e2 100644
--- a/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
+++ b/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
@@ -16,7 +16,7 @@
     <ItemGroup>
       <PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
       <PackageReference Include="K4os.Hash.Crc" Version="1.1.4" />
-      <PackageReference Include="OMODFramework" Version="2.2.0" />
+      <PackageReference Include="OMODFramework" Version="3.0.1" />
       <PackageReference Include="SharpCompress" Version="0.28.1" />
       <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
     </ItemGroup>