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

Rel path conversion name issues in IncludePathces

Browse Source
This commit is contained in:
Timothy Baldridge 2020-04-21 16:58:42 -06:00
parent 82a733ab8a
commit adb3354615
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Wabbajack.Lib/CompilationSteps/IncludePatches.cs
View File

@ -52,15 +52,16 @@ namespace Wabbajack.Lib.CompilationSteps
}
}
var installationFile = (RelativePath)modIni?.General?.installationFile;
var installationFile = (string?)modIni?.General?.installationFile;
VirtualFile? found = null;
// Find based on exact file name + ext
if (choices != null)
if (choices != null && installationFile != null)
{
var relName = (RelativePath)Path.GetFileName(installationFile);
found = choices.FirstOrDefault(
f => f.FilesInFullPath.First().Name.FileName == installationFile);
f => f.FilesInFullPath.First().Name.FileName == relName);
}
// Find based on file name only (not ext)
@ -72,10 +73,11 @@ namespace Wabbajack.Lib.CompilationSteps
}
// Find based on matchAll=<archivename> in [General] in meta.ini
var matchAllName = (RelativePath?)modIni?.General?.matchAll;
var matchAllName = (string?)modIni?.General?.matchAll;
if (matchAllName != null)
{
if (_indexedByName.TryGetValue(matchAllName.Value, out var arch))
var relName = (RelativePath)Path.GetFileName(matchAllName);
if (_indexedByName.TryGetValue(relName, out var arch))
{
// Just match some file in the archive based on the smallest delta difference
found = arch.ThisAndAllChildren