self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-16 11:37:58 +02:00
Code Issues Releases Activity

Fixed error detection for SAB

Browse Source
This commit is contained in:
Mark McDowall 2013-11-20 22:29:26 -08:00
parent bc0bd647df
commit 8bd15612f4
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabCommunicationProxy.cs
View File

@ -97,19 +97,19 @@ private void CheckForError(IRestResponse response)
if (response.Content.StartsWith("error", StringComparison.InvariantCultureIgnoreCase)) if (response.Content.StartsWith("error", StringComparison.InvariantCultureIgnoreCase))
{ {
result.Status = false; result.Status = "false";
result.Error = response.Content.Replace("error: ", ""); result.Error = response.Content.Replace("error: ", "");
} }
else else
{ {
result.Status = true; result.Status = "true";
} }
result.Error = response.Content.Replace("error: ", ""); result.Error = response.Content.Replace("error: ", "");
} }
if (!result.Status) if (result.Failed)
throw new ApplicationException(result.Error); throw new ApplicationException(result.Error);
} }

15
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
View File

@ -1,8 +1,19 @@
namespace NzbDrone.Core.Download.Clients.Sabnzbd using System;
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{ {
public class SabJsonError public class SabJsonError
{ {
public bool Status { get; set; } public string Status { get; set; }
public string Error { get; set; } public string Error { get; set; }
public bool Failed
{
get
{
return !String.IsNullOrWhiteSpace(Status) &&
Status.Equals("false", StringComparison.InvariantCultureIgnoreCase);
}
}
} }
} }

2
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdClient.cs
View File

@ -243,7 +243,7 @@ private void CheckForError(string response)
{ {
var result = Json.Deserialize<SabJsonError>(response); var result = Json.Deserialize<SabJsonError>(response);
if (result.Status) if (result.Failed)
throw new ApplicationException(result.Error); throw new ApplicationException(result.Error);
} }
} }