open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor cleanup in sabprovider, sabprovider tests

Browse Source
pull/4/head
kay.one 14 years ago
parent 34f7b9ca7d
commit 343c303bc6
2 changed files with 69 additions and 112 deletions
Show Stats Download Patch File Download Diff File

128
NzbDrone.Core.Test/SabControllerTest.cs
Unescape View File

@ -32,22 +32,22 @@ namespace NzbDrone.Core.Test
var mocker = new AutoMoqer(); var mocker = new AutoMoqer();
var fakeConfig = mocker.GetMock<ConfigProvider>(); var fakeConfig = mocker.GetMock<ConfigProvider>();
fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)) fakeConfig.SetupGet(c => c.SabHost)
.Returns(sabHost); .Returns(sabHost);
fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)) fakeConfig.SetupGet(c => c.SabPort)
.Returns(sabPort); .Returns(sabPort);
fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)) fakeConfig.SetupGet(c => c.SabApiKey)
.Returns(apikey); .Returns(apikey);
fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)) fakeConfig.SetupGet(c => c.SabUsername)
.Returns(username); .Returns(username);
fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)) fakeConfig.SetupGet(c => c.SabPassword)
.Returns(password); .Returns(password);
fakeConfig.Setup(c => c.GetValue("SabTvPriority", String.Empty, false)) fakeConfig.SetupGet(c => c.SabTvPriority)
.Returns(priority); .Returns(priority);
fakeConfig.Setup(c => c.GetValue("SabTvCategory", String.Empty, true)) fakeConfig.SetupGet(c => c.SabTvCategory)
.Returns(category); .Returns(category);
mocker.GetMock<HttpProvider>() mocker.GetMock<HttpProvider>(MockBehavior.Strict)
.Setup( .Setup(
s => s =>
s.DownloadString( s.DownloadString(
@ -59,45 +59,25 @@ namespace NzbDrone.Core.Test
"http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an Nzb"); "http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an Nzb");
//Assert //Assert
Assert.AreEqual(true, result); Assert.IsTrue(result);
} }
[Test] [Test]
public void AddByUrlError() public void AddByUrlError()
{ {
//Setup //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 mocker = new AutoMoqer();
var fakeConfig = mocker.GetMock<ConfigProvider>();
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<HttpProvider>() mocker.GetMock<HttpProvider>()
.Setup( .Setup(s => s.DownloadString(It.IsAny<String>()))
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"))
.Returns("error"); .Returns("error");
//Act //Act
bool result = mocker.Resolve<SabProvider>().AddByUrl( var sabProvider = mocker.Resolve<SabProvider>();
"http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an Nzb"); var result = sabProvider.AddByUrl("http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an nzb");
//Assert //Assert
Assert.AreEqual(false, result); Assert.IsFalse(result);
} }
[Test] [Test]
@ -113,24 +93,26 @@ namespace NzbDrone.Core.Test
var mocker = new AutoMoqer(); var mocker = new AutoMoqer();
var fakeConfig = mocker.GetMock<ConfigProvider>(); var fakeConfig = mocker.GetMock<ConfigProvider>();
fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); fakeConfig.SetupGet(c => c.SabHost)
fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); .Returns(sabHost);
fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); fakeConfig.SetupGet(c => c.SabPort)
fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); .Returns(sabPort);
fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); fakeConfig.SetupGet(c => c.SabApiKey)
.Returns(apikey);
fakeConfig.SetupGet(c => c.SabUsername)
.Returns(username);
fakeConfig.SetupGet(c => c.SabPassword)
.Returns(password);
mocker.GetMock<HttpProvider>() mocker.GetMock<HttpProvider>(MockBehavior.Strict)
.Setup( .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
s => .Returns(File.ReadAllText(@".\Files\Queue.xml"));
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());
//Act //Act
bool result = mocker.Resolve<SabProvider>().IsInQueue("Ubuntu Test"); bool result = mocker.Resolve<SabProvider>().IsInQueue("Ubuntu Test");
//Assert //Assert
Assert.AreEqual(true, result); Assert.IsTrue(result);
} }
[Test] [Test]
@ -146,27 +128,30 @@ namespace NzbDrone.Core.Test
var mocker = new AutoMoqer(); var mocker = new AutoMoqer();
var fakeConfig = mocker.GetMock<ConfigProvider>(); var fakeConfig = mocker.GetMock<ConfigProvider>();
fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); fakeConfig.SetupGet(c => c.SabHost)
fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); .Returns(sabHost);
fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); fakeConfig.SetupGet(c => c.SabPort)
fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); .Returns(sabPort);
fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); fakeConfig.SetupGet(c => c.SabApiKey)
.Returns(apikey);
fakeConfig.SetupGet(c => c.SabUsername)
.Returns(username);
fakeConfig.SetupGet(c => c.SabPassword)
.Returns(password);
mocker.GetMock<HttpProvider>() mocker.GetMock<HttpProvider>(MockBehavior.Strict)
.Setup( .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
s => .Returns(File.ReadAllText(@".\Files\QueueEmpty.xml"));
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());
//Act //Act
bool result = mocker.Resolve<SabProvider>().IsInQueue(String.Empty); bool result = mocker.Resolve<SabProvider>().IsInQueue(String.Empty);
//Assert //Assert
Assert.AreEqual(false, result); Assert.IsFalse(result);
} }
[Test] [Test]
[ExpectedException(typeof(ApplicationException), Message = "API Key Incorrect")]
public void IsInQueue_False_Error() public void IsInQueue_False_Error()
{ {
//Setup //Setup
@ -179,25 +164,24 @@ namespace NzbDrone.Core.Test
var mocker = new AutoMoqer(); var mocker = new AutoMoqer();
var fakeConfig = mocker.GetMock<ConfigProvider>(); var fakeConfig = mocker.GetMock<ConfigProvider>();
fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); fakeConfig.SetupGet(c => c.SabHost)
fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); .Returns(sabHost);
fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); fakeConfig.SetupGet(c => c.SabPort)
fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); .Returns(sabPort);
fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); fakeConfig.SetupGet(c => c.SabApiKey)
.Returns(apikey);
fakeConfig.SetupGet(c => c.SabUsername)
.Returns(username);
fakeConfig.SetupGet(c => c.SabPassword)
.Returns(password);
mocker.GetMock<HttpProvider>() mocker.GetMock<HttpProvider>(MockBehavior.Strict)
.Setup( .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
s => .Returns(File.ReadAllText(@".\Files\QueueError.xml"));
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());
//Act //Act
bool result = mocker.Resolve<SabProvider>().IsInQueue(String.Empty); mocker.Resolve<SabProvider>().IsInQueue(String.Empty);
//Assert
Assert.AreEqual(false, result);
} }
[Test] [Test]

