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

Fix list validation to be more robust

Browse Source
This commit is contained in:
Timothy Baldridge 2022-06-22 14:30:43 -06:00
parent 22fee95891
commit 98b7437aa8
6 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Wabbajack.CLI/Verbs/DownloadAll.cs
View File

@ -62,12 +62,15 @@ public class DownloadAll : IVerb
})
.ToHashSet();
var archives = (await (await _wjClient.LoadLists())
var lists = await _wjClient.LoadLists();
var archives = (await (await _wjClient.GetListStatuses())
.Where(l => !l.HasFailures)
.PMapAll(_limiter, async m =>
{
try
{
return await StandardInstaller.Load(_dtos, _dispatcher, m, token);
return await StandardInstaller.Load(_dtos, _dispatcher, lists.First(l => l.NamespacedName == m.MachineURL), token);
}
catch (Exception ex)
{
@ -94,8 +97,7 @@ public class DownloadAll : IVerb
var outputFile = output.Combine(file.Name);
if (outputFile.FileExists())
{
outputFile = output.Combine(outputFile.FileName.WithoutExtension() + "_" + file.Hash.ToHex() +
outputFile.WithExtension(outputFile.Extension));
outputFile = output.Combine((outputFile.FileName.WithoutExtension() + "_" + file.Hash.ToHex()).ToRelativePath().WithExtension(outputFile.Extension));
}
_logger.LogInformation("Downloading {File}", file.Name);

19
Wabbajack.CLI/Verbs/ValidateLists.cs
View File

@ -218,9 +218,20 @@ public class ValidateLists : IVerb
? ListStatus.Failed
: ListStatus.Available;
var (smallImage, largeImage) = await ProcessModlistImage(reports, modList, token);
validatedList.SmallImage = new Uri($"https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/reports/{smallImage.ToString().Replace("\\", "/")}");
validatedList.LargeImage = new Uri($"https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/reports/{largeImage.ToString().Replace("\\", "/")}");
try
{
var (smallImage, largeImage) = await ProcessModlistImage(reports, modList, token);
validatedList.SmallImage =
new Uri(
$"https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/reports/{smallImage.ToString().Replace("\\", "/")}");
validatedList.LargeImage =
new Uri(
$"https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/reports/{largeImage.ToString().Replace("\\", "/")}");
}
catch (Exception ex)
{
_logger.LogError(ex, "While processing modlist images for {MachineURL}", modList.NamespacedName);
}
return validatedList;
}).ToArray();
@ -603,7 +614,7 @@ public class ValidateLists : IVerb
case Nexus:
return (ArchiveStatus.Valid, archive);
case VectorPlexus:
return (ArchiveStatus.Valid, archive);
return (ArchiveStatus.InValid, archive);
}
if (archive.State is Http http && http.Url.Host.EndsWith("github.com"))

7
Wabbajack.Common/AsyncParallelExtensions.cs
View File

@ -18,8 +18,11 @@ public static class AsyncParallelExtensions
public static async Task PDoAll<TIn, TJob>(this IEnumerable<TIn> coll, IResource<TJob> limiter,
Func<TIn, Task> mapFn)
{
using var job = await limiter.Begin("", 0, CancellationToken.None);
var tasks = coll.Select(mapFn).ToList();
var tasks = coll.Select(async x =>
{
using var job = await limiter.Begin("", 0, CancellationToken.None);
await mapFn(x);
}).ToList();
await Task.WhenAll(tasks);
}

1
Wabbajack.Downloaders.Dispatcher/DownloadDispatcher.cs
View File

@ -107,6 +107,7 @@ public class DownloadDispatcher
{
try
{
a = await MaybeProxy(a, token);
var downloader = Downloader(a);
using var job = await _limiter.Begin($"Verifying {a.State.PrimaryKeyString}", -1, token);
return await downloader.Verify(a, job, token);

3
Wabbajack.Downloaders.WabbajackCDN/WabbajackCDNDownloader.cs
View File

@ -160,6 +160,9 @@ public class WabbajackCDNDownloader : ADownloader<WabbajackCDN>, IUrlDownloader,
{
var state = archive.State as WabbajackCDN;
var definition = await GetDefinition(state!, token);
if (definition == null)
throw new Exception("Could not get CDN definition");
return new ChunkedSeekableDownloader(state!, definition!, this);
}

4
Wabbajack.Installer/AInstaller.cs
View File

@ -446,6 +446,8 @@ public abstract class AInstaller<T>
protected async Task OptimizeModlist(CancellationToken token)
{
_logger.LogInformation("Optimizing ModList directives");
UnoptimizedArchives = ModList.Archives;
UnoptimizedDirectives = ModList.Directives;
var indexed = ModList.Directives.ToDictionary(d => d.To);
@ -565,8 +567,6 @@ public abstract class AInstaller<T>
.Select(d => d.Key)
.ToHashSet();
UnoptimizedArchives = ModList.Archives;
UnoptimizedDirectives = ModList.Directives;
ModList.Archives = ModList.Archives.Where(a => requiredArchives.Contains(a.Hash)).ToArray();
ModList.Directives = indexed.Values.ToArray();
}