Backup_Repos/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr synced 2026-04-14 08:50:48 +02:00
Code Issues Projects Releases Wiki Activity

Fixed: Request binding from Sonarr due to string Ep values

Browse source
This commit is contained in:
Qstick 2021-02-23 23:20:29 -05:00
parent deded6d073
commit 428c9c034c
6 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/NzbDrone.Core/IndexerSearch/Definitions/TvSearchCriteria.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Globalization;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Parser;
namespace NzbDrone.Core.IndexerSearch.Definitions
@ -7,7 +8,7 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
public class TvSearchCriteria : SearchCriteriaBase
{
public int? Season { get; set; }
public int? Ep { get; set; }
public string Episode { get; set; }
public string ImdbId { get; set; }
public int? TvdbId { get; set; }
@ -25,11 +26,11 @@ private string GetEpisodeSearchString()
}
string episodeString;
if (DateTime.TryParseExact(string.Format("{0} {1}", Season, Ep), "yyyy MM/dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out var showDate))
if (DateTime.TryParseExact(string.Format("{0} {1}", Season, Episode), "yyyy MM/dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out var showDate))
{
episodeString = showDate.ToString("yyyy.MM.dd");
}
else if (!Ep.HasValue || Ep == 0)
else if (Episode.IsNullOrWhiteSpace())
{
episodeString = string.Format("S{0:00}", Season);
}
@ -37,11 +38,11 @@ private string GetEpisodeSearchString()
{
try
{
episodeString = string.Format("S{0:00}E{1:00}", Season, Ep);
episodeString = string.Format("S{0:00}E{1:00}", Season, ParseUtil.CoerceInt(Episode));
}
catch (FormatException)
{
episodeString = string.Format("S{0:00}E{1}", Season, Ep);
episodeString = string.Format("S{0:00}E{1}", Season, Episode);
}
}

2
src/NzbDrone.Core/IndexerSearch/NewznabRequest.cs
View file

@ -16,7 +16,7 @@ public class NewznabRequest
public int? traktid { get; set; }
public int? tvdbid { get; set; }
public int? season { get; set; }
public int? ep { get; set; }
public string ep { get; set; }
public string album { get; set; }
public string artist { get; set; }
public string label { get; set; }

2
src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
View file

@ -79,7 +79,7 @@ private NewznabResults TvSearch(NewznabRequest request, List<int> indexerIds, bo
var searchSpec = Get<TvSearchCriteria>(request, indexerIds, interactiveSearch);
searchSpec.Season = request.season;
searchSpec.Ep = request.ep;
searchSpec.Episode = request.ep;
searchSpec.TvdbId = request.tvdbid;
searchSpec.ImdbId = request.imdbid;
searchSpec.TraktId = request.traktid;

7
src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Core.IndexerSearch.Definitions;
@ -68,14 +69,14 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit
}
// If only the season/episode is searched for then change format to match expected format
if (searchCriteria.Season > 0 && searchCriteria.Ep == null)
if (searchCriteria.Season > 0 && searchCriteria.Episode == null)
{
parameters.Name = string.Format("Season {0}%", searchCriteria.Season.Value);
parameters.Category = "Season";
}
else if (searchCriteria.Season > 0 && searchCriteria.Ep.Value > 0)
else if (searchCriteria.Season > 0 && int.Parse(searchCriteria.Episode) > 0)
{
parameters.Name = string.Format("S{0:00}E{1:00}", searchCriteria.Season.Value, searchCriteria.Ep.Value);
parameters.Name = string.Format("S{0:00}E{1:00}", searchCriteria.Season.Value, int.Parse(searchCriteria.Episode));
parameters.Category = "Episode";
}

2
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
View file

@ -74,7 +74,7 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit
var variables = GetQueryVariableDefaults(searchCriteria);
variables[".Query.Series"] = null;
variables[".Query.Ep"] = searchCriteria.Ep;
variables[".Query.Ep"] = searchCriteria.Episode;
variables[".Query.Season"] = searchCriteria.Season;
variables[".Query.IMDBID"] = searchCriteria.ImdbId;
variables[".Query.IMDBIDShort"] = searchCriteria.ImdbId?.Replace("tt", "") ?? null;

4
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs
View file

@ -92,9 +92,9 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit
parameters += string.Format("&season={0}", searchCriteria.Season);
}
if (searchCriteria.Ep.HasValue && capabilities.TvSearchEpAvailable)
if (searchCriteria.Episode.IsNotNullOrWhiteSpace() && capabilities.TvSearchEpAvailable)
{
parameters += string.Format("&ep={0}", searchCriteria.Ep);
parameters += string.Format("&ep={0}", searchCriteria.Episode);
}
if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())