From a95191dc3bbbca292352686be69417b6cb24ead7 Mon Sep 17 00:00:00 2001
From: gismo2004 <reumuellermarkus@gmail.com>
Date: Sat, 22 Sep 2018 09:14:26 +0200
Subject: [PATCH] Fixes: Headphones album search (#502)

---
 .../Headphones/HeadphonesRequestGenerator.cs        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/NzbDrone.Core/Indexers/Headphones/HeadphonesRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Headphones/HeadphonesRequestGenerator.cs
index 49fdc0d831..7e7a124c62 100644
--- a/src/NzbDrone.Core/Indexers/Headphones/HeadphonesRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Headphones/HeadphonesRequestGenerator.cs
@@ -38,10 +38,7 @@ public virtual IndexerPageableRequestChain GetSearchRequests(AlbumSearchCriteria
                 pageableRequests.AddTier();
 
                 pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search",
-                        string.Format("&q={0}",
-                        NewsnabifyTitle(string.Format("{0} {1}",
-                                         searchCriteria.ArtistQuery,
-                                         searchCriteria.AlbumQuery)))));
+                    NewsnabifyTitle($"&q={searchCriteria.ArtistQuery}+{searchCriteria.AlbumQuery}")));
 
             return pageableRequests;
         }
@@ -53,8 +50,7 @@ public virtual IndexerPageableRequestChain GetSearchRequests(ArtistSearchCriteri
             pageableRequests.AddTier();
 
             pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search",
-                    string.Format("&q={0}",
-                    NewsnabifyTitle(searchCriteria.ArtistQuery))));
+                NewsnabifyTitle($"&q={searchCriteria.ArtistQuery}")));
 
             return pageableRequests;
         }
@@ -68,7 +64,8 @@ private IEnumerable<IndexerRequest> GetPagedRequests(int maxPages, IEnumerable<i
 
             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())
             {
@@ -86,7 +83,7 @@ private IEnumerable<IndexerRequest> GetPagedRequests(int maxPages, IEnumerable<i
             {
                 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);
 
                     yield return request;