Fixes: Headphones album search (#502)

pull/6/head
gismo2004 7 years ago committed by Qstick
parent e08f39ebe0
commit a95191dc3b

@ -38,10 +38,7 @@ namespace NzbDrone.Core.Indexers.Headphones
pageableRequests.AddTier(); pageableRequests.AddTier();
pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search", pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search",
string.Format("&q={0}", NewsnabifyTitle($"&q={searchCriteria.ArtistQuery}+{searchCriteria.AlbumQuery}")));
NewsnabifyTitle(string.Format("{0} {1}",
searchCriteria.ArtistQuery,
searchCriteria.AlbumQuery)))));
return pageableRequests; return pageableRequests;
} }
@ -53,8 +50,7 @@ namespace NzbDrone.Core.Indexers.Headphones
pageableRequests.AddTier(); pageableRequests.AddTier();
pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search", pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search",
string.Format("&q={0}", NewsnabifyTitle($"&q={searchCriteria.ArtistQuery}")));
NewsnabifyTitle(searchCriteria.ArtistQuery))));
return pageableRequests; return pageableRequests;
} }
@ -68,7 +64,8 @@ namespace NzbDrone.Core.Indexers.Headphones
var categoriesQuery = string.Join(",", categories.Distinct()); var categoriesQuery = string.Join(",", categories.Distinct());
var baseUrl = string.Format("{0}{1}?t={2}&cat={3}&extended=1", Settings.BaseUrl.TrimEnd('/'), Settings.ApiPath.TrimEnd('/'), searchType, categoriesQuery); var baseUrl =
$"{Settings.BaseUrl.TrimEnd('/')}{Settings.ApiPath.TrimEnd('/')}?t={searchType}&cat={categoriesQuery}&extended=1";
if (Settings.ApiKey.IsNotNullOrWhiteSpace()) if (Settings.ApiKey.IsNotNullOrWhiteSpace())
{ {
@ -86,7 +83,7 @@ namespace NzbDrone.Core.Indexers.Headphones
{ {
for (var page = 0; page < maxPages; page++) for (var page = 0; page < maxPages; page++)
{ {
var request = new IndexerRequest(string.Format("{0}&offset={1}&limit={2}{3}", baseUrl, page * PageSize, PageSize, parameters), HttpAccept.Rss); var request = new IndexerRequest($"{baseUrl}&offset={page * PageSize}&limit={PageSize}{parameters}", HttpAccept.Rss);
request.HttpRequest.AddBasicAuthentication(Settings.Username, Settings.Password); request.HttpRequest.AddBasicAuthentication(Settings.Username, Settings.Password);
yield return request; yield return request;

Loading…
Cancel
Save