github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 02:26:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git

Browse source
This commit is contained in:
Jamie.Rees 2017-01-26 11:44:48 +00:00
commit 1ddb6c7f01
6 changed files with 24 additions and 5 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; }
}
}

6
Ombi.UI/Modules/RequestsModule.cs
View file

@ -275,7 +275,7 @@ namespace Ombi.UI.Modules
Episodes = tv.Episodes.ToArray(),
RootFolders = rootFolders.ToArray(),
HasRootFolders = rootFolders.Any(),
CurrentRootPath = GetRootPath(tv.RootFolderSelected, sonarrSettings).Result
CurrentRootPath = sonarrSettings.Enabled ? GetRootPath(tv.RootFolderSelected, sonarrSettings).Result : null
}).ToList();
return Response.AsJson(viewModel);
@ -292,7 +292,9 @@ namespace Ombi.UI.Modules
{
return r.path;
}
return string.Empty;
// Return default path
return rootFoldersResult.FirstOrDefault(x => x.id.Equals(int.Parse(sonarrSettings.RootPath)))?.path ?? string.Empty;
}
private async Task<Response> GetAlbumRequests()

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)
{

2
Ombi.UI/Views/Admin/Sonarr.cshtml
View file

@ -182,7 +182,7 @@
console.log('Hit root folders..');
var rootFolderSelected = @Model.RootPath;
var rootFolderSelected = '@Model.RootPath';
if (!rootFolderSelected) {
return;
}