pull/997/head
tidusjar 8 years ago
parent 948097cd6c
commit 2d1ad10b70

@ -107,6 +107,11 @@ namespace Ombi.Api
var error = JsonConvert.DeserializeObject < RadarrError>(response.Content); var error = JsonConvert.DeserializeObject < RadarrError>(response.Content);
return new RadarrAddMovie {Error = error}; return new RadarrAddMovie {Error = error};
} }
if (response.Content.Contains("\"errorMessage\":"))
{
var error = JsonConvert.DeserializeObject<List<SonarrError>>(response.Content).FirstOrDefault();
return new RadarrAddMovie {Error = new RadarrError {message = error?.errorMessage}};
}
return JsonConvert.DeserializeObject < RadarrAddMovie>(response.Content); return JsonConvert.DeserializeObject < RadarrAddMovie>(response.Content);
} }
catch (JsonSerializationException jse) catch (JsonSerializationException jse)

@ -111,7 +111,7 @@ namespace Ombi.Core
if (!string.IsNullOrEmpty(result.Error?.message)) if (!string.IsNullOrEmpty(result.Error?.message))
{ {
Log.Error(result.Error.message); Log.Error(result.Error.message);
return new MovieSenderResult { Result = false }; return new MovieSenderResult { Result = false, Error = true};
} }
if (!string.IsNullOrEmpty(result.title)) if (!string.IsNullOrEmpty(result.title))
{ {

@ -36,5 +36,7 @@ namespace Ombi.Core
/// <c>true</c> if [movie sending enabled]; otherwise, <c>false</c>. /// <c>true</c> if [movie sending enabled]; otherwise, <c>false</c>.
/// </value> /// </value>
public bool MovieSendingEnabled { get; set; } public bool MovieSendingEnabled { get; set; }
public bool Error { get; set; }
} }
} }

@ -789,7 +789,17 @@ namespace Ombi.UI.Modules
if (result.Result) if (result.Result)
{ {
return await AddRequest(model, settings, return await AddRequest(model, settings,
$"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}"); $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}");
}
if (result.Error)
{
return
Response.AsJson(new JsonResponseModel
{
Message = "Could not add movie, please contract your administrator",
Result = false
});
} }
if (!result.MovieSendingEnabled) if (!result.MovieSendingEnabled)
{ {

Loading…
Cancel
Save