Fixed: Improve AniList testing with Media filters
This commit is contained in:
parent
dac69445e4
commit
5c42935eb3
|
@ -2,6 +2,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
using FluentValidation.Results;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Common.Extensions;
|
using NzbDrone.Common.Extensions;
|
||||||
using NzbDrone.Common.Http;
|
using NzbDrone.Common.Http;
|
||||||
|
@ -12,6 +13,7 @@ using NzbDrone.Core.Indexers.Exceptions;
|
||||||
using NzbDrone.Core.Localization;
|
using NzbDrone.Core.Localization;
|
||||||
using NzbDrone.Core.Parser;
|
using NzbDrone.Core.Parser;
|
||||||
using NzbDrone.Core.Parser.Model;
|
using NzbDrone.Core.Parser.Model;
|
||||||
|
using NzbDrone.Core.Validation;
|
||||||
|
|
||||||
namespace NzbDrone.Core.ImportLists.AniList.List
|
namespace NzbDrone.Core.ImportLists.AniList.List
|
||||||
{
|
{
|
||||||
|
@ -153,5 +155,63 @@ namespace NzbDrone.Core.ImportLists.AniList.List
|
||||||
|
|
||||||
return new ImportListFetchResult(CleanupListItems(releases), anyFailure);
|
return new ImportListFetchResult(CleanupListItems(releases), anyFailure);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override ValidationFailure TestConnection()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var parser = GetParser();
|
||||||
|
var generator = GetRequestGenerator();
|
||||||
|
var pageIndex = 1;
|
||||||
|
var continueTesting = true;
|
||||||
|
var hasResults = false;
|
||||||
|
|
||||||
|
// Anilist caps the result list to 50 items at maximum per query, so the data must be pulled in batches.
|
||||||
|
// The number of pages are not known upfront, so the fetch logic must be changed to look at the returned page data.
|
||||||
|
do
|
||||||
|
{
|
||||||
|
var currentRequest = generator.GetRequest(pageIndex);
|
||||||
|
var response = FetchImportListResponse(currentRequest);
|
||||||
|
var page = parser.ParseResponse(response, out var pageInfo).ToList();
|
||||||
|
|
||||||
|
// Continue testing additional pages if all results were filtered out by 'Media' filters and there are additional pages
|
||||||
|
continueTesting = pageInfo.HasNextPage && page.Count == 0;
|
||||||
|
pageIndex = pageInfo.CurrentPage + 1;
|
||||||
|
hasResults = page.Count > 0;
|
||||||
|
}
|
||||||
|
while (continueTesting);
|
||||||
|
|
||||||
|
if (!hasResults)
|
||||||
|
{
|
||||||
|
return new NzbDroneValidationFailure(string.Empty,
|
||||||
|
"No results were returned from your import list, please check your settings and the log for details.")
|
||||||
|
{ IsWarning = true };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (RequestLimitReachedException)
|
||||||
|
{
|
||||||
|
_logger.Warn("Request limit reached");
|
||||||
|
}
|
||||||
|
catch (UnsupportedFeedException ex)
|
||||||
|
{
|
||||||
|
_logger.Warn(ex, "Import list feed is not supported");
|
||||||
|
|
||||||
|
return new ValidationFailure(string.Empty, "Import list feed is not supported: " + ex.Message);
|
||||||
|
}
|
||||||
|
catch (ImportListException ex)
|
||||||
|
{
|
||||||
|
_logger.Warn(ex, "Unable to connect to import list");
|
||||||
|
|
||||||
|
return new ValidationFailure(string.Empty, $"Unable to connect to import list: {ex.Message}. Check the log surrounding this error for details.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.Warn(ex, "Unable to connect to import list");
|
||||||
|
|
||||||
|
return new ValidationFailure(string.Empty, $"Unable to connect to import list: {ex.Message}. Check the log surrounding this error for details.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue