From 6ac8210570104a03b611e5642ea47b304dd0db3e Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Sat, 2 Apr 2022 09:36:54 -0600 Subject: [PATCH] Fix list validation --- Wabbajack.CLI/Verbs/ValidateLists.cs | 7 ++----- Wabbajack.DTOs/ModList/Links.cs | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Wabbajack.CLI/Verbs/ValidateLists.cs b/Wabbajack.CLI/Verbs/ValidateLists.cs index 24c84faf..3b07c3c1 100644 --- a/Wabbajack.CLI/Verbs/ValidateLists.cs +++ b/Wabbajack.CLI/Verbs/ValidateLists.cs @@ -71,7 +71,6 @@ public class ValidateLists : IVerb public Command MakeCommand() { var command = new Command("validate-lists"); - command.Add(new Option(new[] {"-l", "-lists"}, "Lists of lists to validate") {IsRequired = true}); command.Add(new Option(new[] {"-r", "--reports"}, "Location to store validation report outputs")); command.Add(new Option(new[] {"--other-archives"}, @@ -83,7 +82,7 @@ public class ValidateLists : IVerb return command; } - public async Task Run(List[] lists, AbsolutePath reports, AbsolutePath otherArchives) + public async Task Run(AbsolutePath reports, AbsolutePath otherArchives) { reports.CreateDirectory(); var token = CancellationToken.None; @@ -102,9 +101,7 @@ public class ValidateLists : IVerb archive => DownloadAndValidate(archive, forcedRemovals, token)); var stopWatch = Stopwatch.StartNew(); - var listData = await lists.SelectAsync(async l => await _gitHubClient.GetData(l)) - .SelectMany(l => l.Lists) - .ToArray(); + var listData = await _wjClient.LoadLists(); var validatedLists = await listData.PMapAll(async modList => { diff --git a/Wabbajack.DTOs/ModList/Links.cs b/Wabbajack.DTOs/ModList/Links.cs index 264b4682..1b933b74 100644 --- a/Wabbajack.DTOs/ModList/Links.cs +++ b/Wabbajack.DTOs/ModList/Links.cs @@ -12,7 +12,7 @@ public class LinksObject [JsonPropertyName("download")] public string Download { get; set; } = string.Empty; - [JsonPropertyName("machineURL")] internal string MachineURL { get; set; } = string.Empty; + [JsonPropertyName("machineURL")] public string MachineURL { get; set; } = string.Empty; [JsonPropertyName("discordURL")] public string DiscordURL { get; set; } = string.Empty; } \ No newline at end of file