From 68bf97f52c9b8dbd808a2c30d69796aaf2acaf9c Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 16 Feb 2017 14:40:04 -0500 Subject: [PATCH] TMDb Lists should be working now :) (#775) * Remove un-used imports * Some small update to Net Import --- .../NetImport/CouchPotato/CouchPotatoAPI.cs | 2 - .../CouchPotato/CouchPotatoImport.cs | 10 +-- .../CouchPotato/CouchPotatoParser.cs | 11 --- .../CouchPotatoRequestGenerator.cs | 3 - .../CouchPotato/CouchPotatoSettings.cs | 2 - .../NetImport/HttpNetImportBase.cs | 68 +------------------ src/NzbDrone.Core/NetImport/INetImport.cs | 2 - .../NetImport/INetImportRequestGenerator.cs | 4 +- .../NetImport/IProcessNetImportResponse.cs | 1 - src/NzbDrone.Core/NetImport/NetImportBase.cs | 4 -- .../NetImport/NetImportBaseSettings.cs | 1 - .../NetImport/NetImportSearchService.cs | 6 +- .../NetImport/RSSImport/RSSImport.cs | 8 +-- .../NetImport/RSSImport/RSSImportParser.cs | 5 +- .../RSSImport/RSSImportRequestGenerator.cs | 6 +- .../NetImport/RSSImport/RSSImportSettings.cs | 6 +- .../NetImport/StevenLu/StevenLuAPI.cs | 6 +- .../NetImport/StevenLu/StevenLuImport.cs | 10 +-- .../NetImport/StevenLu/StevenLuParser.cs | 13 ---- .../StevenLu/StevenLuRequestGenerator.cs | 5 -- .../NetImport/StevenLu/StevenLuSettings.cs | 6 +- .../NetImport/TMDb/TMDbRequestGenerator.cs | 10 ++- .../NetImport/TMDb/TMDbSettings.cs | 4 +- src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs | 6 +- .../NetImport/Trakt/TraktImport.cs | 10 +-- .../NetImport/Trakt/TraktParser.cs | 13 ---- .../NetImport/Trakt/TraktRequestGenerator.cs | 3 - 27 files changed, 20 insertions(+), 205 deletions(-) diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoAPI.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoAPI.cs index 4982e02da..6a04aca3e 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoAPI.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoAPI.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.Windows.Forms; -using System.Xml.Serialization; namespace NzbDrone.Core.NetImport.CouchPotato { diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs index 969b927db..8a79bf05d 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using FluentValidation.Results; -using NLog; +using NLog; using NzbDrone.Common.Http; using NzbDrone.Core.Configuration; -using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.PassThePopcorn; using NzbDrone.Core.Parser; -using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.NetImport.CouchPotato { diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs index 48b7b76d7..05a195f1e 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs @@ -1,22 +1,11 @@ using Newtonsoft.Json; using NzbDrone.Core.NetImport.Exceptions; -using NzbDrone.Core.Tv; -using System; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Net; -using System.Text; using System.Text.RegularExpressions; -using System.Windows.Forms; -using System.Xml; -using System.Xml.Linq; using NLog; using NzbDrone.Common.Extensions; -using NzbDrone.Common.Http; -using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.Exceptions; -using NzbDrone.Core.Parser.Model; namespace NzbDrone.Core.NetImport.CouchPotato { diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoRequestGenerator.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoRequestGenerator.cs index 0416ec5e8..2d3310c4d 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoRequestGenerator.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoRequestGenerator.cs @@ -1,8 +1,5 @@ using NzbDrone.Common.Http; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; namespace NzbDrone.Core.NetImport.CouchPotato { diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoSettings.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoSettings.cs index 5fb9c332f..60b0b8c17 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoSettings.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoSettings.cs @@ -1,7 +1,5 @@ using FluentValidation; using NzbDrone.Core.Annotations; -using NzbDrone.Core.Profiles; -using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; namespace NzbDrone.Core.NetImport.CouchPotato diff --git a/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs b/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs index 8c1b79b1b..0a7ce51fd 100644 --- a/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs +++ b/src/NzbDrone.Core/NetImport/HttpNetImportBase.cs @@ -7,12 +7,8 @@ using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Common.Http; using NzbDrone.Core.Configuration; -using NzbDrone.Core.Http.CloudFlare; -using NzbDrone.Core.Indexers.Exceptions; -using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.NetImport.Exceptions; using NzbDrone.Core.Parser; -using NzbDrone.Core.Parser.Model; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Tv; @@ -21,16 +17,12 @@ namespace NzbDrone.Core.NetImport public abstract class HttpNetImportBase : NetImportBase where TSettings : IProviderConfig, new() { - protected const int MaxNumResultsPerQuery = 1000; - protected readonly IHttpClient _httpClient; public override bool Enabled => true; - public bool SupportsPaging => PageSize > 20; public virtual int PageSize => 20; - public virtual TimeSpan RateLimit => TimeSpan.FromSeconds(2); public abstract INetImportRequestGenerator GetRequestGenerator(); @@ -45,7 +37,6 @@ namespace NzbDrone.Core.NetImport public override IList Fetch() { var generator = GetRequestGenerator(); - return FetchMovies(generator.GetMovies()); } @@ -61,17 +52,13 @@ namespace NzbDrone.Core.NetImport for (int i = 0; i < pageableRequestChain.Tiers; i++) { var pageableRequests = pageableRequestChain.GetTier(i); - foreach (var pageableRequest in pageableRequests) { var pagedReleases = new List(); - foreach (var request in pageableRequest) { url = request.Url.FullUri; - var page = FetchPage(request, parser); - pagedReleases.AddRange(page); } @@ -107,30 +94,6 @@ namespace NzbDrone.Core.NetImport _logger.Warn("{0} {1}", this, httpException.Message); } } - catch (RequestLimitReachedException) - { - _logger.Warn("API Request Limit reached for {0}", this); - } - catch (ApiKeyException) - { - _logger.Warn("Invalid API Key for {0} {1}", this, url); - } - catch (CloudFlareCaptchaException ex) - { - if (ex.IsExpired) - { - _logger.Error(ex, "Expired CAPTCHA token for {0}, please refresh in indexer settings.", this); - } - else - { - _logger.Error(ex, "CAPTCHA token required for {0}, check indexer settings.", this); - } - } - catch (IndexerException ex) - { - var message = string.Format("{0} - {1}", ex.Message, url); - _logger.Warn(ex, message); - } catch (Exception feedEx) { feedEx.Data.Add("FeedUrl", url); @@ -142,7 +105,7 @@ namespace NzbDrone.Core.NetImport protected virtual IList FetchPage(NetImportRequest request, IParseNetImportResponse parser) { - var response = FetchIndexerResponse(request); + var response = FetchNetImportResponse(request); return parser.ParseResponse(response).ToList().Select(m => { @@ -153,7 +116,7 @@ namespace NzbDrone.Core.NetImport }).ToList(); } - protected virtual NetImportResponse FetchIndexerResponse(NetImportRequest request) + protected virtual NetImportResponse FetchNetImportResponse(NetImportRequest request) { _logger.Debug("Downloading List " + request.HttpRequest.ToString(false)); @@ -185,33 +148,6 @@ namespace NzbDrone.Core.NetImport return new ValidationFailure(string.Empty, "No results were returned from your list, please check your settings."); } } - catch (ApiKeyException) - { - _logger.Warn("List returned result for RSS URL, API Key appears to be invalid"); - - return new ValidationFailure("ApiKey", "Invalid API Key"); - } - catch (RequestLimitReachedException) - { - _logger.Warn("Request limit reached"); - } - catch (CloudFlareCaptchaException ex) - { - if (ex.IsExpired) - { - return new ValidationFailure("CaptchaToken", "CloudFlare CAPTCHA token expired, please Refresh."); - } - else - { - return new ValidationFailure("CaptchaToken", "Site protected by CloudFlare CAPTCHA. Valid CAPTCHA token required."); - } - } - catch (UnsupportedFeedException ex) - { - _logger.Warn(ex, "List feed is not supported"); - - return new ValidationFailure(string.Empty, "List feed is not supported: " + ex.Message); - } catch (NetImportException ex) { _logger.Warn(ex, "Unable to connect to list"); diff --git a/src/NzbDrone.Core/NetImport/INetImport.cs b/src/NzbDrone.Core/NetImport/INetImport.cs index 7f5819fd1..2e03fa2a5 100644 --- a/src/NzbDrone.Core/NetImport/INetImport.cs +++ b/src/NzbDrone.Core/NetImport/INetImport.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using NzbDrone.Core.IndexerSearch.Definitions; -using NzbDrone.Core.Parser.Model; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Tv; diff --git a/src/NzbDrone.Core/NetImport/INetImportRequestGenerator.cs b/src/NzbDrone.Core/NetImport/INetImportRequestGenerator.cs index d2c8107a4..4d585698b 100644 --- a/src/NzbDrone.Core/NetImport/INetImportRequestGenerator.cs +++ b/src/NzbDrone.Core/NetImport/INetImportRequestGenerator.cs @@ -1,6 +1,4 @@ -using NzbDrone.Core.IndexerSearch.Definitions; - -namespace NzbDrone.Core.NetImport +namespace NzbDrone.Core.NetImport { public interface INetImportRequestGenerator { diff --git a/src/NzbDrone.Core/NetImport/IProcessNetImportResponse.cs b/src/NzbDrone.Core/NetImport/IProcessNetImportResponse.cs index 4776f551e..8c1aa655f 100644 --- a/src/NzbDrone.Core/NetImport/IProcessNetImportResponse.cs +++ b/src/NzbDrone.Core/NetImport/IProcessNetImportResponse.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Tv; namespace NzbDrone.Core.NetImport diff --git a/src/NzbDrone.Core/NetImport/NetImportBase.cs b/src/NzbDrone.Core/NetImport/NetImportBase.cs index c08aaa3be..50c368457 100644 --- a/src/NzbDrone.Core/NetImport/NetImportBase.cs +++ b/src/NzbDrone.Core/NetImport/NetImportBase.cs @@ -1,13 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; using FluentValidation.Results; using NLog; -using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; -using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.Parser; -using NzbDrone.Core.Parser.Model; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Tv; diff --git a/src/NzbDrone.Core/NetImport/NetImportBaseSettings.cs b/src/NzbDrone.Core/NetImport/NetImportBaseSettings.cs index 0c9365151..b03a897b4 100644 --- a/src/NzbDrone.Core/NetImport/NetImportBaseSettings.cs +++ b/src/NzbDrone.Core/NetImport/NetImportBaseSettings.cs @@ -1,6 +1,5 @@ using FluentValidation; using NzbDrone.Core.Annotations; -using NzbDrone.Core.Profiles; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; diff --git a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs index e119d8b36..6e9cedda3 100644 --- a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs +++ b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; using NLog; -using NzbDrone.Common.Extensions; using NzbDrone.Core.Messaging.Commands; -using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.MetadataSource; using NzbDrone.Core.RootFolders; using NzbDrone.Core.Tv; diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs index d7d9dde09..60d6c6016 100644 --- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs +++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using FluentValidation.Results; +using System.Collections.Generic; using NLog; using NzbDrone.Common.Http; using NzbDrone.Core.Configuration; -using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.PassThePopcorn; using NzbDrone.Core.Parser; using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.NetImport.RSSImport { diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs index 5fc5d48c0..2ba6862db 100644 --- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs +++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs @@ -1,12 +1,10 @@ -using Newtonsoft.Json; -using NzbDrone.Core.NetImport.Exceptions; +using NzbDrone.Core.NetImport.Exceptions; using NzbDrone.Core.Tv; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; -using System.Text; using System.Text.RegularExpressions; using System.Xml; using System.Xml.Linq; @@ -15,7 +13,6 @@ using NzbDrone.Common.Extensions; using NzbDrone.Common.Http; using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers.Exceptions; -using NzbDrone.Core.Parser.Model; namespace NzbDrone.Core.NetImport.RSSImport { diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportRequestGenerator.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportRequestGenerator.cs index 534f2cda1..04adc0163 100644 --- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportRequestGenerator.cs +++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportRequestGenerator.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using NzbDrone.Common.Http; -using NzbDrone.Common.Serializer; -using NzbDrone.Core.IndexerSearch.Definitions; namespace NzbDrone.Core.NetImport.RSSImport { diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportSettings.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportSettings.cs index af39fe2ae..52ae1b4c6 100644 --- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportSettings.cs +++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportSettings.cs @@ -1,8 +1,4 @@ -using FluentValidation; -using NzbDrone.Core.Annotations; -using NzbDrone.Core.Profiles; -using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Validation; +using NzbDrone.Core.Annotations; namespace NzbDrone.Core.NetImport.RSSImport { diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuAPI.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuAPI.cs index 1dedc8719..8ebc4726e 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuAPI.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuAPI.cs @@ -1,8 +1,4 @@ -using System.Collections.Generic; -using System.Windows.Forms; -using System.Xml.Serialization; - -namespace NzbDrone.Core.NetImport.StevenLu +namespace NzbDrone.Core.NetImport.StevenLu { public class StevenLuResponse { diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs index 95c1d9b9e..80e69209f 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using FluentValidation.Results; -using NLog; +using NLog; using NzbDrone.Common.Http; using NzbDrone.Core.Configuration; -using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.PassThePopcorn; using NzbDrone.Core.Parser; -using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.NetImport.StevenLu { diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs index 9c032c162..7c4829782 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs @@ -1,22 +1,9 @@ using Newtonsoft.Json; using NzbDrone.Core.NetImport.Exceptions; -using NzbDrone.Core.Tv; -using System; using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Net; -using System.Text; -using System.Text.RegularExpressions; -using System.Windows.Forms; -using System.Xml; -using System.Xml.Linq; using NLog; using NzbDrone.Common.Extensions; -using NzbDrone.Common.Http; -using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.Exceptions; -using NzbDrone.Core.Parser.Model; namespace NzbDrone.Core.NetImport.StevenLu { diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuRequestGenerator.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuRequestGenerator.cs index 9e573bcf4..d117279f5 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuRequestGenerator.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuRequestGenerator.cs @@ -1,8 +1,5 @@ using NzbDrone.Common.Http; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; namespace NzbDrone.Core.NetImport.StevenLu { @@ -13,9 +10,7 @@ namespace NzbDrone.Core.NetImport.StevenLu public virtual NetImportPageableRequestChain GetMovies() { var pageableRequests = new NetImportPageableRequestChain(); - pageableRequests.Add(GetMovies(null)); - return pageableRequests; } diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuSettings.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuSettings.cs index a0829c868..127fe37ca 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuSettings.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuSettings.cs @@ -1,8 +1,4 @@ -using FluentValidation; -using NzbDrone.Core.Annotations; -using NzbDrone.Core.Profiles; -using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Validation; +using NzbDrone.Core.Annotations; namespace NzbDrone.Core.NetImport.StevenLu { diff --git a/src/NzbDrone.Core/NetImport/TMDb/TMDbRequestGenerator.cs b/src/NzbDrone.Core/NetImport/TMDb/TMDbRequestGenerator.cs index 63f5d4ad4..1f9b25488 100644 --- a/src/NzbDrone.Core/NetImport/TMDb/TMDbRequestGenerator.cs +++ b/src/NzbDrone.Core/NetImport/TMDb/TMDbRequestGenerator.cs @@ -14,13 +14,11 @@ namespace NzbDrone.Core.NetImport.TMDb public IHttpClient HttpClient { get; set; } public Logger Logger { get; set; } - //public string TMDbApiUrl { get; set; } public int MaxPages { get; set; } public TMDbRequestGenerator() { MaxPages = 3; - // TMDbApiUrl = "https://api.themoviedb.org"; } public virtual NetImportPageableRequestChain GetMovies() @@ -45,7 +43,7 @@ namespace NzbDrone.Core.NetImport.TMDb switch (Settings.ListType) { case (int)TMDbListType.List: - tmdbParams = $"/3/list/{Settings.ListId}/?api_key=1a7373301961d03f97f853a876dd1212"; + tmdbParams = $"/3/list/{Settings.ListId}?api_key=1a7373301961d03f97f853a876dd1212"; break; case (int)TMDbListType.Theaters: tmdbParams = $"/3/discover/movie?api_key=1a7373301961d03f97f853a876dd1212&primary_release_date.gte={threeMonthsAgo}&primary_release_date.lte={todaysDate}&vote_count.gte={minVoteCount}&vote_average.gte={minVoteAverage}{ceritification}&with_genres={includeGenreIds}&without_genres={excludeGenreIds}&with_original_language={languageCode}"; @@ -82,15 +80,15 @@ namespace NzbDrone.Core.NetImport.TMDb var result = Json.Deserialize(response.Content); // @TODO Prolly some error handling to do here - pageableRequests.Add(GetPagedRequests(tmdbParams, result.total_pages)); + pageableRequests.Add(GetMovies(tmdbParams, result.total_pages)); return pageableRequests; } - pageableRequests.Add(GetPagedRequests(tmdbParams, 0)); + pageableRequests.Add(GetMovies(tmdbParams, 0)); return pageableRequests; } - private IEnumerable GetPagedRequests(string tmdbParams, int totalPages) + private IEnumerable GetMovies(string tmdbParams, int totalPages) { var baseUrl = $"{Settings.Link.TrimEnd("/")}{tmdbParams}"; if (Settings.ListType != (int)TMDbListType.List) diff --git a/src/NzbDrone.Core/NetImport/TMDb/TMDbSettings.cs b/src/NzbDrone.Core/NetImport/TMDb/TMDbSettings.cs index dca10555b..c1f9326d0 100644 --- a/src/NzbDrone.Core/NetImport/TMDb/TMDbSettings.cs +++ b/src/NzbDrone.Core/NetImport/TMDb/TMDbSettings.cs @@ -22,8 +22,8 @@ namespace NzbDrone.Core.NetImport.TMDb public TMDbSettings() { Link = "https://api.themoviedb.org"; - MinVoteAverage = "5.5"; - MinVotes = 1000; + MinVoteAverage = "5"; + MinVotes = 1; LanguageCode = (int)TMDbLanguageCodes.en; } diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs index 4240e5241..fb9734c26 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs @@ -1,8 +1,4 @@ -using System.Collections.Generic; -using System.Windows.Forms; -using System.Xml.Serialization; - -namespace NzbDrone.Core.NetImport.Trakt +namespace NzbDrone.Core.NetImport.Trakt { public class Ids { diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs index 2add8de16..7cacb4084 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using FluentValidation.Results; -using NLog; +using NLog; using NzbDrone.Common.Http; using NzbDrone.Core.Configuration; -using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.PassThePopcorn; using NzbDrone.Core.Parser; -using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.NetImport.Trakt { diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs index dd3d2ad6c..933b8a1c2 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs @@ -1,22 +1,9 @@ using Newtonsoft.Json; using NzbDrone.Core.NetImport.Exceptions; -using NzbDrone.Core.Tv; -using System; using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Net; -using System.Text; -using System.Text.RegularExpressions; -using System.Windows.Forms; -using System.Xml; -using System.Xml.Linq; using NLog; using NzbDrone.Common.Extensions; -using NzbDrone.Common.Http; -using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.Exceptions; -using NzbDrone.Core.Parser.Model; namespace NzbDrone.Core.NetImport.Trakt { diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktRequestGenerator.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktRequestGenerator.cs index 9d6f54ce4..50b2b2f6a 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktRequestGenerator.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktRequestGenerator.cs @@ -1,8 +1,5 @@ using NzbDrone.Common.Http; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; namespace NzbDrone.Core.NetImport.Trakt {