From 577477c42d234dfd66f5594e53ccd3d5a432b371 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sat, 4 Mar 2023 04:29:27 +0200 Subject: [PATCH] Fixed: (SceneTime) Add search by imdbid --- .../Indexers/Definitions/SceneTime.cs | 93 ++++++++++--------- 1 file changed, 50 insertions(+), 43 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs b/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs index fa40c9cf2..2151fda51 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs @@ -37,7 +37,7 @@ namespace NzbDrone.Core.Indexers.Definitions public override IIndexerRequestGenerator GetRequestGenerator() { - return new SceneTimeRequestGenerator { Settings = Settings, Capabilities = Capabilities }; + return new SceneTimeRequestGenerator(Settings, Capabilities); } public override IParseIndexerResponse GetParser() @@ -66,11 +66,11 @@ namespace NzbDrone.Core.Indexers.Definitions { TvSearchParams = new List { - TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep + TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId }, MovieSearchParams = new List { - MovieSearchParam.Q + MovieSearchParam.Q, MovieSearchParam.ImdbId }, MusicSearchParams = new List { @@ -118,63 +118,38 @@ namespace NzbDrone.Core.Indexers.Definitions public class SceneTimeRequestGenerator : IIndexerRequestGenerator { - public SceneTimeSettings Settings { get; set; } - public IndexerCapabilities Capabilities { get; set; } + private readonly SceneTimeSettings _settings; + private readonly IndexerCapabilities _capabilities; - private IEnumerable GetPagedRequests(string term, int[] categories) + public SceneTimeRequestGenerator(SceneTimeSettings settings, IndexerCapabilities capabilities) { - var qc = new NameValueCollection - { - { "cata", "yes" }, - { "sec", "jax" } - }; - - var catList = Capabilities.Categories.MapTorznabCapsToTrackers(categories); - foreach (var cat in catList) - { - qc.Set($"c{cat}", "1"); - } - - if (term.IsNotNullOrWhiteSpace()) - { - qc.Set("search", term); - } - - if (Settings.FreeLeechOnly) - { - qc.Set("freeleech", "on"); - } - - var searchUrl = $"{Settings.BaseUrl.TrimEnd('/')}/browse.php?{qc.GetQueryString()}"; - - var request = new IndexerRequest(searchUrl, HttpAccept.Html); - - yield return request; + _settings = settings; + _capabilities = capabilities; } public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) { var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories)); + pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId)); return pageableRequests; } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) { var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories)); + pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId)); return pageableRequests; } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) { var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories)); + pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); return pageableRequests; } @@ -183,7 +158,7 @@ namespace NzbDrone.Core.Indexers.Definitions { var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories)); + pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); return pageableRequests; } @@ -192,11 +167,44 @@ namespace NzbDrone.Core.Indexers.Definitions { var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories)); + pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); return pageableRequests; } + private IEnumerable GetPagedRequests(string term, int[] categories, string imdbId = null) + { + var parameters = new NameValueCollection + { + { "cata", "yes" } + }; + + var catList = _capabilities.Categories.MapTorznabCapsToTrackers(categories); + foreach (var cat in catList) + { + parameters.Set($"c{cat}", "1"); + } + + if (imdbId.IsNotNullOrWhiteSpace()) + { + parameters.Set("imdb", imdbId); + } + + if (term.IsNotNullOrWhiteSpace()) + { + parameters.Set("search", term); + } + + if (_settings.FreeLeechOnly) + { + parameters.Set("freeleech", "on"); + } + + var searchUrl = $"{_settings.BaseUrl.TrimEnd('/')}/browse.php?{parameters.GetQueryString()}"; + + yield return new IndexerRequest(searchUrl, HttpAccept.Html); + } + public Func> GetCookies { get; set; } public Action, DateTime?> CookiesUpdater { get; set; } } @@ -225,8 +233,7 @@ namespace NzbDrone.Core.Indexers.Definitions return releaseInfos; // no results } - var headerColumns = table.QuerySelectorAll("tbody > tr > td.cat_Head") - .Select(x => x.TextContent).ToList(); + var headerColumns = table.QuerySelectorAll("tbody > tr > td.cat_Head").Select(x => x.TextContent).ToList(); var categoryIndex = headerColumns.FindIndex(x => x.Equals("Type")); var nameIndex = headerColumns.FindIndex(x => x.Equals("Name")); var sizeIndex = headerColumns.FindIndex(x => x.Equals("Size")); @@ -287,7 +294,7 @@ namespace NzbDrone.Core.Indexers.Definitions public class SceneTimeSettings : CookieTorrentBaseSettings { - [FieldDefinition(3, Label = "FreeLeech Only", Type = FieldType.Checkbox, HelpText = "Search Freeleech torrents only")] + [FieldDefinition(3, Label = "FreeLeech Only", Type = FieldType.Checkbox, HelpText = "Search FreeLeech torrents only")] public bool FreeLeechOnly { get; set; } } }