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)