Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed un-needed call from Episode Search. 

InventoryProvider.IsAcceptableSize will now handle daily series properly.
This commit is contained in:
Mark McDowall 2011-11-30 21:08:36 -08:00
parent e01be46209
commit 1b0cdf922e
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs
View File

@ -364,5 +364,28 @@ namespace NzbDrone.Core.Test.ProviderTests
//Assert //Assert
result.Should().BeTrue(); result.Should().BeTrue();
} }
[Test]
public void IsAcceptableSize_should_treat_daily_series_as_single_episode()
{
parseResultSingle.Series = series60minutes;
parseResultSingle.Size = 300.Megabytes();
parseResultSingle.AirDate = DateTime.Today;
parseResultSingle.EpisodeNumbers = null;
qualityType.MaxSize = (int)600.Megabytes();
Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
Mocker.GetMock<EpisodeProvider>().Setup(
s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
.Returns(true);
//Act
bool result = Mocker.Resolve<InventoryProvider>().IsAcceptableSize(parseResultSingle);
//Assert
result.Should().BeTrue();
}
} }
} }

5
NzbDrone.Core/Providers/InventoryProvider.cs
View File

@ -156,12 +156,13 @@ namespace NzbDrone.Core.Providers
//Multiply maxSize by Series.Runtime //Multiply maxSize by Series.Runtime
maxSize = maxSize * series.Runtime; maxSize = maxSize * series.Runtime;
//Multiply maxSize by the number of episodes parsed //Multiply maxSize by the number of episodes parsed (if EpisodeNumbers is null it will be treated as a single episode)
if (parseResult.EpisodeNumbers != null)
maxSize = maxSize * parseResult.EpisodeNumbers.Count; maxSize = maxSize * parseResult.EpisodeNumbers.Count;
//Check if there was only one episode parsed //Check if there was only one episode parsed
//and it is the first or last episode of the season //and it is the first or last episode of the season
if (parseResult.EpisodeNumbers.Count == 1 && if (parseResult.EpisodeNumbers != null && parseResult.EpisodeNumbers.Count == 1 &&
_episodeProvider.IsFirstOrLastEpisodeOfSeason(series.SeriesId, _episodeProvider.IsFirstOrLastEpisodeOfSeason(series.SeriesId,
parseResult.SeasonNumber, parseResult.EpisodeNumbers[0])) parseResult.SeasonNumber, parseResult.EpisodeNumbers[0]))
{ {

8
NzbDrone.Core/Providers/SearchProvider.cs
View File

@ -131,23 +131,21 @@ namespace NzbDrone.Core.Providers
notification.CurrentMessage = "Searching for " + episode; notification.CurrentMessage = "Searching for " + episode;
var series = _seriesProvider.GetSeries(episode.SeriesId);
if (episode.Series.IsDaily && !episode.AirDate.HasValue) if (episode.Series.IsDaily && !episode.AirDate.HasValue)
{ {
Logger.Warn("AirDate is not Valid for: {0}", episode); Logger.Warn("AirDate is not Valid for: {0}", episode);
return false; return false;
} }
var reports = PerformSearch(notification, series, episode.SeasonNumber, new List<Episode> { episode }); var reports = PerformSearch(notification, episode.Series, episode.SeasonNumber, new List<Episode> { episode });
Logger.Debug("Finished searching all indexers. Total {0}", reports.Count); Logger.Debug("Finished searching all indexers. Total {0}", reports.Count);
notification.CurrentMessage = "Processing search results"; notification.CurrentMessage = "Processing search results";
if (!series.IsDaily && ProcessSearchResults(notification, reports, series, episode.SeasonNumber, episode.EpisodeNumber).Count == 1) if (!episode.Series.IsDaily && ProcessSearchResults(notification, reports, episode.Series, episode.SeasonNumber, episode.EpisodeNumber).Count == 1)
return true; return true;
if (series.IsDaily && ProcessSearchResults(notification, reports, series, episode.AirDate.Value)) if (episode.Series.IsDaily && ProcessSearchResults(notification, reports, episode.Series, episode.AirDate.Value))
return true; return true;
Logger.Warn("Unable to find {0} in any of indexers.", episode); Logger.Warn("Unable to find {0} in any of indexers.", episode);