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

Fixed SabProvider and Unit Tests for it.

Browse Source
pull/4/head
markus101 14 years ago
parent 13ab28586f
commit 445e2f59b9
2 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File

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

@ -19,21 +19,25 @@ namespace NzbDrone.Core.Test
public void AddByUrlSuccess() public void AddByUrlSuccess()
{ {
//Setup //Setup
string sabnzbdInfo = "192.168.5.55:2222"; string sabHost = "192.168.5.55";
string sabPort = "2222";
string apikey = "5c770e3197e4fe763423ee7c392c25d1"; string apikey = "5c770e3197e4fe763423ee7c392c25d1";
string username = "admin"; string username = "admin";
string password = "pass"; string password = "pass";
string priority = "0"; string priority = "0";
string category = "tv";
var config = new Mock<IConfigProvider>(); var config = new Mock<IConfigProvider>();
config.Setup(c => c.GetValue("SabnzbdInfo", String.Empty, false)).Returns(sabnzbdInfo); config.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost);
config.Setup(c => c.GetValue("ApiKey", String.Empty, false)).Returns(apikey); config.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort);
config.Setup(c => c.GetValue("Username", String.Empty, false)).Returns(username); config.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey);
config.Setup(c => c.GetValue("Password", String.Empty, false)).Returns(password); config.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username);
config.Setup(c => c.GetValue("Priority", String.Empty, false)).Returns(priority); config.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password);
config.Setup(c => c.GetValue("SabPriority", String.Empty, false)).Returns(priority);
config.Setup(c => c.GetValue("SabCategory", String.Empty, false)).Returns(category);
var http = new Mock<IHttpProvider>(); var http = new Mock<IHttpProvider>();
http.Setup(s => s.DownloadString("http://192.168.5.55:2222/sabnzbd/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("ok"); http.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")).Returns("ok");
var target = new SabProvider(config.Object, http.Object); var target = new SabProvider(config.Object, http.Object);
@ -48,21 +52,25 @@ namespace NzbDrone.Core.Test
public void AddByUrlError() public void AddByUrlError()
{ {
//Setup //Setup
string sabnzbdInfo = "192.168.5.55:2222"; string sabHost = "192.168.5.55";
string sabPort = "2222";
string apikey = "5c770e3197e4fe763423ee7c392c25d1"; string apikey = "5c770e3197e4fe763423ee7c392c25d1";
string username = "admin"; string username = "admin";
string password = "pass"; string password = "pass";
string priority = "0"; string priority = "0";
string category = "tv";
var config = new Mock<IConfigProvider>(); var config = new Mock<IConfigProvider>();
config.Setup(c => c.GetValue("SabnzbdInfo", String.Empty, false)).Returns(sabnzbdInfo); config.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost);
config.Setup(c => c.GetValue("ApiKey", String.Empty, false)).Returns(apikey); config.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort);
config.Setup(c => c.GetValue("Username", String.Empty, false)).Returns(username); config.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey);
config.Setup(c => c.GetValue("Password", String.Empty, false)).Returns(password); config.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username);
config.Setup(c => c.GetValue("Priority", String.Empty, false)).Returns(priority); config.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password);
config.Setup(c => c.GetValue("SabPriority", String.Empty, false)).Returns(priority);
config.Setup(c => c.GetValue("SabCategory", String.Empty, false)).Returns(category);
var http = new Mock<IHttpProvider>(); var http = new Mock<IHttpProvider>();
http.Setup(s => s.DownloadString("http://192.168.5.55:2222/sabnzbd/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"); http.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")).Returns("error");
var target = new SabProvider(config.Object, http.Object); var target = new SabProvider(config.Object, http.Object);
@ -77,24 +85,25 @@ namespace NzbDrone.Core.Test
public void IsInQueue_True() public void IsInQueue_True()
{ {
//Setup //Setup
string sabnzbdInfo = "192.168.5.55:2222"; string sabHost = "192.168.5.55";
string sabPort = "2222";
string apikey = "5c770e3197e4fe763423ee7c392c25d1"; string apikey = "5c770e3197e4fe763423ee7c392c25d1";
string username = "admin"; string username = "admin";
string password = "pass"; string password = "pass";
string priority = "0"; string priority = "0";
var config = new Mock<IConfigProvider>(); var config = new Mock<IConfigProvider>();
config.Setup(c => c.GetValue("SabnzbdInfo", String.Empty, false)).Returns(sabnzbdInfo); config.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost);
config.Setup(c => c.GetValue("ApiKey", String.Empty, false)).Returns(apikey); config.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort);
config.Setup(c => c.GetValue("Username", String.Empty, false)).Returns(username); config.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey);
config.Setup(c => c.GetValue("Password", String.Empty, false)).Returns(password); config.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username);
config.Setup(c => c.GetValue("Priority", String.Empty, false)).Returns(priority); config.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password);
var http = new Mock<IHttpProvider>(); var http = new Mock<IHttpProvider>();
http.Setup( http.Setup(
s => s =>
s.DownloadString( s.DownloadString(
"http://192.168.5.55:2222/sabnzbd/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) "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()); .Returns(new StreamReader(@".\Files\Queue.xml").ReadToEnd());
var target = new SabProvider(config.Object, http.Object); var target = new SabProvider(config.Object, http.Object);
@ -110,24 +119,25 @@ namespace NzbDrone.Core.Test
public void IsInQueue_False_Empty() public void IsInQueue_False_Empty()
{ {
//Setup //Setup
string sabnzbdInfo = "192.168.5.55:2222"; string sabHost = "192.168.5.55";
string sabPort = "2222";
string apikey = "5c770e3197e4fe763423ee7c392c25d1"; string apikey = "5c770e3197e4fe763423ee7c392c25d1";
string username = "admin"; string username = "admin";
string password = "pass"; string password = "pass";
string priority = "0"; string priority = "0";
var config = new Mock<IConfigProvider>(); var config = new Mock<IConfigProvider>();
config.Setup(c => c.GetValue("SabnzbdInfo", String.Empty, false)).Returns(sabnzbdInfo); config.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost);
config.Setup(c => c.GetValue("ApiKey", String.Empty, false)).Returns(apikey); config.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort);
config.Setup(c => c.GetValue("Username", String.Empty, false)).Returns(username); config.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey);
config.Setup(c => c.GetValue("Password", String.Empty, false)).Returns(password); config.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username);
config.Setup(c => c.GetValue("Priority", String.Empty, false)).Returns(priority); config.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password);
var http = new Mock<IHttpProvider>(); var http = new Mock<IHttpProvider>();
http.Setup( http.Setup(
s => s =>
s.DownloadString( s.DownloadString(
"http://192.168.5.55:2222/sabnzbd/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) "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()); .Returns(new StreamReader(@".\Files\QueueEmpty.xml").ReadToEnd());
var target = new SabProvider(config.Object, http.Object); var target = new SabProvider(config.Object, http.Object);
@ -143,24 +153,25 @@ namespace NzbDrone.Core.Test
public void IsInQueue_False_Error() public void IsInQueue_False_Error()
{ {
//Setup //Setup
string sabnzbdInfo = "192.168.5.55:2222"; string sabHost = "192.168.5.55";
string sabPort = "2222";
string apikey = "5c770e3197e4fe763423ee7c392c25d1"; string apikey = "5c770e3197e4fe763423ee7c392c25d1";
string username = "admin"; string username = "admin";
string password = "pass"; string password = "pass";
string priority = "0"; string priority = "0";
var config = new Mock<IConfigProvider>(); var config = new Mock<IConfigProvider>();
config.Setup(c => c.GetValue("SabnzbdInfo", String.Empty, false)).Returns(sabnzbdInfo); config.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost);
config.Setup(c => c.GetValue("ApiKey", String.Empty, false)).Returns(apikey); config.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort);
config.Setup(c => c.GetValue("Username", String.Empty, false)).Returns(username); config.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey);
config.Setup(c => c.GetValue("Password", String.Empty, false)).Returns(password); config.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username);
config.Setup(c => c.GetValue("Priority", String.Empty, false)).Returns(priority); config.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password);
var http = new Mock<IHttpProvider>(); var http = new Mock<IHttpProvider>();
http.Setup( http.Setup(
s => s =>
s.DownloadString( s.DownloadString(
"http://192.168.5.55:2222/sabnzbd/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) "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()); .Returns(new StreamReader(@".\Files\QueueError.xml").ReadToEnd());
var target = new SabProvider(config.Object, http.Object); var target = new SabProvider(config.Object, http.Object);

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

@ -24,8 +24,9 @@ namespace NzbDrone.Core.Providers
public bool AddByUrl(string url, string title) public bool AddByUrl(string url, string title)
{ {
const string mode = "addurl"; const string mode = "addurl";
const string cat = "tv"; //string cat = _config.GetValue("SabCategory", String.Empty, true);
string priority = _config.GetValue("Priority", String.Empty, false); string cat = "tv";
string priority = _config.GetValue("SabPriority", String.Empty, false);
string name = url.Replace("&", "%26"); string name = url.Replace("&", "%26");
string nzbName = HttpUtility.UrlEncode(title); string nzbName = HttpUtility.UrlEncode(title);
@ -73,12 +74,12 @@ namespace NzbDrone.Core.Providers
private string GetSabRequest(string action) private string GetSabRequest(string action)
{ {
string sabnzbdInfo = _config.GetValue("SabnzbdInfo", String.Empty, false); string sabnzbdInfo = _config.GetValue("SabHost", String.Empty, false) + ":" + _config.GetValue("SabPort", String.Empty, false);
string username = _config.GetValue("Username", String.Empty, false); string username = _config.GetValue("SabUsername", String.Empty, false);
string password = _config.GetValue("Password", String.Empty, false); string password = _config.GetValue("SabPassword", String.Empty, false);
string apiKey = _config.GetValue("ApiKey", String.Empty, false); string apiKey = _config.GetValue("SabApiKey", String.Empty, false);
return string.Format(@"http://{0}/sabnzbd/api?$Action&apikey={1}&ma_username={2}&ma_password={3}", sabnzbdInfo, apiKey, username, password).Replace("$Action", action); return string.Format(@"http://{0}/api?$Action&apikey={1}&ma_username={2}&ma_password={3}", sabnzbdInfo, apiKey, username, password).Replace("$Action", action);
} }
} }
} }
Write Preview
Loading…
Cancel
Save