From e9e61153cb6e60f49fbea4a1ed0e4a2b76f96a5b Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 6 Feb 2018 10:25:18 +0000 Subject: [PATCH] potential fix for #1942 --- src/Ombi.Notifications/NotificationMessageCurlys.cs | 9 +++++---- src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Ombi.Notifications/NotificationMessageCurlys.cs b/src/Ombi.Notifications/NotificationMessageCurlys.cs index 0eb26551d..ce36c2599 100644 --- a/src/Ombi.Notifications/NotificationMessageCurlys.cs +++ b/src/Ombi.Notifications/NotificationMessageCurlys.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Ombi.Helpers; using Ombi.Notifications.Models; using Ombi.Settings.Settings.Models; using Ombi.Store.Entities; @@ -12,7 +13,7 @@ namespace Ombi.Notifications public void Setup(NotificationOptions opts, FullBaseRequest req, CustomizationSettings s) { - ApplicationUrl = s?.ApplicationUrl; + ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty; ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName; RequestedUser = string.IsNullOrEmpty(req.RequestedUser.Alias) ? req.RequestedUser.UserName @@ -24,12 +25,12 @@ namespace Ombi.Notifications Year = req.ReleaseDate.Year.ToString(); PosterImage = req.RequestType == RequestType.Movie ? $"https://image.tmdb.org/t/p/w300{req.PosterPath}" : req.PosterPath; - AdditionalInformation = opts.AdditionalInformation; + AdditionalInformation = opts?.AdditionalInformation ?? string.Empty; } public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s) { - ApplicationUrl = s?.ApplicationUrl; + ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty; ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName; RequestedUser = string.IsNullOrEmpty(req.RequestedUser.Alias) ? req.RequestedUser.UserName @@ -47,7 +48,7 @@ namespace Ombi.Notifications public void Setup(OmbiUser user, CustomizationSettings s) { - ApplicationUrl = s?.ApplicationUrl; + ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty; ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName; RequestedUser = user.UserName; } diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs index 7750b6487..3eda1cdad 100644 --- a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs +++ b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs @@ -221,6 +221,7 @@ namespace Ombi.Schedule.Jobs.Plex //var existing = await Repo.GetByKey(movie.ratingKey); if (existing != null) { + Logger.LogInformation("We already have movie {0}", movie.title); continue; }