shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

core: separate categories from movie-search (#9862)

Browse Source 
* Categories and Torznab movie-search are separated
* Movie-search parameters are validated
* Fixed some bugs in Cardigann indexers
This commit is contained in:
Diego Heras
2020-10-18 19:26:22 +02:00
committed by GitHub
parent 1fcd467996
commit 9cdad3de64
94 changed files with 332 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Jackett.Common/Indexers/BaseIndexer.cs
View File

@@ -287,9 +287,9 @@ namespace Jackett.Common.Indexers
return false;
if (caps.SupportsImdbTVSearch && query.IsImdbQuery && query.IsTVSearch)
return true;
if (caps.SupportsImdbMovieSearch && query.IsImdbQuery && query.IsMovieSearch)
if (caps.MovieSearchImdbAvailable && query.IsImdbQuery && query.IsMovieSearch)
return true;
else if (!caps.SupportsImdbMovieSearch && query.IsImdbQuery && query.QueryType != "TorrentPotato") // potato query should always contain imdb+search term
else if (!caps.MovieSearchImdbAvailable && query.IsImdbQuery && query.QueryType != "TorrentPotato") // potato query should always contain imdb+search term
return false;
if (caps.SearchAvailable && query.IsSearch)
return true;
@@ -305,9 +305,9 @@ namespace Jackett.Common.Indexers
return true;
if (caps.SupportsTvdbSearch && query.IsTvdbSearch)
return true;
if (caps.SupportsImdbMovieSearch && query.IsImdbQuery)
if (caps.MovieSearchImdbAvailable && query.IsImdbQuery)
return true;
if (caps.SupportsTmdbMovieSearch && query.IsTmdbQuery)
if (caps.MovieSearchTmdbAvailable && query.IsTmdbQuery)
return true;
return false;
@@ -583,11 +583,7 @@ namespace Jackett.Common.Indexers
{
categoryMapping.Add(new CategoryMapping(trackerCategory, trackerCategoryDesc, newznabCategory.ID));
if (!TorznabCaps.Categories.Contains(newznabCategory))
{
TorznabCaps.Categories.Add(newznabCategory);
if (TorznabCatType.Movies.Contains(newznabCategory))
TorznabCaps.MovieSearchAvailable = true;
}
// add 1:1 categories
if (trackerCategoryDesc != null && trackerCategory != null)