cleaned up parsing logic and structure.

This commit is contained in:
kay.one 2013-04-14 18:41:39 -07:00
commit 6e88f55a54
120 changed files with 2149 additions and 3064 deletions

View file

@ -6,13 +6,15 @@ using NzbDrone.Common.Eventing;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Model;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Download
{
public interface IDownloadService
{
bool DownloadReport(IndexerParseResult parseResult);
bool DownloadReport(RemoteEpisode episode);
}
public class DownloadService : IDownloadService
@ -32,31 +34,31 @@ namespace NzbDrone.Core.Download
_logger = logger;
}
public bool DownloadReport(IndexerParseResult parseResult)
public bool DownloadReport(RemoteEpisode episode)
{
var downloadTitle = parseResult.OriginalString;
var downloadTitle = episode.Report.Title;
if (!_configService.DownloadClientUseSceneName)
{
downloadTitle = parseResult.GetDownloadTitle();
downloadTitle = episode.GetDownloadTitle();
}
var provider = _downloadClientProvider.GetDownloadClient();
var recentEpisode = ContainsRecentEpisode(parseResult);
var recentEpisode = ContainsRecentEpisode(episode);
bool success = provider.DownloadNzb(parseResult.NzbUrl, downloadTitle, recentEpisode);
bool success = provider.DownloadNzb(episode.Report.NzbUrl, downloadTitle, recentEpisode);
if (success)
{
_logger.Info("Report sent to download client. {0}", downloadTitle);
_eventAggregator.Publish(new EpisodeGrabbedEvent(parseResult));
_eventAggregator.Publish(new EpisodeGrabbedEvent(episode));
}
return success;
}
private static bool ContainsRecentEpisode(IndexerParseResult parseResult)
private static bool ContainsRecentEpisode(RemoteEpisode episode)
{
return parseResult.Episodes.Any(e => e.AirDate >= DateTime.Today.AddDays(-7));
return episode.Episodes.Any(e => e.AirDate >= DateTime.Today.AddDays(-7));
}
}
}