diff --git a/CHANGELOG.md b/CHANGELOG.md index d0a82b0b..31898cfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ### Changelog +#### Version - 3.0.1.0 - 9/19/2022 +* Official release of the 3.0 codebase + #### Version - 3.0.0.7 - 9/12/2022 * Fix Dragons' Dogma MO2 archive names * Add Modlist Report for CLI diff --git a/Wabbajack.Server/Controllers/AuthorControls.cs b/Wabbajack.Server/Controllers/AuthorControls.cs index df90096e..0608c9c6 100644 --- a/Wabbajack.Server/Controllers/AuthorControls.cs +++ b/Wabbajack.Server/Controllers/AuthorControls.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Security.Claims; +using System.Text.Json; using System.Threading.Tasks; using FluentFTP.Helpers; using Microsoft.AspNetCore.Authorization; @@ -76,12 +77,23 @@ public class AuthorControls : ControllerBase var repos = await LoadRepositories(); return await repos.PMapAll(async url => - (await _client.GetFromJsonAsync(_limiter, new HttpRequestMessage(HttpMethod.Get, url.Value), - _dtos.Options))!.Select(meta => + { + try { - meta.RepositoryName = url.Key; - return meta; - })) + return (await _client.GetFromJsonAsync(_limiter, + new HttpRequestMessage(HttpMethod.Get, url.Value), + _dtos.Options))!.Select(meta => + { + meta.RepositoryName = url.Key; + return meta; + }); + } + catch (JsonException ex) + { + _logger.LogError(ex, "While loading repository {Name} from {Url}", url.Key, url.Value); + return Enumerable.Empty(); + } + }) .SelectMany(x => x) .ToArray(); }