updated history table

This commit is contained in:
kay.one 2013-06-08 23:20:38 -07:00
commit ca71025bca
13 changed files with 139 additions and 57 deletions

View file

@ -5,6 +5,7 @@ using NzbDrone.Common;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Tv;
@ -18,6 +19,7 @@ namespace NzbDrone.Core.MediaFiles
private readonly IMoveEpisodeFiles _episodeFileMover;
private readonly IParsingService _parsingService;
private readonly IConfigService _configService;
private readonly IMessageAggregator _messageAggregator;
private readonly Logger _logger;
public DownloadedEpisodesImportService(IDiskProvider diskProvider,
@ -26,6 +28,7 @@ namespace NzbDrone.Core.MediaFiles
IMoveEpisodeFiles episodeFileMover,
IParsingService parsingService,
IConfigService configService,
IMessageAggregator messageAggregator,
Logger logger)
{
_diskProvider = diskProvider;
@ -34,10 +37,11 @@ namespace NzbDrone.Core.MediaFiles
_episodeFileMover = episodeFileMover;
_parsingService = parsingService;
_configService = configService;
_messageAggregator = messageAggregator;
_logger = logger;
}
public void ProcessDownloadedEpiosdesFolder()
public void ProcessDownloadedEpisodesFolder()
{
//TODO: We should also process the download client's category folder
var downloadedEpisodesFolder = _configService.DownloadedEpisodesFolder;
@ -135,11 +139,13 @@ namespace NzbDrone.Core.MediaFiles
{
_episodeFileMover.MoveEpisodeFile(episodeFile, true);
}
_messageAggregator.PublishEvent(new EpisodeImportedEvent(episodeFile));
}
public void Execute(DownloadedEpisodesScanCommand message)
{
ProcessDownloadedEpiosdesFolder();
ProcessDownloadedEpisodesFolder();
}
}
}

View file

@ -0,0 +1,14 @@
using NzbDrone.Common.Messaging;
namespace NzbDrone.Core.MediaFiles.Events
{
public class EpisodeImportedEvent:IEvent
{
public EpisodeFile EpisodeFile { get; private set; }
public EpisodeImportedEvent(EpisodeFile episodeFile)
{
EpisodeFile = episodeFile;
}
}
}

View file

@ -9,7 +9,6 @@ namespace NzbDrone.Core.MediaFiles
{
EpisodeFile GetFileByPath(string path);
List<EpisodeFile> GetFilesBySeries(int seriesId);
List<EpisodeFile> GetFilesBySeason(int seriesId, int seasonNumber);
bool Exists(string path);
}
@ -37,10 +36,5 @@ namespace NzbDrone.Core.MediaFiles
return Query.Where(c => c.SeriesId == seriesId).ToList();
}
public List<EpisodeFile> GetFilesBySeason(int seriesId, int seasonNumber)
{
return Query.Where(c => c.SeriesId == seriesId && c.SeasonNumber == seasonNumber).ToList();
}
}
}

View file

@ -17,7 +17,6 @@ namespace NzbDrone.Core.MediaFiles
bool Exists(string path);
EpisodeFile GetFileByPath(string path);
List<EpisodeFile> GetFilesBySeries(int seriesId);
List<EpisodeFile> GetFilesBySeason(int seriesId, int seasonNumber);
}
public class MediaFileService : IMediaFileService, IHandleAsync<SeriesDeletedEvent>
@ -68,11 +67,6 @@ namespace NzbDrone.Core.MediaFiles
return _mediaFileRepository.GetFilesBySeries(seriesId);
}
public List<EpisodeFile> GetFilesBySeason(int seriesId, int seasonNumber)
{
return _mediaFileRepository.GetFilesBySeason(seriesId, seasonNumber);
}
public void HandleAsync(SeriesDeletedEvent message)
{
var files = GetFilesBySeries(message.Series.Id);