diff --git a/src/NzbDrone.Core/ImportLists/TMDb/Company/TMDbCompanyRequestGenerator.cs b/src/NzbDrone.Core/ImportLists/TMDb/Company/TMDbCompanyRequestGenerator.cs index e9fce48a0..5d64c97bb 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/Company/TMDbCompanyRequestGenerator.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/Company/TMDbCompanyRequestGenerator.cs @@ -24,13 +24,13 @@ public virtual ImportListPageableRequestChain GetMovies() private IEnumerable GetMoviesRequest() { - Logger.Info($"Importing TMDb movies from company: {Settings.CompanyId}"); + Logger.Info("Importing TMDb movies from company: {0}", Settings.CompanyId); var requestBuilder = RequestBuilder.Create() - .SetSegment("api", "3") - .SetSegment("route", "discover") - .SetSegment("id", $"movie") - .SetSegment("secondaryRoute", ""); + .SetSegment("api", "3") + .SetSegment("route", "discover") + .SetSegment("id", "movie") + .SetSegment("secondaryRoute", ""); requestBuilder.AddQueryParam("with_companies", Settings.CompanyId); @@ -44,7 +44,7 @@ private IEnumerable GetMoviesRequest() var request = requestBuilder.Build(); - Logger.Debug($"Importing TMDb movies from: {request.Url}"); + Logger.Debug("Importing TMDb movies from: {0}", request.Url); yield return new ImportListRequest(request); } diff --git a/src/NzbDrone.Core/ImportLists/TMDb/Keyword/TMDbKeywordRequestGenerator.cs b/src/NzbDrone.Core/ImportLists/TMDb/Keyword/TMDbKeywordRequestGenerator.cs index 3e8ab6402..2f9d4c582 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/Keyword/TMDbKeywordRequestGenerator.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/Keyword/TMDbKeywordRequestGenerator.cs @@ -24,13 +24,15 @@ public virtual ImportListPageableRequestChain GetMovies() private IEnumerable GetMoviesRequest() { - Logger.Info($"Importing TMDb movies from keyword Id: {Settings.KeywordId}"); + Logger.Info("Importing TMDb movies from keyword Id: {0}", Settings.KeywordId); var requestBuilder = RequestBuilder.Create() - .SetSegment("api", "3") - .SetSegment("route", "keyword") - .SetSegment("id", $"{Settings.KeywordId}") - .SetSegment("secondaryRoute", "/movies"); + .SetSegment("api", "3") + .SetSegment("route", "discover") + .SetSegment("id", "movie") + .SetSegment("secondaryRoute", ""); + + requestBuilder.AddQueryParam("with_keywords", Settings.KeywordId); var jsonResponse = JsonConvert.DeserializeObject(HttpClient.Execute(requestBuilder.Build()).Content); @@ -42,7 +44,7 @@ private IEnumerable GetMoviesRequest() var request = requestBuilder.Build(); - Logger.Debug($"Importing TMDb movies from: {request.Url}"); + Logger.Debug("Importing TMDb movies from: {0}", request.Url); yield return new ImportListRequest(request); } diff --git a/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListRequestGenerator.cs b/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListRequestGenerator.cs index 3d7f5e685..42490d110 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListRequestGenerator.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListRequestGenerator.cs @@ -24,15 +24,15 @@ public virtual ImportListPageableRequestChain GetMovies() private IEnumerable GetMoviesRequest() { - Logger.Info($"Importing TMDb movies from list: {Settings.ListId}"); + Logger.Info("Importing TMDb movies from list: {0}", Settings.ListId); var requestBuilder = RequestBuilder.Create() - .SetSegment("api", "4") - .SetSegment("route", "list") - .SetSegment("id", Settings.ListId) - .SetSegment("secondaryRoute", ""); + .SetSegment("api", "4") + .SetSegment("route", "list") + .SetSegment("id", Settings.ListId) + .SetSegment("secondaryRoute", ""); - Logger.Debug($"Getting total pages that TMDb List: {Settings.ListId} consists of"); + Logger.Debug("Getting total pages that TMDb List: {0} consists of", Settings.ListId); var jsonResponse = JsonConvert.DeserializeObject(HttpClient.Execute(requestBuilder.Build()).Content); @@ -44,7 +44,7 @@ private IEnumerable GetMoviesRequest() var request = requestBuilder.Build(); - Logger.Debug($"Importing TMDb movies from: {request.Url}"); + Logger.Debug("Importing TMDb movies from: {0}", request.Url); yield return new ImportListRequest(request); } diff --git a/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonRequestGenerator.cs b/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonRequestGenerator.cs index fa7cba3dc..d793ef3e0 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonRequestGenerator.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonRequestGenerator.cs @@ -22,16 +22,15 @@ public virtual ImportListPageableRequestChain GetMovies() private IEnumerable GetMoviesRequest() { - Logger.Info($"Importing TMDb movies from person: {Settings.PersonId}"); + Logger.Info("Importing TMDb movies from person: {0}", Settings.PersonId); var requestBuilder = RequestBuilder.Create() - .SetSegment("api", "3") - .SetSegment("route", "person") - .SetSegment("id", Settings.PersonId) - .SetSegment("secondaryRoute", "/movie_credits"); + .SetSegment("api", "3") + .SetSegment("route", "person") + .SetSegment("id", Settings.PersonId) + .SetSegment("secondaryRoute", "/movie_credits"); - yield return new ImportListRequest(requestBuilder.Accept(HttpAccept.Json) - .Build()); + yield return new ImportListRequest(requestBuilder.Accept(HttpAccept.Json).Build()); } } } diff --git a/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularRequestGenerator.cs b/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularRequestGenerator.cs index eff0759b8..19eef97dc 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularRequestGenerator.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularRequestGenerator.cs @@ -45,10 +45,10 @@ private IEnumerable GetMoviesRequests() var threeMonthsFromNow = DateTime.Parse(todaysDate).AddMonths(3).ToString("yyyy-MM-dd"); var requestBuilder = RequestBuilder.Create() - .SetSegment("api", "3") - .SetSegment("route", "discover") - .SetSegment("id", "") - .SetSegment("secondaryRoute", "movie"); + .SetSegment("api", "3") + .SetSegment("route", "discover") + .SetSegment("id", "") + .SetSegment("secondaryRoute", "movie"); switch (Settings.TMDbListType) { @@ -110,11 +110,13 @@ private IEnumerable GetMoviesRequests() for (var pageNumber = 1; pageNumber <= MaxPages; pageNumber++) { - Logger.Info($"Importing TMDb movies from: {requestBuilder.BaseUrl}&page={pageNumber}"); - requestBuilder.AddQueryParam("page", pageNumber, true); - yield return new ImportListRequest(requestBuilder.Build()); + var request = requestBuilder.Build(); + + Logger.Debug("Importing TMDb movies from: {0}", request.Url); + + yield return new ImportListRequest(request); } } } diff --git a/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserRequestGenerator.cs b/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserRequestGenerator.cs index 74ea6da66..b0ea10234 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserRequestGenerator.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserRequestGenerator.cs @@ -27,10 +27,10 @@ public virtual ImportListPageableRequestChain GetMovies() private IEnumerable GetMoviesRequests() { var requestBuilder = RequestBuilder.Create() - .SetHeader("Authorization", $"Bearer {Settings.AccessToken}") - .SetSegment("api", "4") - .SetSegment("route", "account") - .SetSegment("id", Settings.AccountId); + .SetHeader("Authorization", $"Bearer {Settings.AccessToken}") + .SetSegment("api", "4") + .SetSegment("route", "account") + .SetSegment("id", Settings.AccountId); switch (Settings.ListType) { @@ -62,7 +62,7 @@ private IEnumerable GetMoviesRequests() var request = requestBuilder.Build(); - Logger.Debug($"Importing TMDb movies from: {request.Url}"); + Logger.Debug("Importing TMDb movies from: {0}", request.Url); yield return new ImportListRequest(request); }