Fix Tests

This commit is contained in:
Qstick
2020-12-24 00:27:48 -05:00
parent eb9b14ba24
commit 5b24fdbc20
29 changed files with 104 additions and 104 deletions
@@ -38,6 +38,9 @@ namespace NzbDrone.Core.Indexers.HDBits
{
query.ImdbInfo = query.ImdbInfo ?? new ImdbInfo();
query.ImdbInfo.Id = imdbId;
//TODO Map Categories
query.Category = searchCriteria.Categories;
return true;
}
@@ -62,7 +65,7 @@ namespace NzbDrone.Core.Indexers.HDBits
query.Passkey = Settings.ApiKey;
//TODO Add from searchCriteria
// query.Category = Settings.Categories.ToArray();
query.Category = query.Category.ToArray();
query.Codec = Settings.Codecs.ToArray();
query.Medium = Settings.Mediums.ToArray();
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Core.IndexerSearch.Definitions;
@@ -9,20 +10,18 @@ namespace NzbDrone.Core.Indexers.IPTorrents
{
public IPTorrentsSettings Settings { get; set; }
public virtual IndexerPageableRequestChain GetRecentRequests()
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
{
var pageableRequests = new IndexerPageableRequestChain();
pageableRequests.Add(GetRssRequests());
if (searchCriteria.SearchTerm.IsNullOrWhiteSpace())
{
pageableRequests.Add(GetRssRequests());
}
return pageableRequests;
}
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
{
return new IndexerPageableRequestChain();
}
private IEnumerable<IndexerRequest> GetRssRequests()
{
yield return new IndexerRequest(Settings.BaseUrl, HttpAccept.Rss);
@@ -105,7 +105,7 @@ namespace NzbDrone.Core.Indexers.Newznab
{
if (int.TryParse(cat, out var intCategory))
{
var indexerCat = _settings.Categories.FirstOrDefault(c => c.Id == intCategory);
var indexerCat = _settings.Categories?.FirstOrDefault(c => c.Id == intCategory) ?? null;
if (indexerCat != null)
{
@@ -10,20 +10,18 @@ namespace NzbDrone.Core.Indexers.TorrentRss
{
public TorrentRssIndexerSettings Settings { get; set; }
public virtual IndexerPageableRequestChain GetRecentRequests()
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
{
var pageableRequests = new IndexerPageableRequestChain();
pageableRequests.Add(GetRssRequests(null));
if (searchCriteria.SearchTerm.IsNullOrWhiteSpace())
{
pageableRequests.Add(GetRssRequests(null));
}
return pageableRequests;
}
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
{
return new IndexerPageableRequestChain();
}
private IEnumerable<IndexerRequest> GetRssRequests(string searchParameters)
{
var request = new IndexerRequest(Settings.BaseUrl.Trim().TrimEnd('/'), HttpAccept.Rss);
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Indexers.TorrentRss
_logger.Debug("Evaluating TorrentRss feed '{0}'", indexerSettings.BaseUrl);
var requestGenerator = new TorrentRssIndexerRequestGenerator { Settings = indexerSettings };
var request = requestGenerator.GetRecentRequests().GetAllTiers().First().First();
var request = requestGenerator.GetSearchRequests(new IndexerSearch.Definitions.MovieSearchCriteria()).GetAllTiers().First().First();
HttpResponse httpResponse = null;
try