diff --git a/src/Ombi.Core/Senders/TvSender.cs b/src/Ombi.Core/Senders/TvSender.cs index cff86af4f..8f61041c0 100644 --- a/src/Ombi.Core/Senders/TvSender.cs +++ b/src/Ombi.Core/Senders/TvSender.cs @@ -285,7 +285,7 @@ namespace Ombi.Core.Senders settings.ApiKey, settings.FullUri); Logger.LogDebug("Added the show (tvdbid) {0}. The result is '{2}' : '{3}'", tvdbid, addResult.result, addResult.message); - if (addResult.result.Equals("failure")) + if (addResult.result.Equals("failure") || addResult.result.Equals("fatal")) { // Do something return false; diff --git a/src/Ombi.Notifications/GenericEmailProvider.cs b/src/Ombi.Notifications/GenericEmailProvider.cs index 664d06d48..b5979d9aa 100644 --- a/src/Ombi.Notifications/GenericEmailProvider.cs +++ b/src/Ombi.Notifications/GenericEmailProvider.cs @@ -48,12 +48,9 @@ namespace Ombi.Notifications Body = body.ToMessageBody(), Subject = model.Subject }; - message.From.Add(new MailboxAddress(settings.SenderAddress, settings.SenderAddress)); + message.From.Add(new MailboxAddress(string.IsNullOrEmpty(settings.SenderName) ? settings.SenderAddress : settings.SenderName, settings.SenderAddress)); message.To.Add(new MailboxAddress(model.To, model.To)); - - - using (var client = new SmtpClient()) { if (settings.DisableCertificateChecking) diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs index fa4327a26..c644aba54 100644 --- a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs +++ b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs @@ -77,15 +77,14 @@ namespace Ombi.Schedule.Jobs.Plex try { await StartTheCache(plexSettings); - - - Logger.LogInformation("Starting EP Cacher"); - BackgroundJob.Enqueue(() => EpisodeSync.Start()); } catch (Exception e) { Logger.LogWarning(LoggingEvents.Cacher, e, "Exception thrown when attempting to cache the Plex Content"); } + + Logger.LogInformation("Starting EP Cacher"); + BackgroundJob.Enqueue(() => EpisodeSync.Start()); } private async Task StartTheCache(PlexSettings plexSettings) diff --git a/src/Ombi/ClientApp/app/services/request.service.ts b/src/Ombi/ClientApp/app/services/request.service.ts index ba3f0a860..3c93e435b 100644 --- a/src/Ombi/ClientApp/app/services/request.service.ts +++ b/src/Ombi/ClientApp/app/services/request.service.ts @@ -104,7 +104,7 @@ export class RequestService extends ServiceHelpers { public approveChild(child: ITvUpdateModel): Observable { return this.http.post(`${this.url}tv/approve`, JSON.stringify(child), {headers: this.headers}); } - public deleteChild(child: IChildRequests): Observable { - return this.http.delete(`${this.url}tv/child/${child.id}`, {headers: this.headers}); + public deleteChild(child: IChildRequests): Observable { + return this.http.delete(`${this.url}tv/child/${child.id}`, {headers: this.headers}); } } diff --git a/src/Ombi/Controllers/RequestController.cs b/src/Ombi/Controllers/RequestController.cs index 84d0ed06b..038074cad 100644 --- a/src/Ombi/Controllers/RequestController.cs +++ b/src/Ombi/Controllers/RequestController.cs @@ -284,9 +284,10 @@ namespace Ombi.Controllers /// The model. /// [HttpDelete("tv/child/{requestId:int}")] - public async Task DeleteChildRequest(int requestId) + public async Task DeleteChildRequest(int requestId) { await TvRequestEngine.RemoveTvChild(requestId); + return true; }