Added some validation around the new crons

src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using Ombi.Helpers;
+using Quartz;
 
 namespace Ombi.Settings.Settings.Models
 {
@@ -7,72 +8,93 @@ namespace Ombi.Settings.Settings.Models
     {
         public static string Radarr(JobSettings s)
         {
-            return Get(s.RadarrSync, Cron.Hourly(15));
+            return ValidateCron(Get(s.RadarrSync, Cron.Hourly(15)));
         }
 
         public static string Sonarr(JobSettings s)
         {
-            return Get(s.SonarrSync, Cron.Hourly(10));
+            return ValidateCron(Get(s.SonarrSync, Cron.Hourly(10)));
-            //return Get(s.SonarrSync, Cron.Hourly(10));
         }
 
         public static string EmbyContent(JobSettings s)
         {
-            return Get(s.EmbyContentSync, Cron.Hourly(5));
+            return ValidateCron(Get(s.EmbyContentSync, Cron.Hourly(5)));
         }
+
         public static string PlexContent(JobSettings s)
         {
-            return Get(s.PlexContentSync, Cron.Daily(2));
+            return ValidateCron(Get(s.PlexContentSync, Cron.Daily(2)));
         }
+
         public static string PlexRecentlyAdded(JobSettings s)
         {
-            return Get(s.PlexRecentlyAddedSync, Cron.MinuteInterval(30));
+            return ValidateCron(Get(s.PlexRecentlyAddedSync, Cron.MinuteInterval(30)));
         }
+
         public static string CouchPotato(JobSettings s)
         {
-            return Get(s.CouchPotatoSync, Cron.Hourly(30));
+            return ValidateCron(Get(s.CouchPotatoSync, Cron.Hourly(30)));
         }
 
         public static string Updater(JobSettings s)
         {
-            return Get(s.AutomaticUpdater, Cron.HourInterval(6));
+            return ValidateCron(Get(s.AutomaticUpdater, Cron.HourInterval(6)));
         }
+
         public static string UserImporter(JobSettings s)
         {
-            return Get(s.UserImporter, Cron.Daily());
+            return ValidateCron(Get(s.UserImporter, Cron.Daily()));
         }
+
         public static string Newsletter(JobSettings s)
         {
-            return Get(s.Newsletter, Cron.Weekly(Helpers.DayOfWeek.Friday, 12));
+            return ValidateCron(Get(s.Newsletter, Cron.Weekly(Helpers.DayOfWeek.Friday, 12)));
         }
+
         public static string SickRageSync(JobSettings s)
         {
-            return Get(s.SickRageSync, Cron.Hourly(35));
+            return ValidateCron(Get(s.SickRageSync, Cron.Hourly(35)));
         }
+
         public static string RefreshMetadata(JobSettings s)
         {
-            return Get(s.RefreshMetadata, Cron.DayInterval(3));
+            return ValidateCron(Get(s.RefreshMetadata, Cron.DayInterval(3)));
         }
+
         public static string LidarrArtistSync(JobSettings s)
         {
-            return Get(s.LidarrArtistSync, Cron.Hourly(40));
+            return ValidateCron(Get(s.LidarrArtistSync, Cron.Hourly(40)));
         }
 
         public static string IssuePurge(JobSettings s)
         {
-            return Get(s.IssuesPurge, Cron.Daily());
+            return ValidateCron(Get(s.IssuesPurge, Cron.Daily()));
         }
+
         public static string ResendFailedRequests(JobSettings s)
         {
-            return Get(s.RetryRequests, Cron.Daily(6));
+            return ValidateCron(Get(s.RetryRequests, Cron.Daily(6)));
         }
+
         public static string MediaDatabaseRefresh(JobSettings s)
         {
-            return Get(s.MediaDatabaseRefresh, Cron.DayInterval(5));
+            return ValidateCron(Get(s.MediaDatabaseRefresh, Cron.DayInterval(5)));
         }
+
         private static string Get(string settings, string defaultCron)
         {
             return settings.HasValue() ? settings : defaultCron;
         }
+
+        private const string _defaultCron = "0 0 12 1/1 * ? *";
+
+        private static string ValidateCron(string cron)
+        {
+            if (CronExpression.IsValidExpression(cron))
+            {
+                return cron;
+            }
+            return _defaultCron;
+        }
     }
 }

src/Ombi/Controllers/JobController.cs

@@ -22,27 +22,14 @@ namespace Ombi.Controllers
     [ApiController]
     public class JobController : ControllerBase
     {
-        public JobController(IOmbiAutomaticUpdater updater, IPlexUserImporter userImporter,
+        public JobController(IOmbiAutomaticUpdater updater, ICacheService mem)
-            ICacheService mem, IEmbyUserImporter embyImporter, IPlexContentSync plexContentSync,
-            IEmbyContentSync embyContentSync, INewsletterJob newsletter)
         {
             _updater = updater;
-            _plexUserImporter = userImporter;
-            _embyUserImporter = embyImporter;
             _memCache = mem;
-            _plexContentSync = plexContentSync;
-            _embyContentSync = embyContentSync;
-            _newsletterJob = newsletter;
         }
 
         private readonly IOmbiAutomaticUpdater _updater;
-        private readonly IPlexUserImporter _plexUserImporter;
-        private readonly IEmbyUserImporter _embyUserImporter;
         private readonly ICacheService _memCache;
-        private readonly IPlexContentSync _plexContentSync;
-        private readonly IEmbyContentSync _embyContentSync;
-        private readonly INewsletterJob _newsletterJob;
-
         /// <summary>
         /// Runs the update job
         /// </summary>