Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-10-05 15:47:20 +02:00
Code Issues Releases Wiki Activity

Fixed: Switch to discover/movie for TMDB Keyword list

Browse Source
This commit is contained in:
Bogdan 2024-06-27 00:51:20 +03:00
parent 54965cfa6f
commit 92a19a1a81
6 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NzbDrone.Core/ImportLists/TMDb/Company/TMDbCompanyRequestGenerator.cs
View File

@ -24,12 +24,12 @@ public virtual ImportListPageableRequestChain GetMovies()
private IEnumerable<ImportListRequest> GetMoviesRequest() private IEnumerable<ImportListRequest> GetMoviesRequest()
{ {
Logger.Info($"Importing TMDb movies from company: {Settings.CompanyId}"); Logger.Info("Importing TMDb movies from company: {0}", Settings.CompanyId);
var requestBuilder = RequestBuilder.Create() var requestBuilder = RequestBuilder.Create()
.SetSegment("api", "3") .SetSegment("api", "3")
.SetSegment("route", "discover") .SetSegment("route", "discover")
.SetSegment("id", $"movie") .SetSegment("id", "movie")
.SetSegment("secondaryRoute", ""); .SetSegment("secondaryRoute", "");
requestBuilder.AddQueryParam("with_companies", Settings.CompanyId); requestBuilder.AddQueryParam("with_companies", Settings.CompanyId);
@ -44,7 +44,7 @@ private IEnumerable<ImportListRequest> GetMoviesRequest()
var request = requestBuilder.Build(); 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); yield return new ImportListRequest(request);
} }

12
src/NzbDrone.Core/ImportLists/TMDb/Keyword/TMDbKeywordRequestGenerator.cs
View File

@ -24,13 +24,15 @@ public virtual ImportListPageableRequestChain GetMovies()
private IEnumerable<ImportListRequest> GetMoviesRequest() private IEnumerable<ImportListRequest> 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() var requestBuilder = RequestBuilder.Create()
.SetSegment("api", "3") .SetSegment("api", "3")
.SetSegment("route", "keyword") .SetSegment("route", "discover")
.SetSegment("id", $"{Settings.KeywordId}") .SetSegment("id", "movie")
.SetSegment("secondaryRoute", "/movies"); .SetSegment("secondaryRoute", "");
requestBuilder.AddQueryParam("with_keywords", Settings.KeywordId);
var jsonResponse = JsonConvert.DeserializeObject<MovieSearchResource>(HttpClient.Execute(requestBuilder.Build()).Content); var jsonResponse = JsonConvert.DeserializeObject<MovieSearchResource>(HttpClient.Execute(requestBuilder.Build()).Content);
@ -42,7 +44,7 @@ private IEnumerable<ImportListRequest> GetMoviesRequest()
var request = requestBuilder.Build(); 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); yield return new ImportListRequest(request);
} }

6
src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListRequestGenerator.cs
View File

@ -24,7 +24,7 @@ public virtual ImportListPageableRequestChain GetMovies()
private IEnumerable<ImportListRequest> GetMoviesRequest() private IEnumerable<ImportListRequest> GetMoviesRequest()
{ {
Logger.Info($"Importing TMDb movies from list: {Settings.ListId}"); Logger.Info("Importing TMDb movies from list: {0}", Settings.ListId);
var requestBuilder = RequestBuilder.Create() var requestBuilder = RequestBuilder.Create()
.SetSegment("api", "4") .SetSegment("api", "4")
@ -32,7 +32,7 @@ private IEnumerable<ImportListRequest> GetMoviesRequest()
.SetSegment("id", Settings.ListId) .SetSegment("id", Settings.ListId)
.SetSegment("secondaryRoute", ""); .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<MovieSearchResource>(HttpClient.Execute(requestBuilder.Build()).Content); var jsonResponse = JsonConvert.DeserializeObject<MovieSearchResource>(HttpClient.Execute(requestBuilder.Build()).Content);
@ -44,7 +44,7 @@ private IEnumerable<ImportListRequest> GetMoviesRequest()
var request = requestBuilder.Build(); 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); yield return new ImportListRequest(request);
} }

5
src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonRequestGenerator.cs
View File

@ -22,7 +22,7 @@ public virtual ImportListPageableRequestChain GetMovies()
private IEnumerable<ImportListRequest> GetMoviesRequest() private IEnumerable<ImportListRequest> GetMoviesRequest()
{ {
Logger.Info($"Importing TMDb movies from person: {Settings.PersonId}"); Logger.Info("Importing TMDb movies from person: {0}", Settings.PersonId);
var requestBuilder = RequestBuilder.Create() var requestBuilder = RequestBuilder.Create()
.SetSegment("api", "3") .SetSegment("api", "3")
@ -30,8 +30,7 @@ private IEnumerable<ImportListRequest> GetMoviesRequest()
.SetSegment("id", Settings.PersonId) .SetSegment("id", Settings.PersonId)
.SetSegment("secondaryRoute", "/movie_credits"); .SetSegment("secondaryRoute", "/movie_credits");
yield return new ImportListRequest(requestBuilder.Accept(HttpAccept.Json) yield return new ImportListRequest(requestBuilder.Accept(HttpAccept.Json).Build());
.Build());
} }
} }
} }

8
src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularRequestGenerator.cs
View File

@ -110,11 +110,13 @@ private IEnumerable<ImportListRequest> GetMoviesRequests()
for (var pageNumber = 1; pageNumber <= MaxPages; pageNumber++) for (var pageNumber = 1; pageNumber <= MaxPages; pageNumber++)
{ {
Logger.Info($"Importing TMDb movies from: {requestBuilder.BaseUrl}&page={pageNumber}");
requestBuilder.AddQueryParam("page", pageNumber, true); 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);
} }
} }
} }

2
src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserRequestGenerator.cs
View File

@ -62,7 +62,7 @@ private IEnumerable<ImportListRequest> GetMoviesRequests()
var request = requestBuilder.Build(); 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); yield return new ImportListRequest(request);
} }