tedkulp/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2026-04-17 21:44:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: (IndexerSearch) Update isRss logic for new properties

Browse Source
This commit is contained in:
Qstick
2023-02-19 15:46:47 -06:00
parent af4961e3e6
commit dbc4989a95
7 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core/History/HistoryService.cs
View File

@@ -122,7 +122,7 @@ namespace NzbDrone.Core.History
{
Date = DateTime.UtcNow,
IndexerId = message.IndexerId,
EventType = message.Query.RssSearch ? HistoryEventType.IndexerRss : HistoryEventType.IndexerQuery,
EventType = message.Query.IsRssSearch ? HistoryEventType.IndexerRss : HistoryEventType.IndexerQuery,
Successful = message.QueryResult.Response?.StatusCode == HttpStatusCode.OK
};

8
src/NzbDrone.Core/IndexerSearch/Definitions/BookSearchCriteria.cs
View File

@@ -10,6 +10,12 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
public int? Year { get; set; }
public string Genre { get; set; }
public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && Author.IsNullOrWhiteSpace() && Title.IsNullOrWhiteSpace();
public override bool IsRssSearch =>
SearchTerm.IsNullOrWhiteSpace() &&
Author.IsNullOrWhiteSpace() &&
Title.IsNullOrWhiteSpace() &&
Publisher.IsNullOrWhiteSpace() &&
Genre.IsNullOrWhiteSpace() &&
!Year.HasValue;
}
}

9
src/NzbDrone.Core/IndexerSearch/Definitions/MovieSearchCriteria.cs
View File

@@ -13,7 +13,14 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
public int? Year { get; set; }
public string Genre { get; set; }
public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && ImdbId.IsNullOrWhiteSpace() && !TmdbId.HasValue && !TraktId.HasValue;
public override bool IsRssSearch =>
SearchTerm.IsNullOrWhiteSpace() &&
ImdbId.IsNullOrWhiteSpace() &&
Genre.IsNullOrWhiteSpace() &&
!TmdbId.HasValue &&
!TraktId.HasValue &&
!DoubanId.HasValue &&
!Year.HasValue;
public string FullImdbId => ParseUtil.GetFullImdbId(ImdbId);

9
src/NzbDrone.Core/IndexerSearch/Definitions/MusicSearchCriteria.cs
View File

@@ -11,6 +11,13 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
public string Track { get; set; }
public int? Year { get; set; }
public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && Album.IsNullOrWhiteSpace() && Artist.IsNullOrWhiteSpace() && Label.IsNullOrWhiteSpace();
public override bool IsRssSearch =>
SearchTerm.IsNullOrWhiteSpace() &&
Album.IsNullOrWhiteSpace() &&
Artist.IsNullOrWhiteSpace() &&
Label.IsNullOrWhiteSpace() &&
Genre.IsNullOrWhiteSpace() &&
Track.IsNullOrWhiteSpace() &&
!Year.HasValue;
}
}

2
src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs
View File

@@ -24,7 +24,7 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
public virtual string SearchQuery => $"Term: [{SearchTerm}]";
public virtual bool RssSearch => SearchTerm.IsNullOrWhiteSpace();
public virtual bool IsRssSearch => SearchTerm.IsNullOrWhiteSpace();
public string SanitizedSearchTerm => GetSanitizedTerm(SearchTerm);

12
src/NzbDrone.Core/IndexerSearch/Definitions/TvSearchCriteria.cs
View File

@@ -26,7 +26,17 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
public string FullImdbId => ParseUtil.GetFullImdbId(ImdbId);
public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && ImdbId.IsNullOrWhiteSpace() && !TvdbId.HasValue && !RId.HasValue && !TraktId.HasValue && !TvMazeId.HasValue;
public override bool IsRssSearch =>
SearchTerm.IsNullOrWhiteSpace() &&
Episode.IsNullOrWhiteSpace() &&
ImdbId.IsNullOrWhiteSpace() &&
!Season.HasValue &&
!TvdbId.HasValue &&
!RId.HasValue &&
!TraktId.HasValue &&
!TvMazeId.HasValue &&
!TmdbId.HasValue &&
!DoubanId.HasValue;
public override string SearchQuery
{

4
src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs
View File

@@ -129,7 +129,7 @@ namespace NzbDrone.Core.Indexers.Definitions
{
var pageableRequests = new IndexerPageableRequestChain();
pageableRequests.Add(searchCriteria.RssSearch
pageableRequests.Add(searchCriteria.IsRssSearch
? GetRssRequest()
: GetSearchRequests(searchCriteria.SanitizedTvSearchString));
@@ -147,7 +147,7 @@ namespace NzbDrone.Core.Indexers.Definitions
{
var pageableRequests = new IndexerPageableRequestChain();
pageableRequests.Add(searchCriteria.RssSearch
pageableRequests.Add(searchCriteria.IsRssSearch
? GetRssRequest()
: GetSearchRequests(searchCriteria.SanitizedSearchTerm));