Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bit of cleanup of the compiler process

Browse Source
This commit is contained in:
Timothy Baldridge 2022-08-22 14:43:44 -06:00
parent 5cfa111f7c
commit 7a681778a2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Wabbajack.Compiler/MO2Compiler.cs
View File

@ -77,15 +77,11 @@ public class MO2Compiler : ACompiler
var roots = new List<AbsolutePath> {Settings.Source, Settings.Downloads}; var roots = new List<AbsolutePath> {Settings.Source, Settings.Downloads};
roots.AddRange(Settings.OtherGames.Append(Settings.Game).Select(g => _locator.GameLocation(g))); roots.AddRange(Settings.OtherGames.Append(Settings.Game).Select(g => _locator.GameLocation(g)));
roots.Add(Settings.Downloads);
NextStep("Initializing", "Add Roots"); NextStep("Initializing", "Add Roots");
await _vfs.AddRoots(roots, token, async (cur, max) => UpdateProgressAbsolute(cur, max)); // Step 1 await _vfs.AddRoots(roots, token, async (cur, max) => UpdateProgressAbsolute(cur, max)); // Step 1
//await InferMetas(token); // Step 2
NextStep("Initializing", "Add Download Roots");
await _vfs.AddRoot(Settings.Downloads, token); // Step 3
// Find all Downloads // Find all Downloads
IndexedArchives = await Settings.Downloads.EnumerateFiles() IndexedArchives = await Settings.Downloads.EnumerateFiles()
.Where(f => f.WithExtension(Ext.Meta).FileExists()) .Where(f => f.WithExtension(Ext.Meta).FileExists())
@ -103,7 +99,7 @@ public class MO2Compiler : ACompiler
await CleanInvalidArchivesAndFillState(); await CleanInvalidArchivesAndFillState();
NextStep("Initializing", "Indexing Data");
var mo2Files = Settings.Source.EnumerateFiles() var mo2Files = Settings.Source.EnumerateFiles()
.Where(p => p.FileExists()) .Where(p => p.FileExists())
.Select(p => new RawSourceFile(_vfs.Index.ByRootPath[p], p.RelativeTo(Settings.Source))); .Select(p => new RawSourceFile(_vfs.Index.ByRootPath[p], p.RelativeTo(Settings.Source)));
@ -164,6 +160,7 @@ public class MO2Compiler : ACompiler
InstallDirectives = results.Where(i => i is not IgnoredDirectly).ToList(); InstallDirectives = results.Where(i => i is not IgnoredDirectly).ToList();
NextStep("Compiling", "Verifying zEdit Merges (if any)");
zEditIntegration.VerifyMerges(this); zEditIntegration.VerifyMerges(this);
await BuildPatches(token); await BuildPatches(token);
@ -242,6 +239,7 @@ public class MO2Compiler : ACompiler
/// <returns></returns> /// <returns></returns>
public override IEnumerable<ICompilationStep> MakeStack() public override IEnumerable<ICompilationStep> MakeStack()
{ {
NextStep("Initialization", "Generating Compilation Stack");
_logger.LogInformation("Generating compilation stack"); _logger.LogInformation("Generating compilation stack");
var steps = new List<ICompilationStep> var steps = new List<ICompilationStep>
{ {