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

Merge pull request #679 from erri120/issue-652

Browse Source 
Fixed modlist.txt order
This commit is contained in:
Timothy Baldridge 2020-04-04 15:36:26 -06:00 committed by GitHub
commit 5518747b10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Wabbajack.Lib/CompilationSteps/IgnoreDisabledMods.cs
View File

@ -40,8 +40,7 @@ namespace Wabbajack.Lib.CompilationSteps
return new State();
}
private static bool IsAlwaysEnabled(dynamic data)
public static bool IsAlwaysEnabled(dynamic data)
{
if (data == null)
return false;

36
Wabbajack.Lib/CompilationSteps/IncludeThisProfile.cs
View File

@ -10,7 +10,7 @@ namespace Wabbajack.Lib.CompilationSteps
public class IncludeThisProfile : ACompilationStep
{
private readonly IEnumerable<string> _correctProfiles;
private readonly MO2Compiler _mo2Compiler;
private MO2Compiler _mo2Compiler;
public IncludeThisProfile(ACompiler compiler) : base(compiler)
{
@ -20,18 +20,17 @@ namespace Wabbajack.Lib.CompilationSteps
public override async ValueTask<Directive> Run(RawSourceFile source)
{
if (_correctProfiles.Any(p => source.Path.StartsWith(p)))
{
var data = source.Path.EndsWith("\\modlist.txt")
? ReadAndCleanModlist(source.AbsolutePath)
: File.ReadAllBytes(source.AbsolutePath);
if (!_correctProfiles.Any(p => source.Path.StartsWith(p)))
return null;
var e = source.EvolveTo<InlineFile>();
e.SourceDataID = _compiler.IncludeFile(data);
return e;
}
var data = source.Path.EndsWith("\\modlist.txt")
? ReadAndCleanModlist(source.AbsolutePath)
: File.ReadAllBytes(source.AbsolutePath);
var e = source.EvolveTo<InlineFile>();
e.SourceDataID = _compiler.IncludeFile(data);
return e;
return null;
}
public override IState GetState()
@ -39,12 +38,17 @@ namespace Wabbajack.Lib.CompilationSteps
return new State();
}
private static byte[] ReadAndCleanModlist(string absolutePath)
private byte[] ReadAndCleanModlist(string absolutePath)
{
var lines = File.ReadAllLines(absolutePath);
lines = (from line in lines
where !(line.StartsWith("-") && !line.EndsWith("_separator"))
select line).ToArray();
var alwaysEnabled = _mo2Compiler.ModInis.Where(f => IgnoreDisabledMods.IsAlwaysEnabled(f.Value))
.Select(f => f.Key)
.Distinct();
var lines = File.ReadAllLines(absolutePath).Where(l =>
{
return l.StartsWith("+")
|| alwaysEnabled.Any(x => x == l.Substring(1))
|| l.EndsWith("_separator");
}).ToArray();
return Encoding.UTF8.GetBytes(string.Join("\r\n", lines));
}