mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-24 16:53:54 +00:00
Code Issues Releases Wiki Activity

Fixed XBMC JSON requests.

Browse source
This commit is contained in:
Mark McDowall 2011-09-27 10:41:36 -07:00
parent 4eea6b8c6b
commit 5f0a95b2b1
3 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
NzbDrone.Core.Test/XbmcProviderTest.cs
View file

@ -22,7 +22,7 @@ namespace NzbDrone.Core.Test
public class XbmcProviderTest : TestBase
{
[Test]
public void JsonEror_true()
public void JsonError_true()
{
//Setup
var mocker = new AutoMoqer();
@ -36,7 +36,21 @@ namespace NzbDrone.Core.Test
}
[Test]
public void JsonEror_false()
public void JsonError_true_empty_response()
{
//Setup
var mocker = new AutoMoqer();
var response = String.Empty;
//Act
var result = mocker.Resolve<XbmcProvider>().CheckForJsonError(response);
//Assert
Assert.AreEqual(true, result);
}
[Test]
public void JsonError_false()
{
//Setup
var mocker = new AutoMoqer();

35
NzbDrone.Core/Providers/Core/HttpProvider.cs
View file

@ -74,24 +74,31 @@ namespace NzbDrone.Core.Providers.Core
byte[] byteArray = Encoding.ASCII.GetBytes(command);
var request = WebRequest.Create(address);
var request = (HttpWebRequest)WebRequest.Create(address);
request.Method = "POST";
request.Credentials = new NetworkCredential(username, password);
request.ContentLength = byteArray.Length;
request.ContentType = "application/x-www-form-urlencoded";
var dataStream = request.GetRequestStream();
dataStream.Write(byteArray, 0, byteArray.Length);
dataStream.Close();
request.ContentType = "application/json";
request.Timeout = 2000;
request.KeepAlive = false;
var response = request.GetResponse();
dataStream = response.GetResponseStream();
var reader = new StreamReader(dataStream);
// Read the content.
string responseFromServer = reader.ReadToEnd();
//Used to hold the JSON response
string responseFromServer;
reader.Close();
dataStream.Close();
response.Close();
using (var requestStream = request.GetRequestStream())
{
requestStream.Write(byteArray, 0, byteArray.Length);
using (var response = request.GetResponse())
{
using (var responseStream = response.GetResponseStream())
{
using (var reader = new StreamReader(responseStream))
{
responseFromServer = reader.ReadToEnd();
}
}
}
}
return responseFromServer.Replace("&nbsp;", " ");
}

6
NzbDrone.Core/Providers/XbmcProvider.cs
View file

@ -300,6 +300,12 @@ namespace NzbDrone.Core.Providers
return true;
}
if (String.IsNullOrWhiteSpace(response))
{
Logger.Debug("Invalid response from XBMC, the response is not valid JSON");
return true;
}
return false;
}