mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Use string interpolation for Newznab request generation 

Closes #7755
This commit is contained in:
Qstick 2023-05-06 22:08:22 -05:00
parent 41fb0eb7c6
commit e7ff79f48d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
View File

@ -141,14 +141,14 @@ namespace NzbDrone.Core.Indexers.Newznab
chain.Add(GetPagedRequests(maxPages, chain.Add(GetPagedRequests(maxPages,
categories, categories,
"movie", "movie",
string.Format("&tmdbid={0}", searchCriteria.Movie.MovieMetadata.Value.TmdbId))); $"&tmdbid={searchCriteria.Movie.MovieMetadata.Value.TmdbId}"));
} }
else if (includeImdbSearch) else if (includeImdbSearch)
{ {
chain.Add(GetPagedRequests(maxPages, chain.Add(GetPagedRequests(maxPages,
categories, categories,
"movie", "movie",
string.Format("&imdbid={0}", searchCriteria.Movie.MovieMetadata.Value.ImdbId.Substring(2)))); $"&imdbid={searchCriteria.Movie.MovieMetadata.Value.ImdbId.Substring(2)}"));
} }
} }
@ -162,13 +162,13 @@ namespace NzbDrone.Core.Indexers.Newznab
if (!Settings.RemoveYear) if (!Settings.RemoveYear)
{ {
searchQuery = string.Format("{0} {1}", searchQuery, searchCriteria.Movie.Year); searchQuery = $"{searchQuery} {searchCriteria.Movie.Year}";
} }
chain.Add(GetPagedRequests(MaxPages, chain.Add(GetPagedRequests(MaxPages,
Settings.Categories, Settings.Categories,
"search", "search",
string.Format("&q={0}", NewsnabifyTitle(searchQuery)))); $"&q={NewsnabifyTitle(searchQuery)}"));
} }
} }
} }
@ -182,7 +182,7 @@ namespace NzbDrone.Core.Indexers.Newznab
var categoriesQuery = string.Join(",", categories.Distinct()); var categoriesQuery = string.Join(",", categories.Distinct());
var baseUrl = string.Format("{0}{1}?t={2}&cat={3}&extended=1{4}", Settings.BaseUrl.TrimEnd('/'), Settings.ApiPath.TrimEnd('/'), searchType, categoriesQuery, Settings.AdditionalParameters); var baseUrl = $"{Settings.BaseUrl.TrimEnd('/')}{Settings.ApiPath.TrimEnd('/')}?t={searchType}&cat={categoriesQuery}&extended=1{Settings.AdditionalParameters}";
if (Settings.ApiKey.IsNotNullOrWhiteSpace()) if (Settings.ApiKey.IsNotNullOrWhiteSpace())
{ {
@ -191,13 +191,13 @@ namespace NzbDrone.Core.Indexers.Newznab
if (PageSize == 0) if (PageSize == 0)
{ {
yield return new IndexerRequest(string.Format("{0}{1}", baseUrl, parameters), HttpAccept.Rss); yield return new IndexerRequest($"{baseUrl}{parameters}", HttpAccept.Rss);
} }
else else
{ {
for (var page = 0; page < maxPages; page++) for (var page = 0; page < maxPages; page++)
{ {
yield return new IndexerRequest(string.Format("{0}&offset={1}&limit={2}{3}", baseUrl, page * PageSize, PageSize, parameters), HttpAccept.Rss); yield return new IndexerRequest($"{baseUrl}&offset={page * PageSize}&limit={PageSize}{parameters}", HttpAccept.Rss);
} }
} }
} }