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

Merge branch 'master' into dev

Browse source
This commit is contained in:
tidusjar 2016-07-08 19:19:48 +01:00
commit 6a83b07aab
12 changed files with 323 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -482,7 +482,7 @@ namespace PlexRequests.UI.Modules
if (ShouldAutoApprove(RequestType.Movie, settings))
{
var cpSettings = await CpService.GetSettingsAsync();
model.Approved = true;
if (cpSettings.Enabled)
{
Log.Info("Adding movie to CP (No approval required)");
@ -496,11 +496,10 @@ namespace PlexRequests.UI.Modules
return Response.AsJson(new JsonResponseModel
{
Result = false,
Message = Resources.UI.Search_CouchPotatoError
});
}
model.Approved = true;
return await AddRequest(model, settings, $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}");
}
@ -623,6 +622,7 @@ namespace PlexRequests.UI.Modules
if (ShouldAutoApprove(RequestType.TvShow, settings))
{
model.Approved = true;
var sonarrSettings = await SonarrService.GetSettingsAsync();
var sender = new TvSender(SonarrApi, SickrageApi);
if (sonarrSettings.Enabled)
@ -737,6 +737,7 @@ namespace PlexRequests.UI.Modules
if (ShouldAutoApprove(RequestType.Album, settings))
{
model.Approved = true;
var hpSettings = HeadphonesService.GetSettings();
if (!hpSettings.Enabled)
@ -907,8 +908,6 @@ namespace PlexRequests.UI.Modules
private async Task<Response> AddRequest(RequestedModel model, PlexRequestSettings settings, string message)
{
model.Approved = true;
await RequestService.AddRequestAsync(model);
if (ShouldSendNotification(model.Type, settings))