github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-11 07:46:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for #978

Browse source
This commit is contained in:
tidusjar 2017-01-25 21:22:28 +00:00
parent 948097cd6c
commit 2d1ad10b70
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ombi.Api/RadarrApi.cs
View file

@ -107,6 +107,11 @@ namespace Ombi.Api
var error = JsonConvert.DeserializeObject < RadarrError>(response.Content);
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);
}
catch (JsonSerializationException jse)

2
Ombi.Core/MovieSender.cs
View file

@ -111,7 +111,7 @@ namespace Ombi.Core
if (!string.IsNullOrEmpty(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))
{

2
Ombi.Core/MovieSenderResult.cs
View file

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

12
Ombi.UI/Modules/SearchModule.cs
View file

@ -789,7 +789,17 @@ namespace Ombi.UI.Modules
if (result.Result)
{
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)
{