mirror of https://github.com/Jackett/Jackett
* Implement category searching. Fixes #7577 * Check if no results Resolves #7596
This commit is contained in:
parent
ba9710cd7c
commit
63f1870319
|
@ -45,6 +45,7 @@ namespace Jackett.Common.Indexers
|
||||||
Language = "en-us";
|
Language = "en-us";
|
||||||
Type = "private";
|
Type = "private";
|
||||||
TorznabCaps.SupportsImdbMovieSearch = true;
|
TorznabCaps.SupportsImdbMovieSearch = true;
|
||||||
|
TorznabCaps.SupportsImdbTVSearch = true;
|
||||||
AddCategoryMapping(1, TorznabCatType.TVAnime); // Anime
|
AddCategoryMapping(1, TorznabCatType.TVAnime); // Anime
|
||||||
AddCategoryMapping(2, TorznabCatType.MoviesBluRay); // Blu-ray
|
AddCategoryMapping(2, TorznabCatType.MoviesBluRay); // Blu-ray
|
||||||
AddCategoryMapping(4, TorznabCatType.TVDocumentary); // Documentaries
|
AddCategoryMapping(4, TorznabCatType.TVDocumentary); // Documentaries
|
||||||
|
@ -115,7 +116,11 @@ namespace Jackett.Common.Indexers
|
||||||
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
||||||
{
|
{
|
||||||
var releases = new List<ReleaseInfo>();
|
var releases = new List<ReleaseInfo>();
|
||||||
var qc = new NameValueCollection();
|
var cats = MapTorznabCapsToTrackers(query, true);
|
||||||
|
var qc = new NameValueCollection
|
||||||
|
{
|
||||||
|
{"cat", cats.Count == 1 ? cats[0] : "0"}
|
||||||
|
};
|
||||||
var results = new List<WebClientStringResult>();
|
var results = new List<WebClientStringResult>();
|
||||||
var search = new UriBuilder(SearchUrl);
|
var search = new UriBuilder(SearchUrl);
|
||||||
if (query.IsImdbQuery)
|
if (query.IsImdbQuery)
|
||||||
|
@ -137,7 +142,6 @@ namespace Jackett.Common.Indexers
|
||||||
results.Add(await RequestStringWithCookiesAndRetry(search.ToString()));
|
results.Add(await RequestStringWithCookiesAndRetry(search.ToString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
var trackerCats = MapTorznabCapsToTrackers(query, true);
|
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
foreach (var result in results)
|
foreach (var result in results)
|
||||||
try
|
try
|
||||||
|
@ -146,6 +150,8 @@ namespace Jackett.Common.Indexers
|
||||||
foreach (var child in dom.QuerySelectorAll("#needseed"))
|
foreach (var child in dom.QuerySelectorAll("#needseed"))
|
||||||
child.Remove();
|
child.Remove();
|
||||||
var table = dom.QuerySelector("table[align=center] + br + table > tbody");
|
var table = dom.QuerySelector("table[align=center] + br + table > tbody");
|
||||||
|
if (table == null) // No results, so skip this search
|
||||||
|
continue;
|
||||||
foreach (var row in table.Children.Skip(1))
|
foreach (var row in table.Children.Skip(1))
|
||||||
{
|
{
|
||||||
var release = new ReleaseInfo();
|
var release = new ReleaseInfo();
|
||||||
|
@ -167,10 +173,6 @@ namespace Jackett.Common.Indexers
|
||||||
var catNum = catQuery["cat"];
|
var catNum = catQuery["cat"];
|
||||||
release.Category = MapTrackerCatToNewznab(catNum);
|
release.Category = MapTrackerCatToNewznab(catNum);
|
||||||
|
|
||||||
// This tracker cannot search multiple cats at a time
|
|
||||||
// so search all cats then filter out results from different cats
|
|
||||||
if (trackerCats.Any() && !trackerCats.Contains(catNum))
|
|
||||||
continue;
|
|
||||||
var dateString = row.Children[5].TextContent.Trim();
|
var dateString = row.Children[5].TextContent.Trim();
|
||||||
var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture);
|
var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture);
|
||||||
release.PublishDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Local);
|
release.PublishDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Local);
|
||||||
|
|
Loading…
Reference in New Issue