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

@@ -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)");

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)");

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;
 

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;

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)");

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)

src/Jackett/Indexers/SceneTime.cs

@@ -160,12 +160,12 @@ namespace Jackett.Indexers
             }
 
             var results = await PostDataWithCookiesAndRetry(SearchUrl, qParams);
-            List<ReleaseInfo> releases = ParseResponse(results.Content);
+            List<ReleaseInfo> releases = ParseResponse(query, results.Content);
             
             return releases;
         }
 
-        public List<ReleaseInfo> ParseResponse(string htmlResponse)
+        public List<ReleaseInfo> ParseResponse(TorznabQuery query, string htmlResponse)
         {
             List<ReleaseInfo> releases = new List<ReleaseInfo>();
 
@@ -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;

src/Jackett/Indexers/TorrentLeech.cs

@@ -115,7 +115,8 @@ namespace Jackett.Indexers
             }
 
             var releases = new List<ReleaseInfo>();
-            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))

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)");