From b4012e07527ac96bba19c2b4dda7fa73d0c72e1a Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 2 Jun 2014 23:31:41 -0700 Subject: [PATCH] Fixed: Quality in notifications when file name doesn't contain the quality --- src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs | 2 +- src/NzbDrone.Core/Notifications/NotificationService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs index aa8d13a37..0b4a71cf2 100644 --- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Qualities; @@ -105,6 +104,7 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("Sonny.With.a.Chance.S02E15.720p.WEB-DL.DD5.1.H.264-SURFER", false)] [TestCase("S07E23 - [WEBDL].mkv ", false)] [TestCase("Fringe S04E22 720p WEB-DL DD5.1 H264-EbP.mkv", false)] + [TestCase("House.S04.720p.Web-Dl.Dd5.1.h264-P2PACK", false)] public void should_parse_webdl720p_quality(string title, bool proper) { ParseAndVerifyQuality(title, Quality.WEBDL720p, proper); diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs index e52dd1fac..ead495aaf 100644 --- a/src/NzbDrone.Core/Notifications/NotificationService.cs +++ b/src/NzbDrone.Core/Notifications/NotificationService.cs @@ -42,7 +42,7 @@ namespace NzbDrone.Core.Notifications var episodeTitles = String.Join(" + ", episodes.Select(e => e.Title)); - return String.Format("{0} - {1}{2} - {3} {4}", + return String.Format("{0} - {1}{2} - {3} [{4}]", series.Title, episodes.First().SeasonNumber, episodeNumbers, @@ -71,7 +71,7 @@ namespace NzbDrone.Core.Notifications public void Handle(EpisodeDownloadedEvent message) { var downloadMessage = new DownloadMessage(); - downloadMessage.Message = GetMessage(message.Episode.Series, message.Episode.Episodes, message.Episode.ParsedEpisodeInfo.Quality); + downloadMessage.Message = GetMessage(message.Episode.Series, message.Episode.Episodes, message.Episode.Quality); downloadMessage.Series = message.Episode.Series; downloadMessage.EpisodeFile = message.EpisodeFile; downloadMessage.OldFiles = message.OldFiles;