Notifications have real messages now

This commit is contained in:
Mark McDowall 2013-06-04 19:15:39 -07:00
parent 942679d4bd
commit 66bce4b51e
1 changed files with 12 additions and 3 deletions

View File

@ -9,6 +9,7 @@ using NzbDrone.Common.Messaging;
using NzbDrone.Common.Serializer; using NzbDrone.Common.Serializer;
using NzbDrone.Core.Download; using NzbDrone.Core.Download;
using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.Parser.Model;
using Omu.ValueInjecter; using Omu.ValueInjecter;
namespace NzbDrone.Core.Notifications namespace NzbDrone.Core.Notifications
@ -133,13 +134,21 @@ namespace NzbDrone.Core.Notifications
return instance; return instance;
} }
private string GetMessage(ParsedEpisodeInfo parsedEpisodeInfo)
{
return String.Format("{0} - {1}{2}",
parsedEpisodeInfo.SeriesTitle,
parsedEpisodeInfo.SeasonNumber,
String.Concat(parsedEpisodeInfo.EpisodeNumbers.Select(i => String.Format("x{0:00}", i))));
}
public void Handle(EpisodeGrabbedEvent message) public void Handle(EpisodeGrabbedEvent message)
{ {
All().Where(n => n.OnGrab) All().Where(n => n.OnGrab)
.ToList() .ToList()
.ForEach(notification => .ForEach(notification =>
notification.Instance notification.Instance
.OnGrab("Grabbed!") .OnGrab(GetMessage(message.Episode.ParsedEpisodeInfo))
); );
} }
@ -149,7 +158,7 @@ namespace NzbDrone.Core.Notifications
.ToList() .ToList()
.ForEach(notification => .ForEach(notification =>
notification.Instance notification.Instance
.OnDownload("Downloaded!", message.Series) .OnDownload(GetMessage(message.ParsedEpisodeInfo), message.Series)
); );
} }
@ -159,7 +168,7 @@ namespace NzbDrone.Core.Notifications
.ToList() .ToList()
.ForEach(notification => .ForEach(notification =>
notification.Instance notification.Instance
.OnDownload("Renamed!", message.Series) .OnDownload(message.Series.Title, message.Series)
); );
} }
} }