From f86e8dd5b60ee71012e8d1b75eea7a057d3b2997 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Sat, 11 May 2019 13:27:25 +1000 Subject: [PATCH] Limit IMDB searches to movies #5124 --- .../Indexers/Abstract/CouchPotatoTracker.cs | 2 +- src/Jackett.Common/Indexers/BJShare.cs | 2 +- src/Jackett.Common/Indexers/BaseIndexer.cs | 6 +++--- src/Jackett.Common/Indexers/Bitspiracy.cs | 2 +- src/Jackett.Common/Indexers/BrasilTracker.cs | 2 +- src/Jackett.Common/Indexers/CardigannIndexer.cs | 4 ++-- src/Jackett.Common/Indexers/DigitalHive.cs | 2 +- src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs | 2 +- src/Jackett.Common/Indexers/FileList.cs | 2 +- src/Jackett.Common/Indexers/Fuzer.cs | 2 +- src/Jackett.Common/Indexers/GazelleGames.cs | 2 +- src/Jackett.Common/Indexers/HDTorrents.cs | 2 +- src/Jackett.Common/Indexers/IPTorrents.cs | 2 +- src/Jackett.Common/Indexers/Norbits.cs | 2 +- src/Jackett.Common/Indexers/Nordicbits.cs | 2 +- src/Jackett.Common/Indexers/PassThePopcorn.cs | 2 +- src/Jackett.Common/Indexers/PiXELHD.cs | 2 +- src/Jackett.Common/Indexers/Rarbg.cs | 2 +- src/Jackett.Common/Indexers/SceneHD.cs | 2 +- src/Jackett.Common/Indexers/SecretCinema.cs | 2 +- src/Jackett.Common/Indexers/Shazbat.cs | 2 +- src/Jackett.Common/Indexers/ShowRSS.cs | 2 +- src/Jackett.Common/Indexers/SpeedCD.cs | 2 +- src/Jackett.Common/Indexers/Superbits.cs | 2 +- src/Jackett.Common/Indexers/TorrentDay.cs | 4 ++-- src/Jackett.Common/Indexers/TorrentSyndikat.cs | 2 +- src/Jackett.Common/Indexers/Torrentscsv.cs | 2 +- src/Jackett.Common/Indexers/XSpeeds.cs | 2 +- src/Jackett.Common/Indexers/digitalcore.cs | 2 +- src/Jackett.Common/Indexers/yts.cs | 2 +- src/Jackett.Common/Models/TorznabCapabilities.cs | 12 +++++------- src/Jackett.Server/Controllers/ResultsController.cs | 2 +- 32 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs index a9bb7b85e..5c7317f0d 100644 --- a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs @@ -36,7 +36,7 @@ namespace Jackett.Common.Indexers.Abstract ) { this.endpoint = endpoint; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs index 6cf1e472b..cdc1b62c0 100644 --- a/src/Jackett.Common/Indexers/BJShare.cs +++ b/src/Jackett.Common/Indexers/BJShare.cs @@ -55,7 +55,7 @@ namespace Jackett.Common.Indexers Language = "pt-br"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(14, TorznabCatType.TVAnime, "Anime"); AddCategoryMapping(3, TorznabCatType.PC0day, "Aplicativos"); diff --git a/src/Jackett.Common/Indexers/BaseIndexer.cs b/src/Jackett.Common/Indexers/BaseIndexer.cs index 2dd2f66da..62e2e5c37 100644 --- a/src/Jackett.Common/Indexers/BaseIndexer.cs +++ b/src/Jackett.Common/Indexers/BaseIndexer.cs @@ -293,9 +293,9 @@ namespace Jackett.Common.Indexers if (query.HasSpecifiedCategories) if (!caps.SupportsCategories(query.Categories)) return false; - if (caps.SupportsImdbSearch && query.IsImdbQuery) + if (caps.SupportsImdbMovieSearch && query.IsImdbQuery) return true; - else if (!caps.SupportsImdbSearch && query.IsImdbQuery && query.QueryType != "TorrentPotato") // potato query should always contain imdb+search term + else if (!caps.SupportsImdbMovieSearch && query.IsImdbQuery && query.QueryType != "TorrentPotato") // potato query should always contain imdb+search term return false; if (caps.SearchAvailable && query.IsSearch) return true; @@ -307,7 +307,7 @@ namespace Jackett.Common.Indexers return true; if (caps.SupportsTVRageSearch && query.IsTVRageSearch) return true; - if (caps.SupportsImdbSearch && query.IsImdbQuery) + if (caps.SupportsImdbMovieSearch && query.IsImdbQuery) return true; return false; diff --git a/src/Jackett.Common/Indexers/Bitspiracy.cs b/src/Jackett.Common/Indexers/Bitspiracy.cs index 7bf7de728..eb05cc6d2 100644 --- a/src/Jackett.Common/Indexers/Bitspiracy.cs +++ b/src/Jackett.Common/Indexers/Bitspiracy.cs @@ -41,7 +41,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(1, TorznabCatType.MoviesDVD, "Movies/DVDR"); AddCategoryMapping(2, TorznabCatType.MoviesSD, "Movies/XviD"); diff --git a/src/Jackett.Common/Indexers/BrasilTracker.cs b/src/Jackett.Common/Indexers/BrasilTracker.cs index 192fb6b4c..b27c877da 100644 --- a/src/Jackett.Common/Indexers/BrasilTracker.cs +++ b/src/Jackett.Common/Indexers/BrasilTracker.cs @@ -22,7 +22,7 @@ namespace Jackett.Common.Indexers { Language = "pt-br"; Type = "private"; - TorznabCaps.SupportsImdbSearch = false; // they store the imdb ID but it's not included in the results, search is also not available. + TorznabCaps.SupportsImdbMovieSearch = false; // they store the imdb ID but it's not included in the results, search is also not available. TorznabCaps.SupportedMusicSearchParamsList = new List() { "q", "album", "artist", "label", "year" }; AddCategoryMapping(1, TorznabCatType.Movies, "Filmes"); diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index 262cd26bc..0ed05b5d5 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -92,7 +92,7 @@ namespace Jackett.Common.Indexers Type = Definition.Type; TorznabCaps = new TorznabCapabilities(); - TorznabCaps.SupportsImdbSearch = Definition.Caps.Modes.Where(c => c.Key == "movie-search" && c.Value.Contains("imdbid")).Any(); + TorznabCaps.SupportsImdbMovieSearch = Definition.Caps.Modes.Where(c => c.Key == "movie-search" && c.Value.Contains("imdbid")).Any(); if (Definition.Caps.Modes.ContainsKey("music-search")) TorznabCaps.SupportedMusicSearchParamsList = Definition.Caps.Modes["music-search"]; @@ -1494,7 +1494,7 @@ namespace Jackett.Common.Indexers if (Filter.Args != null) CharacterLimit = int.Parse(Filter.Args); - if (query.ImdbID != null && TorznabCaps.SupportsImdbSearch) + if (query.ImdbID != null && TorznabCaps.SupportsImdbMovieSearch) break; // skip andmatch filter for imdb searches if (!query.MatchQueryStringAND(release.Title, CharacterLimit)) diff --git a/src/Jackett.Common/Indexers/DigitalHive.cs b/src/Jackett.Common/Indexers/DigitalHive.cs index b6bb198b9..b8ec7a041 100644 --- a/src/Jackett.Common/Indexers/DigitalHive.cs +++ b/src/Jackett.Common/Indexers/DigitalHive.cs @@ -210,7 +210,7 @@ namespace Jackett.Common.Indexers var qRow = row.Cq(); release.Title = qRow.Find("td:nth-child(2) > a").First().Text().Trim(); - if ((query.ImdbID == null || !TorznabCaps.SupportsImdbSearch) && !query.MatchQueryStringAND(release.Title)) + if ((query.ImdbID == null || !TorznabCaps.SupportsImdbMovieSearch) && !query.MatchQueryStringAND(release.Title)) continue; release.Guid = new Uri(SiteLink + qRow.Find("td:nth-child(2) > a").First().Attr("href")); diff --git a/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs b/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs index d870d1e4d..459e00d4e 100644 --- a/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs +++ b/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs @@ -31,7 +31,7 @@ namespace Jackett.Common.Indexers.Feeds SearchAvailable = true, TVSearchAvailable = false, MovieSearchAvailable = false, - SupportsImdbSearch = false, + SupportsImdbMovieSearch = false, SupportsTVRageSearch = false }; diff --git a/src/Jackett.Common/Indexers/FileList.cs b/src/Jackett.Common/Indexers/FileList.cs index c8e1147ae..0894c8bae 100644 --- a/src/Jackett.Common/Indexers/FileList.cs +++ b/src/Jackett.Common/Indexers/FileList.cs @@ -47,7 +47,7 @@ namespace Jackett.Common.Indexers Language = "ro-ro"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(24, TorznabCatType.TVAnime, "Anime"); AddCategoryMapping(11, TorznabCatType.Audio, "Audio"); diff --git a/src/Jackett.Common/Indexers/Fuzer.cs b/src/Jackett.Common/Indexers/Fuzer.cs index 1adadc89b..67e4db139 100644 --- a/src/Jackett.Common/Indexers/Fuzer.cs +++ b/src/Jackett.Common/Indexers/Fuzer.cs @@ -46,7 +46,7 @@ namespace Jackett.Common.Indexers Encoding = Encoding.GetEncoding("windows-1255"); Language = "he-il"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; TorznabCaps.Categories.Clear(); // סרטים diff --git a/src/Jackett.Common/Indexers/GazelleGames.cs b/src/Jackett.Common/Indexers/GazelleGames.cs index c3221e6dd..c1b202abf 100644 --- a/src/Jackett.Common/Indexers/GazelleGames.cs +++ b/src/Jackett.Common/Indexers/GazelleGames.cs @@ -298,7 +298,7 @@ namespace Jackett.Common.Indexers release.Title = release.Title.Replace(", Neutral Leech!", ""); if (stickyGroup) // AND match for sticky releases - if ((query.ImdbID == null || !TorznabCaps.SupportsImdbSearch) && !query.MatchQueryStringAND(release.Title)) + if ((query.ImdbID == null || !TorznabCaps.SupportsImdbMovieSearch) && !query.MatchQueryStringAND(release.Title)) continue; var Size = qSize.TextContent; diff --git a/src/Jackett.Common/Indexers/HDTorrents.cs b/src/Jackett.Common/Indexers/HDTorrents.cs index 8060d7138..60455cdf0 100644 --- a/src/Jackett.Common/Indexers/HDTorrents.cs +++ b/src/Jackett.Common/Indexers/HDTorrents.cs @@ -42,7 +42,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; TorznabCaps.Categories.Clear(); diff --git a/src/Jackett.Common/Indexers/IPTorrents.cs b/src/Jackett.Common/Indexers/IPTorrents.cs index e7479fbc3..39ae515c6 100644 --- a/src/Jackett.Common/Indexers/IPTorrents.cs +++ b/src/Jackett.Common/Indexers/IPTorrents.cs @@ -66,7 +66,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(72, TorznabCatType.Movies, "Movies"); AddCategoryMapping(87, TorznabCatType.Movies3D, "Movie/3D"); diff --git a/src/Jackett.Common/Indexers/Norbits.cs b/src/Jackett.Common/Indexers/Norbits.cs index 7f001168b..68273133c 100644 --- a/src/Jackett.Common/Indexers/Norbits.cs +++ b/src/Jackett.Common/Indexers/Norbits.cs @@ -57,7 +57,7 @@ namespace Jackett.Common.Indexers Language = "nb-no"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping("main_cat[]=1&sub2_cat[]=19", TorznabCatType.MoviesHD, "Filmer - HD-1080p/i"); AddCategoryMapping("main_cat[]=1&sub2_cat[]=20", TorznabCatType.MoviesHD, "Filmer - HD-720p"); diff --git a/src/Jackett.Common/Indexers/Nordicbits.cs b/src/Jackett.Common/Indexers/Nordicbits.cs index c62a05eeb..149d1d3b1 100644 --- a/src/Jackett.Common/Indexers/Nordicbits.cs +++ b/src/Jackett.Common/Indexers/Nordicbits.cs @@ -57,7 +57,7 @@ namespace Jackett.Common.Indexers Language = "da-dk"; Type = "private"; - TorznabCaps.SupportsImdbSearch = false; + TorznabCaps.SupportsImdbMovieSearch = false; // Apps AddCategoryMapping("cat=63", TorznabCatType.PCPhoneAndroid, "APPS - Android"); diff --git a/src/Jackett.Common/Indexers/PassThePopcorn.cs b/src/Jackett.Common/Indexers/PassThePopcorn.cs index 50a3c1da9..1a5912d54 100644 --- a/src/Jackett.Common/Indexers/PassThePopcorn.cs +++ b/src/Jackett.Common/Indexers/PassThePopcorn.cs @@ -46,7 +46,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; webclient.requestDelay = 2; // 0.5 requests per second diff --git a/src/Jackett.Common/Indexers/PiXELHD.cs b/src/Jackett.Common/Indexers/PiXELHD.cs index 39e1b6e6b..11e3e374a 100644 --- a/src/Jackett.Common/Indexers/PiXELHD.cs +++ b/src/Jackett.Common/Indexers/PiXELHD.cs @@ -48,7 +48,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(1, TorznabCatType.MoviesHD); } diff --git a/src/Jackett.Common/Indexers/Rarbg.cs b/src/Jackett.Common/Indexers/Rarbg.cs index 295104ec8..4858d4e89 100644 --- a/src/Jackett.Common/Indexers/Rarbg.cs +++ b/src/Jackett.Common/Indexers/Rarbg.cs @@ -63,7 +63,7 @@ namespace Jackett.Common.Indexers provideTorrentLinkItem.Name = "Generate torrent download link additionally to magnet (not recommended due to DDoS protection)."; configData.AddDynamic("providetorrentlink", provideTorrentLinkItem); - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; webclient.requestDelay = 2.1; // The api has a 1req/2s limit. diff --git a/src/Jackett.Common/Indexers/SceneHD.cs b/src/Jackett.Common/Indexers/SceneHD.cs index 3e86f8503..445ff6058 100644 --- a/src/Jackett.Common/Indexers/SceneHD.cs +++ b/src/Jackett.Common/Indexers/SceneHD.cs @@ -39,7 +39,7 @@ namespace Jackett.Common.Indexers Encoding = Encoding.UTF8; Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; webclient.EmulateBrowser = false; webclient.AddTrustedCertificate(new Uri(SiteLink).Host, "81CC4E41B6F8FF656CA0E2396EE6D63383198BF1"); diff --git a/src/Jackett.Common/Indexers/SecretCinema.cs b/src/Jackett.Common/Indexers/SecretCinema.cs index b49707ff5..a8608bea2 100644 --- a/src/Jackett.Common/Indexers/SecretCinema.cs +++ b/src/Jackett.Common/Indexers/SecretCinema.cs @@ -24,7 +24,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; TorznabCaps.SupportedMusicSearchParamsList = new List() { "q", "album", "artist", "label", "year" }; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(1, TorznabCatType.Movies, "Movies"); AddCategoryMapping(2, TorznabCatType.Audio, "Music"); diff --git a/src/Jackett.Common/Indexers/Shazbat.cs b/src/Jackett.Common/Indexers/Shazbat.cs index 0df469d91..008558a77 100644 --- a/src/Jackett.Common/Indexers/Shazbat.cs +++ b/src/Jackett.Common/Indexers/Shazbat.cs @@ -144,7 +144,7 @@ namespace Jackett.Common.Indexers var titleRow = qRow.Find("td:eq(2)").First(); titleRow.Children().Remove(); release.Title = titleRow.Text().Trim(); - if ((query.ImdbID == null || !TorznabCaps.SupportsImdbSearch) && !query.MatchQueryStringAND(release.Title)) + if ((query.ImdbID == null || !TorznabCaps.SupportsImdbMovieSearch) && !query.MatchQueryStringAND(release.Title)) continue; var qBanner = qRow.Find("div[style^=\"cursor: pointer; background-image:url\"]"); diff --git a/src/Jackett.Common/Indexers/ShowRSS.cs b/src/Jackett.Common/Indexers/ShowRSS.cs index f32052112..bba757dd1 100644 --- a/src/Jackett.Common/Indexers/ShowRSS.cs +++ b/src/Jackett.Common/Indexers/ShowRSS.cs @@ -82,7 +82,7 @@ namespace Jackett.Common.Indexers serie_title = node.SelectSingleNode(".//*[local-name()='raw_title']").InnerText; release.Title = serie_title; - if ((query.ImdbID == null || !TorznabCaps.SupportsImdbSearch) && !query.MatchQueryStringAND(release.Title)) + if ((query.ImdbID == null || !TorznabCaps.SupportsImdbMovieSearch) && !query.MatchQueryStringAND(release.Title)) continue; release.Comments = new Uri(node.SelectSingleNode("link").InnerText); diff --git a/src/Jackett.Common/Indexers/SpeedCD.cs b/src/Jackett.Common/Indexers/SpeedCD.cs index a81b6c4db..b30463348 100644 --- a/src/Jackett.Common/Indexers/SpeedCD.cs +++ b/src/Jackett.Common/Indexers/SpeedCD.cs @@ -43,7 +43,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(1, TorznabCatType.MoviesOther, "Movies/XviD"); AddCategoryMapping(42, TorznabCatType.Movies, "Movies/Packs"); diff --git a/src/Jackett.Common/Indexers/Superbits.cs b/src/Jackett.Common/Indexers/Superbits.cs index 0d42be8e6..ad9f132fa 100644 --- a/src/Jackett.Common/Indexers/Superbits.cs +++ b/src/Jackett.Common/Indexers/Superbits.cs @@ -42,7 +42,7 @@ namespace Jackett.Common.Indexers Language = "sv-sw"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(1, TorznabCatType.MoviesDVD, "DVD-R Swesub"); AddCategoryMapping(2, TorznabCatType.TV, "DVD-R TV"); diff --git a/src/Jackett.Common/Indexers/TorrentDay.cs b/src/Jackett.Common/Indexers/TorrentDay.cs index bae8df3d6..7229e26f5 100644 --- a/src/Jackett.Common/Indexers/TorrentDay.cs +++ b/src/Jackett.Common/Indexers/TorrentDay.cs @@ -67,7 +67,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(29, TorznabCatType.TVAnime, "Anime"); AddCategoryMapping(28, TorznabCatType.PC, "Appz/Packs"); @@ -230,7 +230,7 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo(); release.Title = torrent.name; - if ((query.ImdbID == null || !TorznabCaps.SupportsImdbSearch) && !query.MatchQueryStringAND(release.Title)) + if ((query.ImdbID == null || !TorznabCaps.SupportsImdbMovieSearch) && !query.MatchQueryStringAND(release.Title)) continue; release.MinimumRatio = 1; diff --git a/src/Jackett.Common/Indexers/TorrentSyndikat.cs b/src/Jackett.Common/Indexers/TorrentSyndikat.cs index e3935afc4..8c9bf2836 100644 --- a/src/Jackett.Common/Indexers/TorrentSyndikat.cs +++ b/src/Jackett.Common/Indexers/TorrentSyndikat.cs @@ -45,7 +45,7 @@ namespace Jackett.Common.Indexers Language = "de-de"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum."; this.configData.DisplayText.Name = "Notice"; diff --git a/src/Jackett.Common/Indexers/Torrentscsv.cs b/src/Jackett.Common/Indexers/Torrentscsv.cs index 3d099a282..11e4765d1 100644 --- a/src/Jackett.Common/Indexers/Torrentscsv.cs +++ b/src/Jackett.Common/Indexers/Torrentscsv.cs @@ -47,7 +47,7 @@ namespace Jackett.Common.Indexers { AddCategoryMapping (7000, TorznabCatType.Other); AddCategoryMapping (8000, TorznabCatType.Books); - TorznabCaps.SupportsImdbSearch = false; + TorznabCaps.SupportsImdbMovieSearch = false; webclient.requestDelay = 0; } diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs index f93356e81..9492f9eae 100644 --- a/src/Jackett.Common/Indexers/XSpeeds.cs +++ b/src/Jackett.Common/Indexers/XSpeeds.cs @@ -53,7 +53,7 @@ namespace Jackett.Common.Indexers configData.DisplayText.Value = "Expect an initial delay (often around 10 seconds) due to XSpeeds CloudFlare DDoS protection"; configData.DisplayText.Name = "Notice"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(92, TorznabCatType.MoviesUHD, "4K Movies"); AddCategoryMapping(91, TorznabCatType.TVUHD, "4K TV"); diff --git a/src/Jackett.Common/Indexers/digitalcore.cs b/src/Jackett.Common/Indexers/digitalcore.cs index 8988ef08f..8168984f4 100644 --- a/src/Jackett.Common/Indexers/digitalcore.cs +++ b/src/Jackett.Common/Indexers/digitalcore.cs @@ -41,7 +41,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "private"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; AddCategoryMapping(1, TorznabCatType.MoviesDVD, "Movies/DVDR"); AddCategoryMapping(2, TorznabCatType.MoviesSD, "Movies/XviD"); diff --git a/src/Jackett.Common/Indexers/yts.cs b/src/Jackett.Common/Indexers/yts.cs index b8d4d39e9..a804dc312 100644 --- a/src/Jackett.Common/Indexers/yts.cs +++ b/src/Jackett.Common/Indexers/yts.cs @@ -44,7 +44,7 @@ namespace Jackett.Common.Indexers Language = "en-us"; Type = "public"; - TorznabCaps.SupportsImdbSearch = true; + TorznabCaps.SupportsImdbMovieSearch = true; webclient.requestDelay = 2.5; // 0.5 requests per second (2 causes problems) diff --git a/src/Jackett.Common/Models/TorznabCapabilities.cs b/src/Jackett.Common/Models/TorznabCapabilities.cs index bfb233066..c820537d0 100644 --- a/src/Jackett.Common/Models/TorznabCapabilities.cs +++ b/src/Jackett.Common/Models/TorznabCapabilities.cs @@ -18,7 +18,7 @@ namespace Jackett.Common.Models public bool SupportsTVRageSearch { get; set; } - public bool SupportsImdbSearch { get; set; } + public bool SupportsImdbMovieSearch { get; set; } public bool MusicSearchAvailable { @@ -39,7 +39,7 @@ namespace Jackett.Common.Models TVSearchAvailable = true; MovieSearchAvailable = false; SupportsTVRageSearch = false; - SupportsImdbSearch = false; + SupportsImdbMovieSearch = false; SupportedMusicSearchParamsList = new List(); } @@ -48,7 +48,7 @@ namespace Jackett.Common.Models SearchAvailable = true; TVSearchAvailable = true; SupportsTVRageSearch = false; - SupportsImdbSearch = false; + SupportsImdbMovieSearch = false; SupportedMusicSearchParamsList = new List(); Categories = new List(); Categories.AddRange(cats); @@ -62,8 +62,6 @@ namespace Jackett.Common.Models var parameters = new List() { "q", "season", "ep" }; if (SupportsTVRageSearch) parameters.Add("rid"); - if (SupportsImdbSearch) - parameters.Add("imdbid"); return string.Join(",", parameters); } } @@ -73,7 +71,7 @@ namespace Jackett.Common.Models get { var parameters = new List() { "q" }; - if (SupportsImdbSearch) + if (SupportsImdbMovieSearch) parameters.Add("imdbid"); return string.Join(",", parameters); } @@ -161,7 +159,7 @@ namespace Jackett.Common.Models lhs.TVSearchAvailable = lhs.TVSearchAvailable || rhs.TVSearchAvailable; lhs.MovieSearchAvailable = lhs.MovieSearchAvailable || rhs.MovieSearchAvailable; lhs.SupportsTVRageSearch = lhs.SupportsTVRageSearch || rhs.SupportsTVRageSearch; - lhs.SupportsImdbSearch = lhs.SupportsImdbSearch || rhs.SupportsImdbSearch; + lhs.SupportsImdbMovieSearch = lhs.SupportsImdbMovieSearch || rhs.SupportsImdbMovieSearch; lhs.Categories.AddRange(rhs.Categories.Where(x => x.ID < 100000).Except(lhs.Categories)); // exclude indexer specific categories (>= 100000) return lhs; diff --git a/src/Jackett.Server/Controllers/ResultsController.cs b/src/Jackett.Server/Controllers/ResultsController.cs index a4c9531c0..783468268 100644 --- a/src/Jackett.Server/Controllers/ResultsController.cs +++ b/src/Jackett.Server/Controllers/ResultsController.cs @@ -355,7 +355,7 @@ namespace Jackett.Server.Controllers return GetErrorXML(201, "Incorrect parameter: invalid imdbid format"); } - if (!CurrentIndexer.TorznabCaps.SupportsImdbSearch) + if (!CurrentIndexer.TorznabCaps.SupportsImdbMovieSearch) { logger.Warn($"A search request with imdbid from {Request.HttpContext.Connection.RemoteIpAddress} was made but the indexer {CurrentIndexer.DisplayName} doesn't support it."); return GetErrorXML(203, "Function Not Available: imdbid is not supported by this indexer");