diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs index ead495aaf..444dde20e 100644 --- a/src/NzbDrone.Core/Notifications/NotificationService.cs +++ b/src/NzbDrone.Core/Notifications/NotificationService.cs @@ -26,6 +26,21 @@ namespace NzbDrone.Core.Notifications private string GetMessage(Series series, List episodes, QualityModel quality) { + var qualityString = quality.Quality.ToString(); + + if (quality.Revision.Version > 0) + { + if (series.SeriesType == SeriesTypes.Anime) + { + qualityString += " v" + quality.Revision.Version; + } + + else + { + qualityString += " Proper"; + } + } + if (series.SeriesType == SeriesTypes.Daily) { var episode = episodes.First(); @@ -34,7 +49,7 @@ namespace NzbDrone.Core.Notifications series.Title, episode.AirDate, episode.Title, - quality); + qualityString); } var episodeNumbers = String.Concat(episodes.Select(e => e.EpisodeNumber) @@ -47,7 +62,7 @@ namespace NzbDrone.Core.Notifications episodes.First().SeasonNumber, episodeNumbers, episodeTitles, - quality); + qualityString); } public void Handle(EpisodeGrabbedEvent message) diff --git a/src/NzbDrone.Core/Qualities/Revision.cs b/src/NzbDrone.Core/Qualities/Revision.cs index 59c8945ca..bdf524152 100644 --- a/src/NzbDrone.Core/Qualities/Revision.cs +++ b/src/NzbDrone.Core/Qualities/Revision.cs @@ -38,6 +38,7 @@ namespace NzbDrone.Core.Qualities public override string ToString() { var sb = new StringBuilder(); + sb.AppendFormat("v{0}", Version); if (Real > 0) @@ -73,32 +74,32 @@ namespace NzbDrone.Core.Qualities public static bool operator >(Revision left, Revision right) { - if (left == null) return false; - if (right == null) return true; + if (ReferenceEquals(null, left)) return false; + if (ReferenceEquals(null, right)) return true; return left.CompareTo(right) > 0; } public static bool operator <(Revision left, Revision right) { - if (left == null) return true; - if (right == null) return false; + if (ReferenceEquals(null, left)) return true; + if (ReferenceEquals(null, right)) return false; return left.CompareTo(right) < 0; } public static bool operator >=(Revision left, Revision right) { - if (left == null) return false; - if (right == null) return true; + if (ReferenceEquals(null, left)) return false; + if (ReferenceEquals(null, right)) return true; return left.CompareTo(right) >= 0; } public static bool operator <=(Revision left, Revision right) { - if (left == null) return true; - if (right == null) return false; + if (ReferenceEquals(null, left)) return true; + if (ReferenceEquals(null, right)) return false; return left.CompareTo(right) <= 0; }