From cc3cc4a729f49236f548ecd458bf97346a26a3b7 Mon Sep 17 00:00:00 2001 From: Jon Bloom Date: Wed, 3 Jun 2020 20:41:08 -0400 Subject: [PATCH 1/2] Replace smartquotes in meta info --- src/Ombi/Views/Shared/_Layout.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi/Views/Shared/_Layout.cshtml b/src/Ombi/Views/Shared/_Layout.cshtml index 8c39df925..22c6c98f1 100644 --- a/src/Ombi/Views/Shared/_Layout.cshtml +++ b/src/Ombi/Views/Shared/_Layout.cshtml @@ -78,7 +78,7 @@ @appName - + From 87b94e3ed02e1800542cced7e3cd2752bae1ead8 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 19 Jun 2020 23:50:22 +0100 Subject: [PATCH 2/2] Added some additional logging to the metadata refresh --- src/Ombi.Helpers/OmbiQuartz.cs | 1 + src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs | 2 ++ src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs | 1 + src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs | 8 ++++---- src/Ombi.Schedule/Jobs/Plex/PlexEpisodeSync.cs | 3 ++- src/Ombi.Settings/Settings/Models/JobSettings.cs | 1 - src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs | 5 ----- src/Ombi/ClientApp/src/app/interfaces/ISettings.ts | 1 - .../ClientApp/src/app/settings/jobs/jobs.component.html | 8 -------- .../ClientApp/src/app/settings/jobs/jobs.component.ts | 1 - src/Ombi/Controllers/V1/SettingsController.cs | 1 - 11 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/Ombi.Helpers/OmbiQuartz.cs b/src/Ombi.Helpers/OmbiQuartz.cs index 9a4cf87da..4309a4c53 100644 --- a/src/Ombi.Helpers/OmbiQuartz.cs +++ b/src/Ombi.Helpers/OmbiQuartz.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Quartz; using Quartz.Impl; +using Quartz.Impl.Matchers; using Quartz.Spi; namespace Ombi.Helpers diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs index 1e0be5bdc..48537ef65 100644 --- a/src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs +++ b/src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs @@ -66,11 +66,13 @@ namespace Ombi.Schedule.Jobs.Emby public async Task Execute(IJobExecutionContext job) { + _log.LogInformation("Starting Emby Availability Check"); await _notification.Clients.Clients(NotificationHub.AdminConnectionIds) .SendAsync(NotificationHub.NotificationEvent, "Emby Availability Checker Started"); await ProcessMovies(); await ProcessTv(); + _log.LogInformation("Finished Emby Availability Check"); await _notification.Clients.Clients(NotificationHub.AdminConnectionIds) .SendAsync(NotificationHub.NotificationEvent, "Emby Availability Checker Finished"); } diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs index 491ff3363..3baca72f3 100644 --- a/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs +++ b/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs @@ -78,6 +78,7 @@ namespace Ombi.Schedule.Jobs.Emby await _notification.Clients.Clients(NotificationHub.AdminConnectionIds) .SendAsync(NotificationHub.NotificationEvent, "Emby Episode Sync Finished"); + _logger.LogInformation("Emby Episode Sync Finished - Triggering Metadata refresh"); await OmbiQuartz.TriggerJob(nameof(IRefreshMetadata), "System"); } diff --git a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs index 7ecea31c8..645a74c5f 100644 --- a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs +++ b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs @@ -69,19 +69,19 @@ namespace Ombi.Schedule.Jobs.Ombi if (embySettings.Enable) { await StartEmby(embySettings); - - await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby"); + await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby"); } } catch (Exception e) { - _log.LogError(e, "Exception when refreshing the Plex Metadata"); + _log.LogError(e, $"Exception when refreshing the Metadata Refresh"); await _notification.Clients.Clients(NotificationHub.AdminConnectionIds) .SendAsync(NotificationHub.NotificationEvent, "Metadata Refresh Failed"); - throw; + return; } + _log.LogInformation("Metadata refresh finished"); await _notification.Clients.Clients(NotificationHub.AdminConnectionIds) .SendAsync(NotificationHub.NotificationEvent, "Metadata Refresh Finished"); } diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexEpisodeSync.cs b/src/Ombi.Schedule/Jobs/Plex/PlexEpisodeSync.cs index 8d92ef238..0ee2fef0c 100644 --- a/src/Ombi.Schedule/Jobs/Plex/PlexEpisodeSync.cs +++ b/src/Ombi.Schedule/Jobs/Plex/PlexEpisodeSync.cs @@ -63,7 +63,8 @@ namespace Ombi.Schedule.Jobs.Plex _log.LogError(LoggingEvents.Cacher, e, "Caching Episodes Failed"); } - + + _log.LogInformation("Plex Episode Sync Finished - Triggering Metadata refresh"); await OmbiQuartz.TriggerJob(nameof(IRefreshMetadata), "System"); await _notification.Clients.Clients(NotificationHub.AdminConnectionIds) diff --git a/src/Ombi.Settings/Settings/Models/JobSettings.cs b/src/Ombi.Settings/Settings/Models/JobSettings.cs index 4376088a3..bd8b81db0 100644 --- a/src/Ombi.Settings/Settings/Models/JobSettings.cs +++ b/src/Ombi.Settings/Settings/Models/JobSettings.cs @@ -11,7 +11,6 @@ public string AutomaticUpdater { get; set; } public string UserImporter { get; set; } public string SickRageSync { get; set; } - public string RefreshMetadata { get; set; } public string Newsletter { get; set; } public string LidarrArtistSync { get; set; } public string IssuesPurge { get; set; } diff --git a/src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs b/src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs index 272ad3444..2001b5086 100644 --- a/src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs +++ b/src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs @@ -56,11 +56,6 @@ namespace Ombi.Settings.Settings.Models return ValidateCron(Get(s.SickRageSync, Cron.Hourly(35))); } - public static string RefreshMetadata(JobSettings s) - { - return ValidateCron(Get(s.RefreshMetadata, Cron.DayInterval(3))); - } - public static string LidarrArtistSync(JobSettings s) { return ValidateCron(Get(s.LidarrArtistSync, Cron.Hourly(40))); diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts index 78a6d5822..731cb28bf 100644 --- a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts +++ b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts @@ -140,7 +140,6 @@ export interface IJobSettings { automaticUpdater: string; userImporter: string; sickRageSync: string; - refreshMetadata: string; newsletter: string; plexRecentlyAddedSync: string; lidarrArtistSync: string; diff --git a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html index 314b19146..849230bcd 100644 --- a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html +++ b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html @@ -84,14 +84,6 @@ The User Importer is required - -
- - - The Refresh Metadata is required - -
-
diff --git a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts index 50243337a..2850d9441 100644 --- a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts @@ -28,7 +28,6 @@ export class JobsComponent implements OnInit { sonarrSync: [x.sonarrSync, Validators.required], radarrSync: [x.radarrSync, Validators.required], sickRageSync: [x.sickRageSync, Validators.required], - refreshMetadata: [x.refreshMetadata, Validators.required], newsletter: [x.newsletter, Validators.required], plexRecentlyAddedSync: [x.plexRecentlyAddedSync, Validators.required], lidarrArtistSync: [x.lidarrArtistSync, Validators.required], diff --git a/src/Ombi/Controllers/V1/SettingsController.cs b/src/Ombi/Controllers/V1/SettingsController.cs index 067183382..1e77704db 100644 --- a/src/Ombi/Controllers/V1/SettingsController.cs +++ b/src/Ombi/Controllers/V1/SettingsController.cs @@ -569,7 +569,6 @@ namespace Ombi.Controllers.V1 j.PlexContentSync = j.PlexContentSync.HasValue() ? j.PlexContentSync : JobSettingsHelper.PlexContent(j); j.UserImporter = j.UserImporter.HasValue() ? j.UserImporter : JobSettingsHelper.UserImporter(j); j.SickRageSync = j.SickRageSync.HasValue() ? j.SickRageSync : JobSettingsHelper.SickRageSync(j); - j.RefreshMetadata = j.RefreshMetadata.HasValue() ? j.RefreshMetadata : JobSettingsHelper.RefreshMetadata(j); j.PlexRecentlyAddedSync = j.PlexRecentlyAddedSync.HasValue() ? j.PlexRecentlyAddedSync : JobSettingsHelper.PlexRecentlyAdded(j); j.Newsletter = j.Newsletter.HasValue() ? j.Newsletter : JobSettingsHelper.Newsletter(j); j.LidarrArtistSync = j.LidarrArtistSync.HasValue() ? j.LidarrArtistSync : JobSettingsHelper.LidarrArtistSync(j);