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

fixes #16 - multiple profiles are now supported

Browse Source
This commit is contained in:
Timothy Baldridge 2019-09-03 15:17:00 -06:00
parent d21a11b005
commit 7acd964f48
4 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,6 +11,8 @@ that is copied directly into a modfile (commonly used for `SSE Terrain Tamriel.e
* Fix crash caused by multiple downloads with the same SHA256
* Putting `WABBAJACK_ALWAYS_INCLUDE` on a mod's notes/comments will cause it to always be included in the modlist, even if disabled
* All `.json`, `.ini`, and `.yaml` files that contain remappable paths are now inlined and remapped.
* If Wabbajack finds a file called `otherprofiles.txt` inside the compile'd profile's folder. Then that file is assumed
to be a list of other profiles to be included in the install. This list should be the name of a profile, one name per line.
#### Version 0.8.1 - 8/29/2019
* Fixed a bug that was causing VFS temp folders not to be cleaned

1
VirtualFileSystem/VirtualFileSystem.cs
View File

@ -624,6 +624,7 @@ namespace VFS
Size = fio.Length;
Hash = Utils.FileSHA256(StagedPath);
LastModified = fio.LastWriteTime.ToMilliseconds();
}

2
Wabbajack.Common/Utils.cs
View File

@ -56,7 +56,7 @@ namespace Wabbajack.Common
using (var o = new CryptoStream(Stream.Null, sha, CryptoStreamMode.Write))
{
using (var i = File.OpenRead(file))
i.CopyToWithStatus(new FileInfo(file).Length, o, $"Hashing {Path.GetFileName(file)}");
i.CopyToWithStatus(new FileInfo(file).Length, o, $"Hashing {Path.GetFileName(file)}");
}
return sha.Hash.ToBase64();

56
Wabbajack/Compiler.cs
View File

@ -113,6 +113,8 @@ namespace Wabbajack
GamePath = ((string)MO2Ini.General.gamePath).Replace("\\\\", "\\");
}
public HashSet<string> SelectedProfiles { get; set; } = new HashSet<string>();
private IndexedArchive LoadArchive(string file)
{
var info = new IndexedArchive();
@ -140,6 +142,16 @@ namespace Wabbajack
public void Compile()
{
Info($"Looking for other profiles");
var other_profiles_path = Path.Combine(MO2ProfileDir, "otherprofiles.txt");
if (File.Exists(other_profiles_path))
{
SelectedProfiles = File.ReadAllLines(other_profiles_path).ToHashSet();
SelectedProfiles.Add(MO2Profile);
}
Info($"Using Profiles: " + string.Join(", ", SelectedProfiles.OrderBy(p => p)));
Info($"Indexing {MO2Folder}");
VFS.AddRoot(MO2Folder);
Info($"Indexing {GamePath}");
@ -827,21 +839,21 @@ namespace Wabbajack
private Func<RawSourceFile, Directive> IgnoreDisabledMods()
{
var always_enabled = ModInis.Where(f => IsAlwaysEnabled(f.Value)).Select(f => f.Key).ToHashSet();
var disabled_mods = File.ReadAllLines(Path.Combine(MO2ProfileDir, "modlist.txt"))
.Where(line => line.StartsWith("-") && !line.EndsWith("_separator"))
.Select(line => line.Substring(1))
.Where(line => !always_enabled.Contains(line))
.Select(line => Path.Combine("mods", line + "\\"))
.ToList();
var all_enabled_mods = SelectedProfiles
.SelectMany(p => File.ReadAllLines(Path.Combine(MO2Folder, "profiles", p, "modlist.txt")))
.Where(line => line.StartsWith("+") || line.EndsWith("_separator"))
.Select(line => line.Substring(1))
.Concat(always_enabled)
.Select(line => Path.Combine("mods", line) + "\\")
.ToList();
return source =>
{
if (disabled_mods.FirstOrDefault(mod => source.Path.StartsWith(mod)) != null)
{
var r = source.EvolveTo<IgnoredDirectly>();
r.Reason = "Disabled Mod";
return r;
}
return null;
if (!source.Path.StartsWith("mods") || all_enabled_mods.Any(mod => source.Path.StartsWith(mod))) return null;
var r = source.EvolveTo<IgnoredDirectly>();
r.Reason = "Disabled Mod";
return r;
};
}
@ -912,10 +924,11 @@ namespace Wabbajack
private Func<RawSourceFile, Directive> IncludeThisProfile()
{
var correct_profile = Path.Combine("profiles", MO2Profile) + "\\";
var correct_profiles = SelectedProfiles.Select(p => Path.Combine("profiles", p) + "\\").ToList();
return source =>
{
if (source.Path.StartsWith(correct_profile))
if (correct_profiles.Any(p => source.Path.StartsWith(p)))
{
byte[] data;
if (source.Path.EndsWith("\\modlist.txt"))
@ -942,13 +955,20 @@ namespace Wabbajack
private Func<RawSourceFile, Directive> IgnoreOtherProfiles()
{
var correct_profile = Path.Combine("profiles", MO2Profile) + "\\";
var profiles = SelectedProfiles
.Select(p => Path.Combine("profiles", p) + "\\")
.ToList();
return source =>
{
if (source.Path.StartsWith("profiles\\") && !source.Path.StartsWith(correct_profile))
if (source.Path.StartsWith("profiles\\"))
{
if (profiles.Any(profile => !source.Path.StartsWith(profile)))
{
return null;
}
var c = source.EvolveTo<IgnoredDirectly>();
c.Reason = "File not for this profile";
c.Reason = "File not for selected profiles";
return c;
}
return null;