diff --git a/CHANGELOG.md b/CHANGELOG.md index 642c556d..ec462c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ### Changelog -#### Version - 2.5.0.0 - ?? +#### Version - 2.5.0.1 - 6/25/2021 +* HOTFIX: Fix NPE with LL downloader + +#### Version - 2.5.0.0 - 6/24/2021 * LoversLab downloader switched to OAuth2 * VectorPlexus downloader switched to OAuth2 * Wabbajack can now detect and compile modlists that contain resized/recompressed textures without binary diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index a0696396..1baf1d4f 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.5.0.0 - 2.5.0.0 + 2.5.0.1 + 2.5.0.1 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index b7f721ae..06b98192 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ Exe net5.0-windows true - 2.5.0.0 - 2.5.0.0 + 2.5.0.1 + 2.5.0.1 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Lib/Downloaders/AbstractDownloadState.cs b/Wabbajack.Lib/Downloaders/AbstractDownloadState.cs index 6353d678..d46b1d8b 100644 --- a/Wabbajack.Lib/Downloaders/AbstractDownloadState.cs +++ b/Wabbajack.Lib/Downloaders/AbstractDownloadState.cs @@ -27,7 +27,7 @@ namespace Wabbajack.Lib.Downloaders public static List KnownSubTypes = new List { typeof(DeprecatedLoversLabDownloader.State), - typeof(DeprecatedVectorPlexusDownloader), + typeof(DeprecatedVectorPlexusDownloader.State), typeof(HTTPDownloader.State), typeof(GameFileSourceDownloader.State), typeof(GoogleDriveDownloader.State), diff --git a/Wabbajack.Lib/Downloaders/DTOs/IPS4OAuthFilesResponse.cs b/Wabbajack.Lib/Downloaders/DTOs/IPS4OAuthFilesResponse.cs index b69b8b18..bf59684f 100644 --- a/Wabbajack.Lib/Downloaders/DTOs/IPS4OAuthFilesResponse.cs +++ b/Wabbajack.Lib/Downloaders/DTOs/IPS4OAuthFilesResponse.cs @@ -38,7 +38,7 @@ namespace Wabbajack.Lib.Downloaders.DTOs public class Author { [JsonProperty("id")] - public int Id { get; set; } + public int? Id { get; set; } [JsonProperty("name")] public string? Name { get; set; } @@ -83,7 +83,7 @@ namespace Wabbajack.Lib.Downloaders.DTOs public DateTime? LastPost { get; set; } [JsonProperty("profileViews")] - public int ProfileViews { get; set; } + public int? ProfileViews { get; set; } } diff --git a/Wabbajack.Server/Controllers/Heartbeat.cs b/Wabbajack.Server/Controllers/Heartbeat.cs index 39d1b793..3227003c 100644 --- a/Wabbajack.Server/Controllers/Heartbeat.cs +++ b/Wabbajack.Server/Controllers/Heartbeat.cs @@ -85,7 +85,7 @@ namespace Wabbajack.BuildServer.Controllers

Lists ({{lists.Length}}):

@@ -100,7 +100,12 @@ namespace Wabbajack.BuildServer.Controllers .Select(s => new {Name = s.Key.Name, Time = s.Value.LastRunTime, MaxTime = s.Value.Delay, IsLate = s.Value.LastRunTime > s.Value.Delay}) .OrderBy(s => s.Name) .ToArray(), - lists = _listValidator.ValidationInfo.Select(s => new {Name = s.Key, Time = s.Value.ValidationTime}) + lists = _listValidator.ValidationInfo.Select(s => new + { + Name = s.Key, + Time = s.Value.ValidationTime, + FailMessage = s.Value.Detailed.HasFailures ? "Failed" : "" + }) .OrderBy(l => l.Name) .ToArray() }); diff --git a/Wabbajack.Server/DataLayer/ValidationData.cs b/Wabbajack.Server/DataLayer/ValidationData.cs index 3937d089..50fff123 100644 --- a/Wabbajack.Server/DataLayer/ValidationData.cs +++ b/Wabbajack.Server/DataLayer/ValidationData.cs @@ -44,7 +44,7 @@ namespace Wabbajack.Server.DataLayer public async Task> AllNexusFiles() { await using var conn = await Open(); - var results = await conn.QueryAsync<(long, long, long, string)>(@"SELECT Game, ModId, FileId, JSON_VALUE(Data, '$.category') FROM dbo.NexusModFile"); + var results = await conn.QueryAsync<(long, long, long, string)>(@"SELECT Game, ModId, FileId, JSON_VALUE(Data, '$.category_name') FROM dbo.NexusModFile"); return results.ToHashSet(); } diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index 10b6d026..4ce38771 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe net5.0-windows - 2.5.0.0 - 2.5.0.0 + 2.5.0.1 + 2.5.0.1 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack.Test/DownloaderTests.cs b/Wabbajack.Test/DownloaderTests.cs index be921e9e..9680e456 100644 --- a/Wabbajack.Test/DownloaderTests.cs +++ b/Wabbajack.Test/DownloaderTests.cs @@ -294,7 +294,8 @@ namespace Wabbajack.Test [Fact] public async Task CanFindOtherLLMods() { - await DownloadDispatcher.GetInstance().Prepare(); + var downloader = DownloadDispatcher.GetInstance(); + await downloader.Prepare(); var ini = @"[General] ips4Site=Lovers Lab @@ -303,6 +304,9 @@ namespace Wabbajack.Test var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString()); var otherfiles = await ((LoversLabOAuthDownloader.State)state).GetFilesInGroup(); + + // Throws a NPE + var data = await downloader.GetDownloads(9023); } diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index 50e8443c..6c3b921d 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.5.0.0 - 2.5.0.0 + 2.5.0.1 + 2.5.0.1 Copyright © 2019-2020 An automated ModList installer true