From a338b9fee5dd19e17a8e92179914432033cf3671 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 26 Apr 2011 08:26:01 -0700 Subject: [PATCH] SabTitle will return Quality in square brackets '[' or ']' --- NzbDrone.Core.Test/SabControllerTest.cs | 12 ++++++------ NzbDrone.Core/Providers/SabProvider.cs | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NzbDrone.Core.Test/SabControllerTest.cs b/NzbDrone.Core.Test/SabControllerTest.cs index 06ada43fe..f84b12589 100644 --- a/NzbDrone.Core.Test/SabControllerTest.cs +++ b/NzbDrone.Core.Test/SabControllerTest.cs @@ -201,12 +201,12 @@ namespace NzbDrone.Core.Test } [Test] - [Row(1, new[] { 2 }, "My Episode Title", QualityTypes.DVD, false, "My Series Name - 1x2 - My Episode Title DVD")] - [Row(1, new[] { 2 }, "My Episode Title", QualityTypes.DVD, true, "My Series Name - 1x2 - My Episode Title DVD [Proper]")] - [Row(1, new[] { 2 }, "", QualityTypes.DVD, true, "My Series Name - 1x2 - DVD [Proper]")] - [Row(1, new[] { 2, 4 }, "My Episode Title", QualityTypes.HDTV, false, "My Series Name - 1x2-1x4 - My Episode Title HDTV")] - [Row(1, new[] { 2, 4 }, "My Episode Title", QualityTypes.HDTV, true, "My Series Name - 1x2-1x4 - My Episode Title HDTV [Proper]")] - [Row(1, new[] { 2, 4 }, "", QualityTypes.HDTV, true, "My Series Name - 1x2-1x4 - HDTV [Proper]")] + [Row(1, new[] { 2 }, "My Episode Title", QualityTypes.DVD, false, "My Series Name - 1x2 - My Episode Title [DVD]")] + [Row(1, new[] { 2 }, "My Episode Title", QualityTypes.DVD, true, "My Series Name - 1x2 - My Episode Title [DVD] [Proper]")] + [Row(1, new[] { 2 }, "", QualityTypes.DVD, true, "My Series Name - 1x2 - [DVD] [Proper]")] + [Row(1, new[] { 2, 4 }, "My Episode Title", QualityTypes.HDTV, false, "My Series Name - 1x2-1x4 - My Episode Title [HDTV]")] + [Row(1, new[] { 2, 4 }, "My Episode Title", QualityTypes.HDTV, true, "My Series Name - 1x2-1x4 - My Episode Title [HDTV] [Proper]")] + [Row(1, new[] { 2, 4 }, "", QualityTypes.HDTV, true, "My Series Name - 1x2-1x4 - [HDTV] [Proper]")] public void sab_title(int seasons, int[] episodes, string title, QualityTypes quality, bool proper, string excpected) { var mocker = new AutoMoqer(); diff --git a/NzbDrone.Core/Providers/SabProvider.cs b/NzbDrone.Core/Providers/SabProvider.cs index 8fdc3175c..d58e2335e 100644 --- a/NzbDrone.Core/Providers/SabProvider.cs +++ b/NzbDrone.Core/Providers/SabProvider.cs @@ -29,9 +29,9 @@ namespace NzbDrone.Core.Providers public virtual bool AddByUrl(string url, string title) { const string mode = "addurl"; - string cat = _configProvider.GetValue("SabTvCategory", String.Empty, true); + string cat = _configProvider.SabTvCategory; //string cat = "tv"; - string priority = _configProvider.GetValue("SabTvPriority", String.Empty, false); + string priority = _configProvider.SabTvPriority; string name = url.Replace("&", "%26"); string nzbName = HttpUtility.UrlEncode(title); @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Providers cat, nzbName); string request = GetSabRequest(action); - Logger.Debug("Adding report [{0}] to the queue.", nzbName); + Logger.Info("Adding report [{0}] to the queue.", title); string response = _httpProvider.DownloadString(request).Replace("\n", String.Empty); Logger.Debug("Queue Repsonse: [{0}]", response); @@ -130,7 +130,7 @@ namespace NzbDrone.Core.Providers var epNumberString = String.Join("-", episodeString); - var result = String.Format("{0} - {1} - {2} {3}", parseResult.FolderName, epNumberString, parseResult.EpisodeTitle, parseResult.Quality); + var result = String.Format("{0} - {1} - {2} [{3}]", parseResult.FolderName, epNumberString, parseResult.EpisodeTitle, parseResult.Quality); if (parseResult.Proper) {