From 6a722a57b47e26901a38a330ca6e9020a72035c4 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 12 Apr 2023 05:03:22 +0300 Subject: [PATCH] bjshare: remove imdbid search for movies (#14244) --- src/Jackett.Common/Indexers/BJShare.cs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs index 2d33ae8dc..c19b60baf 100644 --- a/src/Jackett.Common/Indexers/BJShare.cs +++ b/src/Jackett.Common/Indexers/BJShare.cs @@ -8,6 +8,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using AngleSharp.Dom; using AngleSharp.Html.Parser; +using Jackett.Common.Extensions; using Jackett.Common.Models; using Jackett.Common.Models.IndexerConfig; using Jackett.Common.Services.Interfaces; @@ -86,7 +87,7 @@ namespace Jackett.Common.Indexers }, MovieSearchParams = new List { - MovieSearchParam.Q, MovieSearchParam.ImdbId + MovieSearchParam.Q }, MusicSearchParams = new List { @@ -237,20 +238,13 @@ namespace Jackett.Common.Indexers private bool IsSessionIsClosed(WebResult result) => result.IsRedirect && result.RedirectingTo.Contains("login.php"); - private string FixSearchTerm(TorznabQuery query) - { - if (query.IsImdbQuery) - return query.ImdbID; - return _commonSearchTerms.Aggregate( - query.GetQueryString(), - (current, searchTerm) => current.ToLower().Replace(searchTerm.Key.ToLower(), searchTerm.Value)); - } + private string FixSearchTerm(TorznabQuery query) => _commonSearchTerms.Aggregate( + query.GetQueryString(), + (current, searchTerm) => current.ToLower().Replace(searchTerm.Key.ToLower(), searchTerm.Value)); // if the search string is empty use the "last 24h torrents" view protected override async Task> PerformQuery(TorznabQuery query) => - (string.IsNullOrWhiteSpace(query.SearchTerm) && !query.IsImdbQuery) - ? await ParseLast24HoursAsync() - : await ParseUserSearchAsync(query); + query.SearchTerm.IsNullOrWhiteSpace() ? await ParseLast24HoursAsync() : await ParseUserSearchAsync(query); private async Task> ParseUserSearchAsync(TorznabQuery query) { @@ -419,8 +413,11 @@ namespace Jackett.Common.Indexers release.PublishDate = DateTime.Today; // check for previously stripped search terms - if (!query.IsImdbQuery && !query.MatchQueryStringAND(release.Title, null, searchTerm)) + if (!query.MatchQueryStringAND(release.Title, null, searchTerm)) + { continue; + } + var size = qSize.TextContent; release.Size = ParseUtil.GetBytes(size); release.Link = new Uri(SiteLink + qDlLink.GetAttribute("href"));