Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2025-07-25 04:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Timothy Baldridge
2020-10-18 07:13:01 -06:00
parent 02631eb503
commit 80d93caf96
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Wabbajack.Lib/ACompiler.cs
View File

@ -52,9 +52,8 @@ namespace Wabbajack.Lib
public AbsolutePath SourcePath { get;} public AbsolutePath SourcePath { get;}
public AbsolutePath DownloadsPath { get;} public AbsolutePath DownloadsPath { get;}
public AbsolutePath ModListOutputFolder { get; }
public abstract AbsolutePath ModListOutputFolder { get; } public AbsolutePath ModListOutputFile { get; }
public abstract AbsolutePath ModListOutputFile { get; }
public bool IgnoreMissingFiles { get; set; } public bool IgnoreMissingFiles { get; set; }
@ -71,9 +70,14 @@ namespace Wabbajack.Lib
public ACompiler(int steps, string modlistName, AbsolutePath sourcePath, AbsolutePath downloadsPath, AbsolutePath outputModListName) public ACompiler(int steps, string modlistName, AbsolutePath sourcePath, AbsolutePath downloadsPath, AbsolutePath outputModListName)
: base(steps) : base(steps)
{ {
SourcePath = sourcePath;
DownloadsPath = downloadsPath;
ModListName = modlistName;
ModListOutputFile = outputModListName;
//set in MainWindowVM //set in MainWindowVM
WabbajackVersion = Consts.CurrentMinimumWabbajackVersion; WabbajackVersion = Consts.CurrentMinimumWabbajackVersion;
Settings = new CompilerSettings(); Settings = new CompilerSettings();
ModListOutputFolder = AbsolutePath.EntryPoint.Combine("output_folder", Guid.NewGuid().ToString());
} }
public static void Info(string msg) public static void Info(string msg)

6
Wabbajack.Lib/MO2Compiler.cs
View File

@ -25,7 +25,6 @@ namespace Wabbajack.Lib
var mo2game = (string)MO2Ini.General.gameName; var mo2game = (string)MO2Ini.General.gameName;
CompilingGame = GameRegistry.Games.First(g => g.Value.MO2Name == mo2game).Value; CompilingGame = GameRegistry.Games.First(g => g.Value.MO2Name == mo2game).Value;
GamePath = CompilingGame.GameLocation(); GamePath = CompilingGame.GameLocation();
ModListOutputFile = outputFile;
} }
public AbsolutePath MO2ModsFolder => SourcePath.Combine(Consts.MO2ModFolderName); public AbsolutePath MO2ModsFolder => SourcePath.Combine(Consts.MO2ModFolderName);
@ -36,11 +35,6 @@ namespace Wabbajack.Lib
public GameMetaData CompilingGame { get; } public GameMetaData CompilingGame { get; }
public override AbsolutePath ModListOutputFolder => ((RelativePath)"output_folder").RelativeToEntryPoint();
public override AbsolutePath ModListOutputFile { get; }
public dynamic MO2Ini { get; } public dynamic MO2Ini { get; }
public AbsolutePath MO2ProfileDir => SourcePath.Combine("profiles", MO2Profile); public AbsolutePath MO2ProfileDir => SourcePath.Combine("profiles", MO2Profile);