53
NzbDrone.Core/Providers/SabProvider.cs
Unescape View File

@ -28,15 +28,13 @@ namespace NzbDrone.Core.Providers
public virtual bool AddByUrl(string url, string title) public virtual bool AddByUrl(string url, string title)
{ {
const string mode = "addurl";
string cat = _configProvider.SabTvCategory; string cat = _configProvider.SabTvCategory;
//string cat = "tv";
string priority = _configProvider.SabTvPriority; string priority = _configProvider.SabTvPriority;
string name = url.Replace("&", "%26"); string name = url.Replace("&", "%26");
string nzbName = HttpUtility.UrlEncode(title); string nzbName = HttpUtility.UrlEncode(title);
string action = string.Format("mode={0}&name={1}&priority={2}&cat={3}&nzbname={4}", mode, name, priority, string action = string.Format("mode=addurl&name={0}&priority={1}&cat={2}&nzbname={3}",
cat, nzbName); name, priority, cat, nzbName);
string request = GetSabRequest(action); string request = GetSabRequest(action);
Logger.Info("Adding report [{0}] to the queue.", title); Logger.Info("Adding report [{0}] to the queue.", title);
@ -62,11 +60,13 @@ namespace NzbDrone.Core.Providers
//If an Error Occurred, return) //If an Error Occurred, return)
if (xDoc.Descendants("error").Count() != 0) if (xDoc.Descendants("error").Count() != 0)
return false; throw new ApplicationException(xDoc.Descendants("error").FirstOrDefault().Value);
if (xDoc.Descendants("queue").Count() == 0) if (xDoc.Descendants("queue").Count() == 0)
{
Logger.Debug("SAB Queue is empty. retiring false");
return false; return false;
}
//Get the Count of Items in Queue where 'filename' is Equal to goodName, if not zero, return true (isInQueue))) //Get the Count of Items in Queue where 'filename' is Equal to goodName, if not zero, return true (isInQueue)))
if ( if (
(xDoc.Descendants("slot").Where( (xDoc.Descendants("slot").Where(
@ -81,42 +81,15 @@ namespace NzbDrone.Core.Providers
return false; //Not in Queue 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) private string GetSabRequest(string action)
{ {
string sabnzbdInfo = _configProvider.GetValue("SabHost", String.Empty, false) + ":" + return string.Format(@"http://{0}:{1}/api?{2}&apikey={3}&ma_username={4}&ma_password={5}",
_configProvider.GetValue("SabPort", String.Empty, false); _configProvider.SabHost,
string username = _configProvider.GetValue("SabUsername", String.Empty, false); _configProvider.SabPort,
string password = _configProvider.GetValue("SabPassword", String.Empty, false); action,
string apiKey = _configProvider.GetValue("SabApiKey", String.Empty, false); _configProvider.SabApiKey,
_configProvider.SabUsername,
return _configProvider.SabPassword);
string.Format(@"http://{0}/api?$Action&apikey={1}&ma_username={2}&ma_password={3}", sabnzbdInfo, apiKey,
username, password).Replace("$Action", action);
} }
public String GetSabTitle(EpisodeParseResult parseResult) public String GetSabTitle(EpisodeParseResult parseResult)

Write Preview
Loading…
Cancel
Save