From cbf6e45f64111b2493de2a1c2a27240493bcaf2a Mon Sep 17 00:00:00 2001 From: kaso17 Date: Tue, 25 Oct 2016 08:46:06 +0200 Subject: [PATCH] Several small fixes (#562) * Fix PreToMe search results if no category is specified * AND filter Andraste results * AND filter Best Friends results * AND filter Bit City Reloaded results * AND filter Freshon results * AND filter myAmity results * AND filter SceneTime results * AND filter NewRealWorld results * Remove dashes from TorrentLeech queries as they exclude search strings --- src/Jackett/Indexers/Andraste.cs | 3 +++ src/Jackett/Indexers/BestFriends.cs | 3 +++ src/Jackett/Indexers/BitCityReloaded.cs | 4 ++++ src/Jackett/Indexers/Freshon.cs | 3 +++ src/Jackett/Indexers/NewRealWorld.cs | 3 +++ src/Jackett/Indexers/Pretome.cs | 10 +++++++++- src/Jackett/Indexers/SceneTime.cs | 7 +++++-- src/Jackett/Indexers/TorrentLeech.cs | 3 ++- src/Jackett/Indexers/myAmity.cs | 3 +++ 9 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/Jackett/Indexers/Andraste.cs b/src/Jackett/Indexers/Andraste.cs index 0711e3d62..6ec49f0de 100644 --- a/src/Jackett/Indexers/Andraste.cs +++ b/src/Jackett/Indexers/Andraste.cs @@ -136,6 +136,9 @@ namespace Jackett.Indexers var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First(); release.Title = qDetailsLink.Attr("title"); + if (!query.MatchQueryStringAND(release.Title)) + continue; + var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First(); var qDLLink = qRow.Find("a[href^=download.php?torrent=]").First(); var qSeeders = qRow.Find("span:contains(Seeder) > b:eq(0)"); diff --git a/src/Jackett/Indexers/BestFriends.cs b/src/Jackett/Indexers/BestFriends.cs index 599e6ed89..481c17bc6 100644 --- a/src/Jackett/Indexers/BestFriends.cs +++ b/src/Jackett/Indexers/BestFriends.cs @@ -170,6 +170,9 @@ namespace Jackett.Indexers var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First(); release.Title = qDetailsLink.Attr("title"); + if (!query.MatchQueryStringAND(release.Title)) + continue; + var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First(); var qSeeders = qRow.Find("td:eq(7)"); var qLeechers = qRow.Find("td:eq(8)"); diff --git a/src/Jackett/Indexers/BitCityReloaded.cs b/src/Jackett/Indexers/BitCityReloaded.cs index dfda3d2cb..bbe0c441d 100644 --- a/src/Jackett/Indexers/BitCityReloaded.cs +++ b/src/Jackett/Indexers/BitCityReloaded.cs @@ -147,6 +147,10 @@ namespace Jackett.Indexers release.Comments = new Uri(SiteLink + titleLink.Attr("href").Replace("&hit=1", "")); release.Link = new Uri(SiteLink + DLLink.Attr("href")); release.Title = titleLink.Text().Trim(); + + if (!query.MatchQueryStringAND(release.Title)) + continue; + release.Description = String.Join(", ", flags); release.Guid = release.Link; diff --git a/src/Jackett/Indexers/Freshon.cs b/src/Jackett/Indexers/Freshon.cs index 2c99f5459..3e57a5a37 100644 --- a/src/Jackett/Indexers/Freshon.cs +++ b/src/Jackett/Indexers/Freshon.cs @@ -104,6 +104,9 @@ namespace Jackett.Indexers release.MinimumRatio = 1; release.MinimumSeedTime = 172800; release.Title = qLink.Attr("title"); + if (!query.MatchQueryStringAND(release.Title)) + continue; + release.Description = release.Title; release.Guid = new Uri(SiteLink + qLink.Attr("href").TrimStart('/')); release.Comments = release.Guid; diff --git a/src/Jackett/Indexers/NewRealWorld.cs b/src/Jackett/Indexers/NewRealWorld.cs index 74dbfd2f0..f35838d91 100644 --- a/src/Jackett/Indexers/NewRealWorld.cs +++ b/src/Jackett/Indexers/NewRealWorld.cs @@ -163,6 +163,9 @@ namespace Jackett.Indexers var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First(); release.Title = qDetailsLink.Text(); + if (!query.MatchQueryStringAND(release.Title)) + continue; + var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First(); var qSeeders = qRow.Find("td > table.testtable > tbody > tr > td > strong:eq(3)"); var qLeechers = qRow.Find("td > table.testtable > tbody > tr > td > strong:eq(4)"); diff --git a/src/Jackett/Indexers/Pretome.cs b/src/Jackett/Indexers/Pretome.cs index 9cd8c3c15..36200eaad 100644 --- a/src/Jackett/Indexers/Pretome.cs +++ b/src/Jackett/Indexers/Pretome.cs @@ -250,7 +250,15 @@ namespace Jackett.Indexers if (tags.Split(',').Length < 7) { queryCollection.Add("tags", tags); - queryCollection.Add("tf", "any"); + if(!string.IsNullOrWhiteSpace(tags)) { + // if tags are specified match any + queryCollection.Add("tf", "any"); + } + else + { + // if no tags are specified match all, with any we get random results + queryCollection.Add("tf", "all"); + } } if (queryCollection.Count > 0) diff --git a/src/Jackett/Indexers/SceneTime.cs b/src/Jackett/Indexers/SceneTime.cs index 95c635536..214f96d10 100644 --- a/src/Jackett/Indexers/SceneTime.cs +++ b/src/Jackett/Indexers/SceneTime.cs @@ -160,12 +160,12 @@ namespace Jackett.Indexers } var results = await PostDataWithCookiesAndRetry(SearchUrl, qParams); - List releases = ParseResponse(results.Content); + List releases = ParseResponse(query, results.Content); return releases; } - public List ParseResponse(string htmlResponse) + public List ParseResponse(TorznabQuery query, string htmlResponse) { List releases = new List(); @@ -196,6 +196,9 @@ namespace Jackett.Indexers var qDescCol = descCol.Cq(); var qLink = qDescCol.Find("a"); release.Title = qLink.Text(); + if (!query.MatchQueryStringAND(release.Title)) + continue; + release.Description = release.Title; release.Comments = new Uri(SiteLink + "/" + qLink.Attr("href")); release.Guid = release.Comments; diff --git a/src/Jackett/Indexers/TorrentLeech.cs b/src/Jackett/Indexers/TorrentLeech.cs index d84c8fce5..f7c4b9f47 100644 --- a/src/Jackett/Indexers/TorrentLeech.cs +++ b/src/Jackett/Indexers/TorrentLeech.cs @@ -115,7 +115,8 @@ namespace Jackett.Indexers } var releases = new List(); - var searchString = query.GetQueryString(); + var searchString = query.GetQueryString(); + searchString = searchString.Replace('-', ' '); // remove dashes as they exclude search strings var searchUrl = SearchUrl; if (!string.IsNullOrWhiteSpace(searchString)) diff --git a/src/Jackett/Indexers/myAmity.cs b/src/Jackett/Indexers/myAmity.cs index a16a4041a..f4b082816 100644 --- a/src/Jackett/Indexers/myAmity.cs +++ b/src/Jackett/Indexers/myAmity.cs @@ -126,6 +126,9 @@ namespace Jackett.Indexers var qDetailsLink = qRow.Find("a[href^=torrents-details.php?id=]").First(); release.Title = qDetailsLink.Attr("title"); + if (!query.MatchQueryStringAND(release.Title)) + continue; + var qCatLink = qRow.Find("a[href^=torrents.php?cat=]").First(); var qDLLink = qRow.Find("a[href^=download.php]").First(); var qSeeders = qRow.Find("td:eq(6)");