From 10074ae994da64b652357fc48222b7afa2d58a37 Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 18 May 2020 21:14:52 -0400 Subject: [PATCH] Fixed: Use v3 API for Lists to prevent needing pagination Fixes #4441 --- .../MetadataSource/SkyHook/Resource/TMDBResources.cs | 8 ++++---- src/NzbDrone.Core/NetImport/TMDb/List/TMDbListParser.cs | 4 ++-- .../NetImport/TMDb/List/TMDbListRequestGenerator.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs index 9bdbb5685..550d4d097 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace NzbDrone.Core.MetadataSource.SkyHook.Resource { @@ -200,8 +200,8 @@ public class Video public class ListResponseRoot { public string id { get; set; } - public Item[] results { get; set; } - public int total_results { get; set; } + public List items { get; set; } + public int item_count { get; set; } public string iso_639_1 { get; set; } public string name { get; set; } public object poster_path { get; set; } @@ -224,7 +224,7 @@ public class PersonCreditsRoot public int id { get; set; } } - public class Item : MovieResult + public class ListItem : MovieResult { public string media_type { get; set; } public string first_air_date { get; set; } diff --git a/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListParser.cs b/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListParser.cs index fe57a0201..5671ac078 100644 --- a/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListParser.cs +++ b/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListParser.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Newtonsoft.Json; using NzbDrone.Common.Extensions; using NzbDrone.Core.MetadataSource; @@ -34,7 +34,7 @@ public override IList ParseResponse(NetImportResponse importResponse) return movies; } - foreach (var movie in jsonResponse.results) + foreach (var movie in jsonResponse.items) { // Movies with no Year Fix if (string.IsNullOrWhiteSpace(movie.release_date)) diff --git a/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListRequestGenerator.cs b/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListRequestGenerator.cs index beb1bab1d..6454404b4 100644 --- a/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListRequestGenerator.cs +++ b/src/NzbDrone.Core/NetImport/TMDb/List/TMDbListRequestGenerator.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using NLog; using NzbDrone.Common.Http; @@ -29,7 +29,7 @@ private IEnumerable GetMoviesRequest() Logger.Info($"Importing TMDb movies from list: {Settings.ListId}"); var requestBuilder = RequestBuilder.Create() - .SetSegment("api", "4") + .SetSegment("api", "3") .SetSegment("route", "list") .SetSegment("id", Settings.ListId) .SetSegment("secondaryRoute", "");