From 34f7b9ca7dde3b3828ac079ce3b6d1e8a721cfe4 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 8 May 2011 14:49:15 -0700 Subject: [PATCH 1/3] removed some warnings, logging tweaks --- NzbDrone.Core.Test/MediaFileProviderTests.cs | 2 -- .../XbmcNotificationProvider.cs | 22 +++++++------------ .../Providers/Indexer/IndexerProviderBase.cs | 1 + NzbDrone.Core/Providers/SabProvider.cs | 4 +++- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs index d6764f6ca..becfc86b0 100644 --- a/NzbDrone.Core.Test/MediaFileProviderTests.cs +++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs @@ -135,8 +135,6 @@ namespace NzbDrone.Core.Test //Constants const string fileName = @"WEEDS.S03E01.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi"; - const int seasonNumber = 3; - const int episodeNumner = 1; const int size = 12345; //Fakes diff --git a/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs b/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs index 9e84f9fcb..bcb2bd369 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs @@ -1,23 +1,17 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NLog; -using NzbDrone.Core.Helpers; using NzbDrone.Core.Providers.Core; namespace NzbDrone.Core.Providers.ExternalNotification { public class XbmcNotificationProvider : ExternalNotificationProviderBase { - private readonly Logger _logger; private readonly XbmcProvider _xbmcProvider; public XbmcNotificationProvider(ConfigProvider configProvider, XbmcProvider xbmcProvider, - ExternalNotificationProvider externalNotificationProvider) : base(configProvider, externalNotificationProvider) + ExternalNotificationProvider externalNotificationProvider) + : base(configProvider, externalNotificationProvider) { _xbmcProvider = xbmcProvider; - _logger = LogManager.GetLogger(GetType().ToString()); } public override string Name @@ -27,13 +21,13 @@ namespace NzbDrone.Core.Providers.ExternalNotification public override void OnGrab(string message) { - var header = "NzbDrone [TV] - Grabbed"; + const string header = "NzbDrone [TV] - Grabbed"; if (Convert.ToBoolean(_configProvider.GetValue("XbmcEnabled", false, true))) { if (Convert.ToBoolean(_configProvider.GetValue("XbmcNotifyOnGrab", false, true))) { - _logger.Trace("Sending Notifcation to XBMC"); + _logger.Trace("Sending Notification to XBMC"); _xbmcProvider.Notify(header, message); return; } @@ -45,13 +39,13 @@ namespace NzbDrone.Core.Providers.ExternalNotification public override void OnDownload(string message, int seriesId) { - var header = "NzbDrone [TV] - Downloaded"; + const string header = "NzbDrone [TV] - Downloaded"; if (Convert.ToBoolean(_configProvider.GetValue("XbmcEnabled", false, true))) { if (Convert.ToBoolean(_configProvider.GetValue("XbmcNotifyOnDownload", false, true))) { - _logger.Trace("Sending Notifcation to XBMC"); + _logger.Trace("Sending Notification to XBMC"); _xbmcProvider.Notify(header, message); } @@ -73,11 +67,11 @@ namespace NzbDrone.Core.Providers.ExternalNotification public override void OnRename(string message, int seriesId) { - var header = "NzbDrone [TV] - Renamed"; + const string header = "NzbDrone [TV] - Renamed"; if (Convert.ToBoolean(_configProvider.GetValue("XbmcNotifyOnRename", false, true))) { - _logger.Trace("Sending Notifcation to XBMC"); + _logger.Trace("Sending Notification to XBMC"); _xbmcProvider.Notify(header, message); } diff --git a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs index 5c8107e49..12762290d 100644 --- a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs +++ b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs @@ -180,6 +180,7 @@ namespace NzbDrone.Core.Providers.Indexer if (!_sabProvider.AddByUrl(NzbDownloadUrl(feedItem), sabTitle)) { + _logger.Warn("Unable to add item to SAB queue. {0} {1}", NzbDownloadUrl(feedItem), sabTitle); return; } } diff --git a/NzbDrone.Core/Providers/SabProvider.cs b/NzbDrone.Core/Providers/SabProvider.cs index d58e2335e..64dd10dde 100644 --- a/NzbDrone.Core/Providers/SabProvider.cs +++ b/NzbDrone.Core/Providers/SabProvider.cs @@ -42,11 +42,13 @@ namespace NzbDrone.Core.Providers Logger.Info("Adding report [{0}] to the queue.", title); string response = _httpProvider.DownloadString(request).Replace("\n", String.Empty); - Logger.Debug("Queue Repsonse: [{0}]", response); + Logger.Debug("Queue Response: [{0}]", response); if (response == "ok") return true; + Logger.Warn("SAB returned unexpected response '{0}'", response); + return false; } From 343c303bc62137891b0eab1b3830fc75dd2a79bc Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 8 May 2011 15:33:46 -0700 Subject: [PATCH 2/3] minor cleanup in sabprovider, sabprovider tests --- NzbDrone.Core.Test/SabControllerTest.cs | 128 +++++++++++------------- NzbDrone.Core/Providers/SabProvider.cs | 53 +++------- 2 files changed, 69 insertions(+), 112 deletions(-) diff --git a/NzbDrone.Core.Test/SabControllerTest.cs b/NzbDrone.Core.Test/SabControllerTest.cs index f84b12589..44d8a538c 100644 --- a/NzbDrone.Core.Test/SabControllerTest.cs +++ b/NzbDrone.Core.Test/SabControllerTest.cs @@ -32,22 +32,22 @@ namespace NzbDrone.Core.Test var mocker = new AutoMoqer(); var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)) + fakeConfig.SetupGet(c => c.SabHost) .Returns(sabHost); - fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)) + fakeConfig.SetupGet(c => c.SabPort) .Returns(sabPort); - fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)) + fakeConfig.SetupGet(c => c.SabApiKey) .Returns(apikey); - fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)) + fakeConfig.SetupGet(c => c.SabUsername) .Returns(username); - fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)) + fakeConfig.SetupGet(c => c.SabPassword) .Returns(password); - fakeConfig.Setup(c => c.GetValue("SabTvPriority", String.Empty, false)) + fakeConfig.SetupGet(c => c.SabTvPriority) .Returns(priority); - fakeConfig.Setup(c => c.GetValue("SabTvCategory", String.Empty, true)) + fakeConfig.SetupGet(c => c.SabTvCategory) .Returns(category); - mocker.GetMock() + mocker.GetMock(MockBehavior.Strict) .Setup( s => s.DownloadString( @@ -59,45 +59,25 @@ namespace NzbDrone.Core.Test "http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an Nzb"); //Assert - Assert.AreEqual(true, result); + Assert.IsTrue(result); } [Test] public void AddByUrlError() { //Setup - string sabHost = "192.168.5.55"; - string sabPort = "2222"; - string apikey = "5c770e3197e4fe763423ee7c392c25d1"; - string username = "admin"; - string password = "pass"; - string priority = "0"; - string category = "tv"; - var mocker = new AutoMoqer(); - var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); - fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); - fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); - fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); - fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); - fakeConfig.Setup(c => c.GetValue("SabTvPriority", String.Empty, false)).Returns(priority); - fakeConfig.Setup(c => c.GetValue("SabTvCategory", String.Empty, true)).Returns(category); - mocker.GetMock() - .Setup( - s => - s.DownloadString( - "http://192.168.5.55:2222/api?mode=addurl&name=http://www.nzbclub.com/nzb_download.aspx?mid=1950232&priority=0&cat=tv&nzbname=This+is+an+Nzb&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) + .Setup(s => s.DownloadString(It.IsAny())) .Returns("error"); //Act - bool result = mocker.Resolve().AddByUrl( - "http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an Nzb"); + var sabProvider = mocker.Resolve(); + var result = sabProvider.AddByUrl("http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an nzb"); //Assert - Assert.AreEqual(false, result); + Assert.IsFalse(result); } [Test] @@ -113,24 +93,26 @@ namespace NzbDrone.Core.Test var mocker = new AutoMoqer(); var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); - fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); - fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); - fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); - fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); + fakeConfig.SetupGet(c => c.SabHost) + .Returns(sabHost); + fakeConfig.SetupGet(c => c.SabPort) + .Returns(sabPort); + fakeConfig.SetupGet(c => c.SabApiKey) + .Returns(apikey); + fakeConfig.SetupGet(c => c.SabUsername) + .Returns(username); + fakeConfig.SetupGet(c => c.SabPassword) + .Returns(password); - mocker.GetMock() - .Setup( - s => - s.DownloadString( - "http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) - .Returns(new StreamReader(@".\Files\Queue.xml").ReadToEnd()); + mocker.GetMock(MockBehavior.Strict) + .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) + .Returns(File.ReadAllText(@".\Files\Queue.xml")); //Act bool result = mocker.Resolve().IsInQueue("Ubuntu Test"); //Assert - Assert.AreEqual(true, result); + Assert.IsTrue(result); } [Test] @@ -146,27 +128,30 @@ namespace NzbDrone.Core.Test var mocker = new AutoMoqer(); var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); - fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); - fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); - fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); - fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); + fakeConfig.SetupGet(c => c.SabHost) + .Returns(sabHost); + fakeConfig.SetupGet(c => c.SabPort) + .Returns(sabPort); + fakeConfig.SetupGet(c => c.SabApiKey) + .Returns(apikey); + fakeConfig.SetupGet(c => c.SabUsername) + .Returns(username); + fakeConfig.SetupGet(c => c.SabPassword) + .Returns(password); - mocker.GetMock() - .Setup( - s => - s.DownloadString( - "http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) - .Returns(new StreamReader(@".\Files\QueueEmpty.xml").ReadToEnd()); + mocker.GetMock(MockBehavior.Strict) + .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) + .Returns(File.ReadAllText(@".\Files\QueueEmpty.xml")); //Act bool result = mocker.Resolve().IsInQueue(String.Empty); //Assert - Assert.AreEqual(false, result); + Assert.IsFalse(result); } [Test] + [ExpectedException(typeof(ApplicationException), Message = "API Key Incorrect")] public void IsInQueue_False_Error() { //Setup @@ -179,25 +164,24 @@ namespace NzbDrone.Core.Test var mocker = new AutoMoqer(); var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); - fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); - fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); - fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); - fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); + fakeConfig.SetupGet(c => c.SabHost) + .Returns(sabHost); + fakeConfig.SetupGet(c => c.SabPort) + .Returns(sabPort); + fakeConfig.SetupGet(c => c.SabApiKey) + .Returns(apikey); + fakeConfig.SetupGet(c => c.SabUsername) + .Returns(username); + fakeConfig.SetupGet(c => c.SabPassword) + .Returns(password); - mocker.GetMock() - .Setup( - s => - s.DownloadString( - "http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) - .Returns(new StreamReader(@".\Files\QueueError.xml").ReadToEnd()); + mocker.GetMock(MockBehavior.Strict) + .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) + .Returns(File.ReadAllText(@".\Files\QueueError.xml")); //Act - bool result = mocker.Resolve().IsInQueue(String.Empty); - - //Assert - Assert.AreEqual(false, result); + mocker.Resolve().IsInQueue(String.Empty); } [Test] diff --git a/NzbDrone.Core/Providers/SabProvider.cs b/NzbDrone.Core/Providers/SabProvider.cs index 64dd10dde..acf7dbe0b 100644 --- a/NzbDrone.Core/Providers/SabProvider.cs +++ b/NzbDrone.Core/Providers/SabProvider.cs @@ -28,15 +28,13 @@ namespace NzbDrone.Core.Providers public virtual bool AddByUrl(string url, string title) { - const string mode = "addurl"; string cat = _configProvider.SabTvCategory; - //string cat = "tv"; string priority = _configProvider.SabTvPriority; string name = url.Replace("&", "%26"); string nzbName = HttpUtility.UrlEncode(title); - string action = string.Format("mode={0}&name={1}&priority={2}&cat={3}&nzbname={4}", mode, name, priority, - cat, nzbName); + string action = string.Format("mode=addurl&name={0}&priority={1}&cat={2}&nzbname={3}", + name, priority, cat, nzbName); string request = GetSabRequest(action); Logger.Info("Adding report [{0}] to the queue.", title); @@ -62,11 +60,13 @@ namespace NzbDrone.Core.Providers //If an Error Occurred, return) if (xDoc.Descendants("error").Count() != 0) - return false; + throw new ApplicationException(xDoc.Descendants("error").FirstOrDefault().Value); if (xDoc.Descendants("queue").Count() == 0) + { + Logger.Debug("SAB Queue is empty. retiring false"); return false; - + } //Get the Count of Items in Queue where 'filename' is Equal to goodName, if not zero, return true (isInQueue))) if ( (xDoc.Descendants("slot").Where( @@ -81,42 +81,15 @@ namespace NzbDrone.Core.Providers return false; //Not in Queue } - public virtual bool AddById(string id, string title) - { - //mode=addid&name=333333&pp=3&script=customscript.cmd&cat=Example&priority=-1 - - const string mode = "addid"; - string cat = _configProvider.GetValue("SabTvCategory", String.Empty, true); - //string cat = "tv"; - string priority = _configProvider.GetValue("SabTvPriority", String.Empty, false); - string nzbName = HttpUtility.UrlEncode(title); - - string action = string.Format("mode={0}&name={1}&priority={2}&cat={3}&nzbname={4}", mode, id, priority, cat, - nzbName); - string request = GetSabRequest(action); - - Logger.Debug("Adding report [{0}] to the queue.", nzbName); - - string response = _httpProvider.DownloadString(request).Replace("\n", String.Empty); - Logger.Debug("Queue Repsonse: [{0}]", response); - - if (response == "ok") - return true; - - return false; - } - private string GetSabRequest(string action) { - string sabnzbdInfo = _configProvider.GetValue("SabHost", String.Empty, false) + ":" + - _configProvider.GetValue("SabPort", String.Empty, false); - string username = _configProvider.GetValue("SabUsername", String.Empty, false); - string password = _configProvider.GetValue("SabPassword", String.Empty, false); - string apiKey = _configProvider.GetValue("SabApiKey", String.Empty, false); - - return - string.Format(@"http://{0}/api?$Action&apikey={1}&ma_username={2}&ma_password={3}", sabnzbdInfo, apiKey, - username, password).Replace("$Action", action); + return string.Format(@"http://{0}:{1}/api?{2}&apikey={3}&ma_username={4}&ma_password={5}", + _configProvider.SabHost, + _configProvider.SabPort, + action, + _configProvider.SabApiKey, + _configProvider.SabUsername, + _configProvider.SabPassword); } public String GetSabTitle(EpisodeParseResult parseResult) From cb4d0e245018bf547d1d8295a7271c21f26366f8 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 8 May 2011 20:31:01 -0700 Subject: [PATCH 3/3] fixed blackhole config to be boolean --- NzbDrone.Core/Providers/Core/ConfigProvider.cs | 4 ++-- NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs | 2 +- NzbDrone.Web/Controllers/SettingsController.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NzbDrone.Core/Providers/Core/ConfigProvider.cs b/NzbDrone.Core/Providers/Core/ConfigProvider.cs index 4761db871..c369e87f6 100644 --- a/NzbDrone.Core/Providers/Core/ConfigProvider.cs +++ b/NzbDrone.Core/Providers/Core/ConfigProvider.cs @@ -173,9 +173,9 @@ namespace NzbDrone.Core.Providers.Core set { SetValue("SabTvPriority", value); } } - public virtual String UseBlackhole + public virtual Boolean UseBlackhole { - get { return GetValue("UseBlackhole"); } + get { return GetValueBoolean("UseBlackhole"); } set { SetValue("UseBlackhole", value); } } diff --git a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs index 12762290d..0e5d1881e 100644 --- a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs +++ b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs @@ -157,7 +157,7 @@ namespace NzbDrone.Core.Providers.Indexer parseResult.EpisodeTitle = episodes[0].Title; var sabTitle = _sabProvider.GetSabTitle(parseResult); - if (Convert.ToBoolean(_configProvider.UseBlackhole)) + if (_configProvider.UseBlackhole) { var blackholeDir = _configProvider.BlackholeDirectory; var folder = !String.IsNullOrEmpty(blackholeDir) ? blackholeDir : Path.Combine(CentralDispatch.AppPath, "App_Data"); diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index 5924ea7fd..d7a551f04 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -392,7 +392,7 @@ namespace NzbDrone.Web.Controllers _configProvider.SabTvCategory = data.SabTvCategory; _configProvider.SabUsername = data.SabUsername; _configProvider.SabTvPriority = data.SabTvPriority.ToString(); - _configProvider.UseBlackhole = data.UseBlackHole.ToString(); + _configProvider.UseBlackhole = data.UseBlackHole; _configProvider.BlackholeDirectory = data.BlackholeDirectory; return Content(SETTINGS_SAVED);