merge

README.md

@@ -9,6 +9,15 @@ ____
 [![Patreon](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://patreon.com/tidusjar/Ombi)
 [![Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://paypal.me/PlexRequestsNet)
 
+___
+
+[![Twitter](https://img.shields.io/twitter/follow/tidusjar.svg?style=social)](https://twitter.com/intent/follow?screen_name=tidusjar)
+
+Follow me developing Ombi!
+
+[![Twitch](https://img.shields.io/badge/Twitch-Watch-blue.svg?style=flat-square&logo=twitch)](https://www.twitch.tv/tidusjar)
+
+
 ___
 <a href='https://play.google.com/store/apps/details?id=com.tidusjar.Ombi&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img width="150"   alt='Get it on Google Play' src='https://play.google.com/intl/en_gb/badges/images/generic/en_badge_web_generic.png'/></a>
 

src/Ombi.Api.Lidarr/ILidarrApi.cs

@@ -23,5 +23,6 @@ namespace Ombi.Api.Lidarr
         Task<List<LanguageProfiles>> GetLanguageProfile(string apiKey, string baseUrl);
         Task<LidarrStatus> Status(string apiKey, string baseUrl);
         Task<CommandResult> AlbumSearch(int[] albumIds, string apiKey, string baseUrl);
+        Task<AlbumResponse> AlbumInformation(string albumId, string apiKey, string baseUrl);
     }
 }

src/Ombi.Api.Lidarr/LidarrApi.cs

@@ -105,6 +105,32 @@ namespace Ombi.Api.Lidarr
             return Api.Request<List<AlbumResponse>>(request);
         }
 
+        public async Task<AlbumResponse> AlbumInformation(string albumId, string apiKey, string baseUrl)
+        {
+            var request = new Request($"{ApiVersion}/album", baseUrl, HttpMethod.Get);
+            request.AddQueryString("foreignAlbumId", albumId);
+            AddHeaders(request, apiKey);
+            var albums = await Api.Request<List<AlbumResponse>>(request);
+            return albums.Where(x => x.foreignAlbumId.Equals(albumId, StringComparison.InvariantCultureIgnoreCase))
+                .FirstOrDefault();
+        }
+
+
+        /// <summary>
+        /// THIS ONLY SUPPORTS ALBUMS THAT THE ARTIST IS IN LIDARR
+        /// </summary>
+        /// <param name="albumId"></param>
+        /// <param name="apiKey"></param>
+        /// <param name="baseUrl"></param>
+        /// <returns></returns>
+        public Task<List<LidarrTrack>> GetTracksForAlbum(int albumId, string apiKey, string baseUrl)
+        {
+            var request = new Request($"{ApiVersion}/album", baseUrl, HttpMethod.Get);
+            request.AddQueryString("albumId", albumId.ToString());
+            AddHeaders(request, apiKey);
+            return Api.Request<List<LidarrTrack>>(request);
+        }
+
         public Task<ArtistResult> AddArtist(ArtistAdd artist, string apiKey, string baseUrl)
         {
             var request = new Request($"{ApiVersion}/artist", baseUrl, HttpMethod.Post);

src/Ombi.Api.Lidarr/Models/AlbumLookup.cs

@@ -1,10 +1,15 @@
 using System;
+using System.Collections.Generic;
 
 namespace Ombi.Api.Lidarr.Models
 {
     public class AlbumLookup
     {
         public string title { get; set; }
+        public string status { get; set; }
+        public string artistType { get; set; }
+        public string disambiguation { get; set; }
+        public List<LidarrLinks> links { get; set; }
         public int artistId { get; set; }
         public string foreignAlbumId { get; set; }
         public bool monitored { get; set; }

src/Ombi.Api.Lidarr/Models/LidarrLinks.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ombi.Api.Lidarr.Models
+{
+    public class LidarrLinks
+    {
+        public string url { get; set; }
+        public string name { get; set; }
+    }
+}

src/Ombi.Api.Lidarr/Models/LidarrRatings.cs

@@ -0,0 +1,8 @@
+namespace Ombi.Api.Lidarr.Models
+{
+    public class LidarrRatings
+    {
+        public int votes { get; set; }
+        public decimal value { get; set; }
+    }
+}

src/Ombi.Api.Lidarr/Models/LidarrTrack.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ombi.Api.Lidarr.Models
+{
+    public class LidarrTrack
+    {
+        public int artistId { get; set; }
+        public int trackFileId { get; set; }
+        public int albumId { get; set; }
+        public bool _explicit { get; set; }
+        public int absoluteTrackNumber { get; set; }
+        public string trackNumber { get; set; }
+        public string title { get; set; }
+        public int duration { get; set; }
+        public int mediumNumber { get; set; }
+        public bool hasFile { get; set; }
+        public bool monitored { get; set; }
+        public int id { get; set; }
+    }
+}

src/Ombi.Core/Engine/Interfaces/IMusicSearchEngine.cs

@@ -12,5 +12,6 @@ namespace Ombi.Core.Engine
         Task<IEnumerable<SearchAlbumViewModel>> GetArtistAlbums(string foreignArtistId);
         Task<IEnumerable<SearchAlbumViewModel>> SearchAlbum(string search);
         Task<IEnumerable<SearchArtistViewModel>> SearchArtist(string search);
+        Task<SearchAlbumViewModel> GetAlbumInformation(string foreignAlbumId);
     }
 }

src/Ombi.Core/Engine/MusicSearchEngine.cs

@@ -60,6 +60,18 @@ namespace Ombi.Core.Engine
             return vm;
         }
 
+        public async Task<SearchAlbumViewModel> GetAlbumInformation(string foreignAlbumId)
+        {
+            var settings = await GetSettings();
+            var result = await _lidarrApi.AlbumInformation(foreignAlbumId, settings.ApiKey, settings.FullUri);
+
+
+            var vm = await MapIntoAlbumVm(result, settings);
+
+
+            return vm;
+        }
+
         /// <summary>
         /// Searches the specified artist
         /// </summary>
@@ -143,6 +155,48 @@ namespace Ombi.Core.Engine
             return vm;
         }
 
+
+        // TODO
+        private async Task<SearchAlbumViewModel> MapIntoAlbumVm(AlbumResponse a, LidarrSettings settings)
+        {
+            var vm = new SearchAlbumViewModel
+            {
+                ForeignAlbumId = a.foreignAlbumId,
+                Monitored = a.monitored,
+                Rating = a.ratings?.value ?? 0m,
+                ReleaseDate = a.releaseDate,
+                Title = a.title,
+                Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url?.Replace("http", "https"),
+                Genres = a.genres
+            };
+            if (a.artistId > 0)
+            {
+                //TODO THEY HAVE FIXED THIS IN DEV
+                // The JSON is different for some stupid reason
+                // Need to lookup the artist now and all the images -.-"
+                var artist = await _lidarrApi.GetArtist(a.artistId, settings.ApiKey, settings.FullUri);
+                vm.ArtistName = artist.artistName;
+                vm.ForeignArtistId = artist.foreignArtistId;
+            }
+            else
+            {
+                //vm.ForeignArtistId = a.artistId?.foreignArtistId;
+                //vm.ArtistName = a.artist?.artistName;
+            }
+
+            vm.Cover = a.images?.FirstOrDefault(x => x.coverType.Equals("cover"))?.url?.Replace("http", "https");
+            if (vm.Cover.IsNullOrEmpty())
+            {
+                //vm.Cover = a.remoteCover;
+            }
+
+            await Rules.StartSpecificRules(vm, SpecificRules.LidarrAlbum);
+
+            await RunSearchRules(vm);
+
+            return vm;
+        }
+
         private async Task<SearchAlbumViewModel> MapIntoAlbumVm(AlbumLookup a, LidarrSettings settings)
         {
             var vm = new SearchAlbumViewModel
@@ -152,7 +206,8 @@ namespace Ombi.Core.Engine
                 Rating = a.ratings?.value ?? 0m,
                 ReleaseDate = a.releaseDate,
                 Title = a.title,
-                Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url
+                Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url?.Replace("http", "https"),
+                Genres = a.genres
             };
             if (a.artistId > 0)
             {
@@ -169,7 +224,7 @@ namespace Ombi.Core.Engine
                 vm.ArtistName = a.artist?.artistName;
             }
 
-            vm.Cover = a.images?.FirstOrDefault(x => x.coverType.Equals("cover"))?.url;
+            vm.Cover = a.images?.FirstOrDefault(x => x.coverType.Equals("cover"))?.url?.Replace("http", "https");
             if (vm.Cover.IsNullOrEmpty())
             {
                 vm.Cover = a.remoteCover;

src/Ombi.Core/Models/Search/SearchAlbumViewModel.cs

@@ -16,8 +16,13 @@ namespace Ombi.Core.Models.Search
         public string Cover { get; set; }
         public string Disk { get; set; }
         public decimal PercentOfTracks { get; set; }
+        public object[] Genres { get; set; }
         public override RequestType Type => RequestType.Album;
         public bool PartiallyAvailable => PercentOfTracks != 100 && PercentOfTracks > 0;
         public bool FullyAvailable => PercentOfTracks == 100;
+
+
+        // Below is from the INFO call NEED A SEPERATE VM FOR THIS IN V4 TODO
+        // TODO ADD TRACK COUNT
     }
 }

src/Ombi.Core/Senders/MusicSender.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using EnsureThat;
 using Microsoft.Extensions.Logging;
 using Ombi.Api.Lidarr;
 using Ombi.Api.Lidarr.Models;
@@ -87,6 +88,11 @@ namespace Ombi.Core.Senders
 
             if (artist == null || artist.id <= 0)
             {
+                EnsureArg.IsNotNullOrEmpty(model.ForeignArtistId, nameof(model.ForeignArtistId));
+                EnsureArg.IsNotNullOrEmpty(model.ForeignAlbumId, nameof(model.ForeignAlbumId));
+                EnsureArg.IsNotNullOrEmpty(model.ArtistName, nameof(model.ArtistName));
+                EnsureArg.IsNotNullOrEmpty(rootFolderPath, nameof(rootFolderPath));
+
                 // Create artist
                 var newArtist = new ArtistAdd
                 {

src/Ombi.DependencyInjection/IocExtensions.cs

@@ -61,6 +61,8 @@ using Ombi.Schedule.Jobs.Lidarr;
 using Ombi.Schedule.Jobs.Plex.Interfaces;
 using Ombi.Schedule.Jobs.SickRage;
 using Ombi.Schedule.Processor;
+using Ombi.Store.Entities;
+using Quartz.Spi;
 
 namespace Ombi.DependencyInjection
 {
@@ -190,6 +192,7 @@ namespace Ombi.DependencyInjection
 
         public static void RegisterJobs(this IServiceCollection services)
         {
+            services.AddTransient<IJobFactory, IoCJobFactory>(provider => new IoCJobFactory(provider));
             services.AddTransient<IBackgroundJobClient, BackgroundJobClient>();
 
             services.AddTransient<IPlexContentSync, PlexContentSync>();

src/Ombi.Helpers/CacheService.cs

@@ -28,18 +28,15 @@ namespace Ombi.Helpers
                 return result;
             }
 
-            //using (await _mutex.LockAsync())
+            if (_memoryCache.TryGetValue(cacheKey, out result))
             {
-                if (_memoryCache.TryGetValue(cacheKey, out result))
-                {
-                    return result;
-                }
-
-                result = await factory();
-                _memoryCache.Set(cacheKey, result, absoluteExpiration);
-
                 return result;
             }
+
+            result = await factory();
+            _memoryCache.Set(cacheKey, result, absoluteExpiration);
+
+            return result;
         }
 
         public void Remove(string key)
@@ -47,34 +44,34 @@ namespace Ombi.Helpers
             _memoryCache.Remove(key);
         }
 
-        
+
-           
+
-            public T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTime absoluteExpiration)
+        public T GetOrAdd<T>(string cacheKey, Func<T> factory, DateTime absoluteExpiration)
+        {
+            // locks get and set internally
+            if (_memoryCache.TryGetValue<T>(cacheKey, out var result))
             {
-                // locks get and set internally
+                return result;
-                if (_memoryCache.TryGetValue<T>(cacheKey, out var result))
+            }
+
+            lock (TypeLock<T>.Lock)
+            {
+                if (_memoryCache.TryGetValue(cacheKey, out result))
                 {
                     return result;
                 }
 
-                lock (TypeLock<T>.Lock)
+                result = factory();
-                {
+                _memoryCache.Set(cacheKey, result, absoluteExpiration);
-                    if (_memoryCache.TryGetValue(cacheKey, out result))
-                    {
-                        return result;
-                    }
 
-                    result = factory();
+                return result;
-                    _memoryCache.Set(cacheKey, result, absoluteExpiration);
-
-                    return result;
-                }
             }
+        }
+
+        private static class TypeLock<T>
+        {
+            public static object Lock { get; } = new object();
+        }
 
-            private static class TypeLock<T>
-            {
-                public static object Lock { get; } = new object();
-            }
-        
     }
 }

src/Ombi.Helpers/Cron.cs

@@ -16,7 +16,6 @@
     // You should have received a copy of the GNU Lesser General Public 
     // License along with Hangfire. If not, see <http://www.gnu.org/licenses/>.
 
-    using System;
     /// <summary>
     /// Helper class that provides common values for the cron expressions.
     /// </summary>
@@ -44,7 +43,7 @@
         /// <param name="minute">The minute in which the schedule will be activated (0-59).</param>
         public static string Hourly(int minute)
         {
-            return $"{minute} * * * *";
+            return $"0 {minute} 0/1 1/1 * ? *";
         }
 
         /// <summary>
@@ -73,7 +72,7 @@
         /// <param name="minute">The minute in which the schedule will be activated (0-59).</param>
         public static string Daily(int hour, int minute)
         {
-            return $"{minute} {hour} * * *";
+            return $"0 {minute} {hour} 1/1 * ? *";
         }
 
         /// <summary>
@@ -114,7 +113,7 @@
         /// <param name="minute">The minute in which the schedule will be activated (0-59).</param>
         public static string Weekly(DayOfWeek dayOfWeek, int hour, int minute)
         {
-            return $"{minute} {hour} * * {(int)dayOfWeek}";
+            return $"0 {minute} {hour} ? * {(int)dayOfWeek} *";
         }
 
         /// <summary>
@@ -219,7 +218,7 @@
         /// <param name="interval">The number of minutes to wait between every activation.</param>
         public static string MinuteInterval(int interval)
         {
-            return $"*/{interval} * * * *";
+            return $"0 0/{interval} * 1/1 * ? *";
         }
 
         /// <summary>
@@ -228,7 +227,7 @@
         /// <param name="interval">The number of hours to wait between every activation.</param>
         public static string HourInterval(int interval)
         {
-            return $"0 */{interval} * * *";
+            return $"0 0 0/{interval} 1/1 * ? *";
         }
 
         /// <summary>
@@ -237,7 +236,7 @@
         /// <param name="interval">The number of days to wait between every activation.</param>
         public static string DayInterval(int interval)
         {
-            return $"0 0 */{interval} * *";
+            return $"0 0 12 1/{interval} * ? *";
         }
 
         /// <summary>
@@ -249,4 +248,39 @@
             return $"0 0 1 */{interval} *";
         }
     }
+
+    //
+    // Summary:
+    //     Specifies the day of the week.
+    public enum DayOfWeek
+    {
+        //
+        // Summary:
+        //     Indicates Sunday.
+        Sunday = 1,
+        //
+        // Summary:
+        //     Indicates Monday.
+        Monday = 2,
+        //
+        // Summary:
+        //     Indicates Tuesday.
+        Tuesday = 3,
+        //
+        // Summary:
+        //     Indicates Wednesday.
+        Wednesday = 4,
+        //
+        // Summary:
+        //     Indicates Thursday.
+        Thursday = 5,
+        //
+        // Summary:
+        //     Indicates Friday.
+        Friday = 6,
+        //
+        // Summary:
+        //     Indicates Saturday.
+        Saturday = 7
+    }
 }

src/Ombi.Schedule.Tests/IssuesPurgeTests.cs

@@ -32,7 +32,7 @@ namespace Ombi.Schedule.Tests
         [Test]
         public async Task DoesNotRun_WhenDisabled()
         {
-            await Job.Start();
+            await Job.Execute(null);
             Repo.Verify(x => x.GetAll(),Times.Never);
         }
 
@@ -49,8 +49,8 @@ namespace Ombi.Schedule.Tests
             };
 
             Settings.Setup(x => x.GetSettingsAsync()).ReturnsAsync(new IssueSettings { DeleteIssues = true, DaysAfterResolvedToDelete = 5 });
-            Repo.Setup(x => x.GetAll()).Returns(issues.AsQueryable());
+            Repo.Setup(x => x.GetAll()).Returns(new EnumerableQuery<Issues>(issues));
-            await Job.Start();
+            await Job.Execute(null);
 
             Assert.That(issues.First().Status, Is.EqualTo(IssueStatus.Deleted));
             Repo.Verify(x => x.SaveChangesAsync(), Times.Once);
@@ -75,7 +75,7 @@ namespace Ombi.Schedule.Tests
 
             Settings.Setup(x => x.GetSettingsAsync()).ReturnsAsync(new IssueSettings { DeleteIssues = true, DaysAfterResolvedToDelete = 5 });
             Repo.Setup(x => x.GetAll()).Returns(new EnumerableQuery<Issues>(issues));
-            await Job.Start();
+            await Job.Execute(null);
 
             Assert.That(issues[0].Status, Is.Not.EqualTo(IssueStatus.Deleted));
             Assert.That(issues[1].Status, Is.EqualTo(IssueStatus.Deleted));

src/Ombi.Schedule.Tests/OmbiQuartzTests.cs

@@ -0,0 +1,36 @@
+using Moq;
+using NUnit.Framework;
+using Quartz;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ombi.Schedule.Tests
+{
+    [TestFixture]
+    public class OmbiQuartzTests
+    {
+
+        [Test]
+        [Ignore("Cannot get this to work")]
+        public async Task Test()
+        {
+            var scheduleMock = new Mock<IScheduler>();
+            scheduleMock.Setup(x => x.TriggerJob(It.IsAny<JobKey>(),
+                It.IsAny<CancellationToken>()));
+            var sut = new QuartzMock(scheduleMock);
+
+            //await QuartzMock.TriggerJob("ABC");
+
+            scheduleMock.Verify(x => x.TriggerJob(It.Is<JobKey>(j => j.Name == "ABC"), 
+                default(CancellationToken)), Times.Once);
+        }
+    }
+    public class QuartzMock : OmbiQuartz
+    {
+        public QuartzMock(Mock<IScheduler> mock)
+        {
+            _instance = this;
+            _scheduler = mock.Object;
+        }
+    }
+}

src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs

@@ -47,7 +47,7 @@ namespace Ombi.Schedule.Tests
             _movie.Setup(x => x.GetAll()).Returns(new List<MovieRequests> { request }.AsQueryable());
             _repo.Setup(x => x.Get("test")).ReturnsAsync(new PlexServerContent());
 
-            await Checker.Start();
+            await Checker.Execute(null);
 
             _movie.Verify(x => x.Save(), Times.Once);
 
@@ -63,8 +63,8 @@ namespace Ombi.Schedule.Tests
             };
             _movie.Setup(x => x.GetAll()).Returns(new List<MovieRequests> { request }.AsQueryable());
 
-            await Checker.Start();
+            await Checker.Execute(null);
-            
+
             Assert.False(request.Available);
         }
 
@@ -111,7 +111,7 @@ namespace Ombi.Schedule.Tests
             }.AsQueryable().BuildMock().Object);
             _repo.Setup(x => x.Include(It.IsAny<IQueryable<PlexEpisode>>(),It.IsAny<Expression<Func<PlexEpisode, PlexServerContent>>>()));
 
-            await Checker.Start();
+            await Checker.Execute(null);
 
             _tv.Verify(x => x.Save(), Times.Once);
 

src/Ombi.Schedule/IocJobFactory.cs

@@ -0,0 +1,32 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Quartz;
+using Quartz.Spi;
+
+namespace Ombi.Schedule
+{
+    public class IoCJobFactory : IJobFactory
+    {
+        private readonly IServiceProvider _factory;
+
+        public IoCJobFactory(IServiceProvider factory)
+        {
+            _factory = factory;
+        }
+        public IJob NewJob(TriggerFiredBundle bundle, IScheduler scheduler)
+        {
+            var scopeFactory = _factory.GetService<IServiceScopeFactory>();
+            var scope = scopeFactory.CreateScope();
+            var scopedContainer = scope.ServiceProvider;
+
+            var implementation = scopedContainer.GetRequiredService(bundle.JobDetail.JobType) as IJob;
+            return implementation;
+        }
+
+        public void ReturnJob(IJob job)
+        {
+            var disposable = job as IDisposable;
+            disposable?.Dispose();
+        }
+    }
+}

src/Ombi.Schedule/JobSetup.cs

@@ -65,24 +65,24 @@ namespace Ombi.Schedule
         {
             var s = _jobSettings.GetSettings();
 
-            RecurringJob.AddOrUpdate(() => _embyContentSync.Start(), JobSettingsHelper.EmbyContent(s));
+           // RecurringJob.AddOrUpdate(() => _embyContentSync.Start(), JobSettingsHelper.EmbyContent(s));
-            RecurringJob.AddOrUpdate(() => _sonarrSync.Start(), JobSettingsHelper.Sonarr(s));
+           // RecurringJob.AddOrUpdate(() => _sonarrSync.Start(), JobSettingsHelper.Sonarr(s));
-            RecurringJob.AddOrUpdate(() => _radarrSync.CacheContent(), JobSettingsHelper.Radarr(s));
+           // RecurringJob.AddOrUpdate(() => _radarrSync.CacheContent(), JobSettingsHelper.Radarr(s));
-            RecurringJob.AddOrUpdate(() => _plexContentSync.CacheContent(false), JobSettingsHelper.PlexContent(s));
+           // //RecurringJob.AddOrUpdate(() => _plexContentSync.Execute(null), JobSettingsHelper.PlexContent(s));
-            RecurringJob.AddOrUpdate(() => _plexRecentlyAddedSync.Start(), JobSettingsHelper.PlexRecentlyAdded(s));
+           // //RecurringJob.AddOrUpdate(() => _plexRecentlyAddedSync.Start(), JobSettingsHelper.PlexRecentlyAdded(s));
-            RecurringJob.AddOrUpdate(() => _cpCache.Start(), JobSettingsHelper.CouchPotato(s));
+           // RecurringJob.AddOrUpdate(() => _cpCache.Start(), JobSettingsHelper.CouchPotato(s));
-            RecurringJob.AddOrUpdate(() => _srSync.Start(), JobSettingsHelper.SickRageSync(s));
+           // RecurringJob.AddOrUpdate(() => _srSync.Start(), JobSettingsHelper.SickRageSync(s));
-            RecurringJob.AddOrUpdate(() => _refreshMetadata.Start(), JobSettingsHelper.RefreshMetadata(s));
+           // RecurringJob.AddOrUpdate(() => _refreshMetadata.Start(), JobSettingsHelper.RefreshMetadata(s));
-            RecurringJob.AddOrUpdate(() => _lidarrArtistSync.CacheContent(), JobSettingsHelper.LidarrArtistSync(s));
+           // RecurringJob.AddOrUpdate(() => _lidarrArtistSync.CacheContent(), JobSettingsHelper.LidarrArtistSync(s));
-            RecurringJob.AddOrUpdate(() => _issuesPurge.Start(), JobSettingsHelper.IssuePurge(s));
+           // RecurringJob.AddOrUpdate(() => _issuesPurge.Start(), JobSettingsHelper.IssuePurge(s));
 
-            RecurringJob.AddOrUpdate(() => _updater.Update(null), JobSettingsHelper.Updater(s));
+           // RecurringJob.AddOrUpdate(() => _updater.Update(null), JobSettingsHelper.Updater(s));
 
-            RecurringJob.AddOrUpdate(() => _embyUserImporter.Start(), JobSettingsHelper.UserImporter(s));
+           // RecurringJob.AddOrUpdate(() => _embyUserImporter.Start(), JobSettingsHelper.UserImporter(s));
-            RecurringJob.AddOrUpdate(() => _plexUserImporter.Start(), JobSettingsHelper.UserImporter(s));
+           // RecurringJob.AddOrUpdate(() => _plexUserImporter.Start(), JobSettingsHelper.UserImporter(s));
-            RecurringJob.AddOrUpdate(() => _newsletter.Start(), JobSettingsHelper.Newsletter(s));
+           // RecurringJob.AddOrUpdate(() => _newsletter.Start(), JobSettingsHelper.Newsletter(s));
-            RecurringJob.AddOrUpdate(() => _resender.Start(), JobSettingsHelper.ResendFailedRequests(s));
+           //// RecurringJob.AddOrUpdate(() => _resender.Start(), JobSettingsHelper.ResendFailedRequests(s));
-            RecurringJob.AddOrUpdate(() => _mediaDatabaseRefresh.Start(), JobSettingsHelper.MediaDatabaseRefresh(s));
+           // RecurringJob.AddOrUpdate(() => _mediaDatabaseRefresh.Start(), JobSettingsHelper.MediaDatabaseRefresh(s));
         }
 
         private bool _disposed;
@@ -93,7 +93,6 @@ namespace Ombi.Schedule
 
             if (disposing)
             {
-                _plexContentSync?.Dispose();
                 _radarrSync?.Dispose();
                 _updater?.Dispose();
                 _plexUserImporter?.Dispose();

src/Ombi.Schedule/Jobs/Couchpotato/CouchPotatoSync.cs

@@ -36,6 +36,7 @@ using Ombi.Helpers;
 using Ombi.Settings.Settings.Models.External;
 using Ombi.Store.Context;
 using Ombi.Store.Entities;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Couchpotato
 {
@@ -56,7 +57,7 @@ namespace Ombi.Schedule.Jobs.Couchpotato
         private readonly ILogger<CouchPotatoSync> _log;
         private readonly IExternalContext _ctx;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             var settings = await _settings.GetSettingsAsync();
             if (!settings.Enabled)

src/Ombi.Schedule/Jobs/Couchpotato/ICouchPotatoSync.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Couchpotato
 {
     public interface ICouchPotatoSync : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs

@@ -37,6 +37,7 @@ using Ombi.Notifications.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
 using Ombi.Store.Repository.Requests;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Emby
 {
@@ -58,7 +59,7 @@ namespace Ombi.Schedule.Jobs.Emby
         private readonly INotificationService _notificationService;
         private readonly ILogger<EmbyAvaliabilityChecker> _log;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             await ProcessMovies();
             await ProcessTv();

src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs

@@ -12,6 +12,7 @@ using Ombi.Helpers;
 using Ombi.Schedule.Jobs.Ombi;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Quartz;
 using Serilog;
 using EmbyMediaType = Ombi.Store.Entities.EmbyMediaType;
 
@@ -20,25 +21,21 @@ namespace Ombi.Schedule.Jobs.Emby
     public class EmbyContentSync : IEmbyContentSync
     {
         public EmbyContentSync(ISettingsService<EmbySettings> settings, IEmbyApi api, ILogger<EmbyContentSync> logger,
-            IEmbyContentRepository repo, IEmbyEpisodeSync epSync, IRefreshMetadata metadata)
+            IEmbyContentRepository repo)
         {
             _logger = logger;
             _settings = settings;
             _api = api;
             _repo = repo;
-            _episodeSync = epSync;
-            _metadata = metadata;
         }
 
         private readonly ILogger<EmbyContentSync> _logger;
         private readonly ISettingsService<EmbySettings> _settings;
         private readonly IEmbyApi _api;
         private readonly IEmbyContentRepository _repo;
-        private readonly IEmbyEpisodeSync _episodeSync;
-        private readonly IRefreshMetadata _metadata;
 
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             var embySettings = await _settings.GetSettingsAsync();
             if (!embySettings.Enable)
@@ -57,8 +54,9 @@ namespace Ombi.Schedule.Jobs.Emby
             }
 
             // Episodes
-            BackgroundJob.Enqueue(() => _episodeSync.Start());
+
-            BackgroundJob.Enqueue(() => _metadata.Start());
+            await OmbiQuartz.TriggerJob(nameof(IEmbyEpisodeSync), "Emby");
+            await OmbiQuartz.TriggerJob(nameof(IRefreshMetadata), "Emby");
         }
 
 

src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs

@@ -36,29 +36,27 @@ using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Emby
 {
     public class EmbyEpisodeSync : IEmbyEpisodeSync
     {
-        public EmbyEpisodeSync(ISettingsService<EmbySettings> s, IEmbyApi api, ILogger<EmbyEpisodeSync> l, IEmbyContentRepository repo,
+        public EmbyEpisodeSync(ISettingsService<EmbySettings> s, IEmbyApi api, ILogger<EmbyEpisodeSync> l, IEmbyContentRepository repo)
-            IEmbyAvaliabilityChecker checker)
         {
             _api = api;
             _logger = l;
             _settings = s;
             _repo = repo;
-            _avaliabilityChecker = checker;
         }
 
         private readonly ISettingsService<EmbySettings> _settings;
         private readonly IEmbyApi _api;
         private readonly ILogger<EmbyEpisodeSync> _logger;
         private readonly IEmbyContentRepository _repo;
-        private readonly IEmbyAvaliabilityChecker _avaliabilityChecker;
 
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             var settings = await _settings.GetSettingsAsync();
 
@@ -67,7 +65,8 @@ namespace Ombi.Schedule.Jobs.Emby
                 await CacheEpisodes(server);
             }
 
-            BackgroundJob.Enqueue(() => _avaliabilityChecker.Start());
+
+            await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby");
         }
 
         private async Task CacheEpisodes(EmbyServers server)
@@ -142,7 +141,6 @@ namespace Ombi.Schedule.Jobs.Emby
             {
                 _settings?.Dispose();
                 _repo?.Dispose();
-                _avaliabilityChecker?.Dispose();
             }
             _disposed = true;
         }

src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs

@@ -37,6 +37,7 @@ using Ombi.Core.Settings.Models.External;
 using Ombi.Helpers;
 using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Emby
 {
@@ -58,7 +59,7 @@ namespace Ombi.Schedule.Jobs.Emby
         private readonly ISettingsService<EmbySettings> _embySettings;
         private readonly ISettingsService<UserManagementSettings> _userManagementSettings;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             var userManagementSettings = await _userManagementSettings.GetSettingsAsync();
             if (!userManagementSettings.ImportEmbyUsers)

src/Ombi.Schedule/Jobs/Emby/IEmbyAvaliabilityChecker.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Emby
 {
     public interface IEmbyAvaliabilityChecker : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Emby/IEmbyContentSync.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Emby
 {
     public interface IEmbyContentSync : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Emby/IEmbyEpisodeSync.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Emby
 {
     public interface IEmbyEpisodeSync : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Emby/IEmbyUserImporter.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Emby
 {
     public interface IEmbyUserImporter : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/IBaseJob.cs

@@ -25,11 +25,12 @@
 //  ************************************************************************/
 #endregion
 
+using Quartz;
 using System;
 
 namespace Ombi.Schedule
 {
-    public interface IBaseJob : IDisposable
+    public interface IBaseJob : IJob, IDisposable
     {
         
     }

src/Ombi.Schedule/Jobs/Lidarr/ILidarrArtistSync.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Ombi.Store.Entities;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Lidarr
 {
-    public interface ILidarrArtistSync
+    public interface ILidarrArtistSync : IJob
     {
-        Task CacheContent();
         void Dispose();
         Task<IEnumerable<LidarrArtistCache>> GetCachedContent();
     }

src/Ombi.Schedule/Jobs/Lidarr/LidarrArtistSync.cs

@@ -11,6 +11,7 @@ using Ombi.Helpers;
 using Ombi.Settings.Settings.Models.External;
 using Ombi.Store.Context;
 using Ombi.Store.Entities;
+using Quartz;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace Ombi.Schedule.Jobs.Lidarr
@@ -35,7 +36,7 @@ namespace Ombi.Schedule.Jobs.Lidarr
         private readonly IBackgroundJobClient _job;
         private readonly ILidarrAlbumSync _albumSync;
         
-        public async Task CacheContent()
+        public async Task Execute(IJobExecutionContext job)
         {
             try
             {

src/Ombi.Schedule/Jobs/Ombi/Interfaces/IIssuesPurge.cs

@@ -3,7 +3,6 @@
 namespace Ombi.Schedule.Jobs.Ombi
 {
     public interface IIssuesPurge : IBaseJob
-    {
+    { 
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Ombi/Interfaces/IMediaDatabaseRefresh.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Plex.Interfaces
 {
     public interface IMediaDatabaseRefresh : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Ombi/Interfaces/INewsletterJob.cs

@@ -5,7 +5,6 @@ namespace Ombi.Schedule.Jobs.Ombi
 {
     public interface INewsletterJob : IBaseJob
     {
-        Task Start();
         Task Start(NewsletterSettings settings, bool test);
     }
 }

src/Ombi.Schedule/Jobs/Ombi/Interfaces/IOmbiAutomaticUpdater.cs

@@ -5,7 +5,6 @@ namespace Ombi.Schedule.Jobs.Ombi
 {
     public interface IOmbiAutomaticUpdater : IBaseJob
     {
-        Task Update(PerformContext context);
         string[] GetVersion();
         Task<bool> UpdateAvailable(string branch, string currentVersion);
     }

src/Ombi.Schedule/Jobs/Ombi/Interfaces/IRefreshMetadata.cs

@@ -5,7 +5,6 @@ namespace Ombi.Schedule.Jobs.Ombi
 {
     public interface IRefreshMetadata : IBaseJob
     {
-        Task Start();
         Task ProcessPlexServerContent(IEnumerable<int> contentIds);
     }
 }

src/Ombi.Schedule/Jobs/Ombi/Interfaces/IResendFailedRequests.cs

@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
+using Quartz;
+using System.Threading.Tasks;
 
 namespace Ombi.Schedule.Jobs.Ombi
 {
-    public interface IResendFailedRequests
+    public interface IResendFailedRequests : IJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Ombi/Interfaces/IWelcomeEmail.cs

@@ -3,7 +3,7 @@ using Ombi.Store.Entities;
 
 namespace Ombi.Schedule.Jobs.Ombi
 {
-    public interface IWelcomeEmail : IBaseJob
+    public interface IWelcomeEmail
     {
         Task SendEmail(OmbiUser user);
     }

src/Ombi.Schedule/Jobs/Ombi/Interfaces/IssuesPurge.cs

@@ -5,6 +5,7 @@ using Ombi.Core.Settings;
 using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Ombi
 {
@@ -20,7 +21,7 @@ namespace Ombi.Schedule.Jobs.Ombi
         private readonly IRepository<Issues> _issuesRepository;
         private readonly ISettingsService<IssueSettings> _settings;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             var settings = await _settings.GetSettingsAsync();
             if (!settings.DeleteIssues)

src/Ombi.Schedule/Jobs/Ombi/MediaDatabaseRefresh.cs

@@ -9,28 +9,28 @@ using Ombi.Helpers;
 using Ombi.Schedule.Jobs.Emby;
 using Ombi.Schedule.Jobs.Plex.Interfaces;
 using Ombi.Store.Repository;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Ombi
 {
     public class MediaDatabaseRefresh : IMediaDatabaseRefresh
     {
         public MediaDatabaseRefresh(ISettingsService<PlexSettings> s, ILogger<MediaDatabaseRefresh> log,
-            IPlexContentRepository plexRepo, IEmbyContentRepository embyRepo, IEmbyContentSync embySync)
+            IPlexContentRepository plexRepo, IEmbyContentRepository embyRepo)
         {
             _settings = s;
             _log = log;
             _plexRepo = plexRepo;
             _embyRepo = embyRepo;
-            _embyContentSync = embySync;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<PlexSettings> _settings;
         private readonly ILogger _log;
         private readonly IPlexContentRepository _plexRepo;
         private readonly IEmbyContentRepository _embyRepo;
-        private readonly IEmbyContentSync _embyContentSync;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             try
             {
@@ -59,7 +59,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 await _embyRepo.ExecuteSql(episodeSQL);
                 await _embyRepo.ExecuteSql(mainSql);
 
-                BackgroundJob.Enqueue(() => _embyContentSync.Start());
+                await OmbiQuartz.TriggerJob(nameof(IEmbyContentSync), "Emby");
             }
             catch (Exception e)
             {

src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs

@@ -26,6 +26,7 @@ using Ombi.Settings.Settings.Models.External;
 using Ombi.Settings.Settings.Models.Notifications;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Quartz;
 using ContentType = Ombi.Store.Entities.ContentType;
 
 namespace Ombi.Schedule.Jobs.Ombi
@@ -57,6 +58,10 @@ namespace Ombi.Schedule.Jobs.Ombi
             _ombiSettings = ombiSettings;
             _plexSettings = plexSettings;
             _embySettings = embySettings;
+            _ombiSettings.ClearCache();
+            _plexSettings.ClearCache();
+            _emailSettings.ClearCache();
+            _customizationSettings.ClearCache();
         }
 
         private readonly IPlexContentRepository _plex;
@@ -284,7 +289,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             }
         }
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             var newsletterSettings = await _newsletterSettings.GetSettingsAsync();
             await Start(newsletterSettings, false);

src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs

@@ -20,6 +20,7 @@ using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
 using Ombi.Updater;
+using Quartz;
 using SharpCompress.Readers;
 using SharpCompress.Readers.Tar;
 
@@ -41,7 +42,6 @@ namespace Ombi.Schedule.Jobs.Ombi
         private IChangeLogProcessor Processor { get; }
         private ISettingsService<UpdateSettings> Settings { get; }
         private readonly IProcessProvider _processProvider;
-        private static PerformContext Ctx { get; set; }
         private readonly IApplicationConfigRepository _appConfig;
 
         public string[] GetVersion()
@@ -59,10 +59,8 @@ namespace Ombi.Schedule.Jobs.Ombi
 
         }
 
-        [AutomaticRetry(Attempts = 1)]
+        public async Task Execute(IJobExecutionContext job)
-        public async Task Update(PerformContext c)
         {
-            Ctx = c;
             Logger.LogDebug(LoggingEvents.Updater, "Starting Update job");
 
             var settings = await Settings.GetSettingsAsync();
@@ -182,7 +180,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                         }
 
                         Logger.LogDebug(LoggingEvents.Updater, "Starting Download");
-                        await DownloadAsync(download.Url, zipDir, c);
+                        await DownloadAsync(download.Url, zipDir);
                         Logger.LogDebug(LoggingEvents.Updater, "Finished Download");
                     }
                     catch (Exception e)
@@ -321,7 +319,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             }
         }
 
-        public async Task DownloadAsync(string requestUri, string filename, PerformContext ctx)
+        public async Task DownloadAsync(string requestUri, string filename)
         {
             Logger.LogDebug(LoggingEvents.Updater, "Starting the DownloadAsync");
             using (var client = new WebClient())

src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs

@@ -15,6 +15,7 @@ using Ombi.Schedule.Jobs.Emby;
 using Ombi.Schedule.Jobs.Plex;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Ombi
 {
@@ -22,8 +23,7 @@ namespace Ombi.Schedule.Jobs.Ombi
     {
         public RefreshMetadata(IPlexContentRepository plexRepo, IEmbyContentRepository embyRepo,
             ILogger<RefreshMetadata> log, ITvMazeApi tvApi, ISettingsService<PlexSettings> plexSettings,
-            IMovieDbApi movieApi, ISettingsService<EmbySettings> embySettings, IPlexAvailabilityChecker plexAvailability, IEmbyAvaliabilityChecker embyAvaliability,
+            IMovieDbApi movieApi, ISettingsService<EmbySettings> embySettings, IEmbyApi embyApi)
-            IEmbyApi embyApi)
         {
             _plexRepo = plexRepo;
             _embyRepo = embyRepo;
@@ -32,15 +32,11 @@ namespace Ombi.Schedule.Jobs.Ombi
             _tvApi = tvApi;
             _plexSettings = plexSettings;
             _embySettings = embySettings;
-            _plexAvailabilityChecker = plexAvailability;
-            _embyAvaliabilityChecker = embyAvaliability;
             _embyApi = embyApi;
         }
 
         private readonly IPlexContentRepository _plexRepo;
         private readonly IEmbyContentRepository _embyRepo;
-        private readonly IPlexAvailabilityChecker _plexAvailabilityChecker;
-        private readonly IEmbyAvaliabilityChecker _embyAvaliabilityChecker;
         private readonly ILogger _log;
         private readonly IMovieDbApi _movieApi;
         private readonly ITvMazeApi _tvApi;
@@ -48,7 +44,7 @@ namespace Ombi.Schedule.Jobs.Ombi
         private readonly ISettingsService<EmbySettings> _embySettings;
         private readonly IEmbyApi _embyApi;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             _log.LogInformation("Starting the Metadata refresh");
             try
@@ -93,12 +89,12 @@ namespace Ombi.Schedule.Jobs.Ombi
             {
                 if (plexSettings.Enable)
                 {
-                    BackgroundJob.Enqueue(() => _plexAvailabilityChecker.Start());
+                    await OmbiQuartz.TriggerJob(nameof(IPlexAvailabilityChecker), "Plex");
                 }
 
                 if (embySettings.Enable)
                 {
-                    BackgroundJob.Enqueue(() => _embyAvaliabilityChecker.Start());
+                    await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby");
 
                 }
             }

src/Ombi.Schedule/Jobs/Ombi/ResendFailedRequests.cs

@@ -7,6 +7,7 @@ using Ombi.Core.Senders;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
 using Ombi.Store.Repository.Requests;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Ombi
 {
@@ -32,7 +33,7 @@ namespace Ombi.Schedule.Jobs.Ombi
         private readonly ITvRequestRepository _tvRequestRepository;
         private readonly IMusicRequestRepository _musicRequestRepository;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             // Get all the failed ones!
             var failedRequests = _requestQueue.GetAll().Where(x => !x.Completed.HasValue);

src/Ombi.Schedule/Jobs/Plex/Interfaces/IPlexAvailabilityChecker.cs

@@ -5,6 +5,5 @@ namespace Ombi.Schedule.Jobs.Plex
 {
     public interface IPlexAvailabilityChecker : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Plex/Interfaces/IPlexContentSync.cs

@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs
 {
-    public interface IPlexContentSync : IBaseJob
+    public interface IPlexContentSync : IJob
     {
-        Task CacheContent(bool recentlyAddedSearch = false);
     }
 }

src/Ombi.Schedule/Jobs/Plex/Interfaces/IPlexEpisodeSync.cs

@@ -9,7 +9,6 @@ namespace Ombi.Schedule.Jobs.Plex.Interfaces
 {
     public interface IPlexEpisodeSync : IBaseJob
     {
-        Task Start();
         Task<HashSet<PlexEpisode>> ProcessEpsiodes(Metadata[] episodes, IQueryable<PlexEpisode> currentEpisodes);
     }
 }

src/Ombi.Schedule/Jobs/Plex/Interfaces/IPlexUserImporter.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Plex
 {
     public interface IPlexUserImporter : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs

@@ -12,6 +12,7 @@ using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
 using Ombi.Store.Repository.Requests;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Plex
 {
@@ -35,7 +36,7 @@ namespace Ombi.Schedule.Jobs.Plex
         private readonly IBackgroundJobClient _backgroundJobClient;
         private readonly ILogger _log;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             try
             {

src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs

@@ -44,6 +44,7 @@ using Ombi.Schedule.Jobs.Plex.Interfaces;
 using Ombi.Schedule.Jobs.Plex.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Plex
 {
@@ -60,6 +61,7 @@ namespace Ombi.Schedule.Jobs.Plex
             Metadata = metadataRefresh;
             Checker = checker;
             Notification = hub;
+            Plex.ClearCache();
         }
 
         private ISettingsService<PlexSettings> Plex { get; }
@@ -71,9 +73,11 @@ namespace Ombi.Schedule.Jobs.Plex
         private IPlexAvailabilityChecker Checker { get; }
         private IHubContext<NotificationHub> Notification { get; set; }
 
-        public async Task CacheContent(bool recentlyAddedSearch = false)
+        public async Task Execute(IJobExecutionContext context)
         {
-           
+            JobDataMap dataMap = context.JobDetail.JobDataMap;
+            var recentlyAddedSearch = dataMap.GetBooleanValueFromString("recentlyAddedSearch");
+
             var plexSettings = await Plex.GetSettingsAsync();
             if (!plexSettings.Enable)
             {
@@ -111,18 +115,20 @@ namespace Ombi.Schedule.Jobs.Plex
             if (!recentlyAddedSearch)
             {
                 Logger.LogInformation("Starting EP Cacher");
-                BackgroundJob.Enqueue(() => EpisodeSync.Start());
+
+                await OmbiQuartz.TriggerJob(nameof(IPlexEpisodeSync), "Plex");
             }
 
             if ((processedContent?.HasProcessedContent ?? false) && recentlyAddedSearch)
             {
                 // Just check what we send it
-                BackgroundJob.Enqueue(() => Metadata.ProcessPlexServerContent(processedContent.Content));
+                await OmbiQuartz.TriggerJob(nameof(IMediaDatabaseRefresh), "System");
             }
 
             if ((processedContent?.HasProcessedEpisodes ?? false) && recentlyAddedSearch)
             {
-                BackgroundJob.Enqueue(() => Checker.Start());
+
+                await OmbiQuartz.TriggerJob(nameof(IPlexAvailabilityChecker), "Plex");
             }
 
             await Notification.Clients.Clients(NotificationHub.AdminConnectionIds)

src/Ombi.Schedule/Jobs/Plex/PlexEpisodeSync.cs

@@ -13,28 +13,28 @@ using Ombi.Helpers;
 using Ombi.Schedule.Jobs.Plex.Interfaces;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Plex
 {
     public class PlexEpisodeSync : IPlexEpisodeSync
     {
         public PlexEpisodeSync(ISettingsService<PlexSettings> s, ILogger<PlexEpisodeSync> log, IPlexApi plexApi,
-            IPlexContentRepository repo, IPlexAvailabilityChecker a)
+            IPlexContentRepository repo)
         {
             _settings = s;
             _log = log;
             _api = plexApi;
             _repo = repo;
-            _availabilityChecker = a;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<PlexSettings> _settings;
         private readonly ILogger<PlexEpisodeSync> _log;
         private readonly IPlexApi _api;
         private readonly IPlexContentRepository _repo;
-        private readonly IPlexAvailabilityChecker _availabilityChecker;
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             try
             {
@@ -55,7 +55,8 @@ namespace Ombi.Schedule.Jobs.Plex
                 _log.LogError(LoggingEvents.Cacher, e, "Caching Episodes Failed");
             }
 
-            BackgroundJob.Enqueue(() => _availabilityChecker.Start());
+
+            await OmbiQuartz.TriggerJob(nameof(IPlexAvailabilityChecker), "Plex");
         }
 
         private async Task Cache(PlexServers settings)

src/Ombi.Schedule/Jobs/Plex/PlexRecentlyAddedSync.cs

@@ -1,40 +1,40 @@
-using System;
+//using System;
-using System.Threading.Tasks;
+//using System.Threading.Tasks;
-using Hangfire;
+//using Hangfire;
 
-namespace Ombi.Schedule.Jobs.Plex
+//namespace Ombi.Schedule.Jobs.Plex
-{
+//{
-    public class PlexRecentlyAddedSync : IPlexRecentlyAddedSync
+//    public class PlexRecentlyAddedSync : IPlexRecentlyAddedSync
-    {
+//    {
-        public PlexRecentlyAddedSync(IPlexContentSync sync)
+//        public PlexRecentlyAddedSync(IPlexContentSync sync)
-        {
+//        {
-            _sync = sync;
+//            _sync = sync;
-        }
+//        }
 
-        private readonly IPlexContentSync _sync;
+//        private readonly IPlexContentSync _sync;
 
-        public void Start()
+//        public void Start()
-        {
+//        {
-            BackgroundJob.Enqueue(() => _sync.CacheContent(true));
+//            BackgroundJob.Enqueue(() => _sync.CacheContent(true));
-        }
+//        }
 
-        private bool _disposed;
+//        private bool _disposed;
-        protected virtual void Dispose(bool disposing)
+//        protected virtual void Dispose(bool disposing)
-        {
+//        {
-            if (_disposed)
+//            if (_disposed)
-                return;
+//                return;
 
-            if (disposing)
+//            if (disposing)
-            {
+//            {
-                _sync?.Dispose();
+//                _sync?.Dispose();
-            }
+//            }
-            _disposed = true;
+//            _disposed = true;
-        }
+//        }
 
-        public void Dispose()
+//        public void Dispose()
-        {
+//        {
-            Dispose(true);
+//            Dispose(true);
-            GC.SuppressFinalize(this);
+//            GC.SuppressFinalize(this);
-        }
+//        }
-    }
+//    }
-}
+//}

src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs

@@ -11,6 +11,7 @@ using Ombi.Core.Settings.Models.External;
 using Ombi.Helpers;
 using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Plex
 {
@@ -24,6 +25,8 @@ namespace Ombi.Schedule.Jobs.Plex
             _log = log;
             _plexSettings = plexSettings;
             _userManagementSettings = ums;
+            _plexSettings.ClearCache();
+            _userManagementSettings.ClearCache();
         }
 
         private readonly IPlexApi _api;
@@ -33,7 +36,7 @@ namespace Ombi.Schedule.Jobs.Plex
         private readonly ISettingsService<UserManagementSettings> _userManagementSettings;
 
 
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             var userManagementSettings = await _userManagementSettings.GetSettingsAsync();
             if (!userManagementSettings.ImportPlexUsers)

src/Ombi.Schedule/Jobs/Radarr/IRadarrSync.cs

@@ -6,7 +6,6 @@ namespace Ombi.Schedule.Jobs.Radarr
 {
     public interface IRadarrSync : IBaseJob
     {
-        Task CacheContent();
         Task<IEnumerable<RadarrCache>> GetCachedContent();
     }
 }

src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs

@@ -10,6 +10,7 @@ using Ombi.Helpers;
 using Ombi.Settings.Settings.Models.External;
 using Ombi.Store.Context;
 using Ombi.Store.Entities;
+using Quartz;
 using Serilog;
 
 namespace Ombi.Schedule.Jobs.Radarr
@@ -22,6 +23,7 @@ namespace Ombi.Schedule.Jobs.Radarr
             RadarrApi = radarrApi;
             Logger = log;
             _ctx = ctx;
+            RadarrSettings.ClearCache();
         }
 
         private ISettingsService<RadarrSettings> RadarrSettings { get; }
@@ -31,7 +33,7 @@ namespace Ombi.Schedule.Jobs.Radarr
 
         private static readonly SemaphoreSlim SemaphoreSlim = new SemaphoreSlim(1, 1);
 
-        public async Task CacheContent()
+        public async Task Execute(IJobExecutionContext job)
         {
             await SemaphoreSlim.WaitAsync();
             try

src/Ombi.Schedule/Jobs/SickRage/ISickRageSync.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.SickRage
 {
     public interface ISickRageSync : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/SickRage/SickRageSync.cs

@@ -11,6 +11,7 @@ using Ombi.Helpers;
 using Ombi.Settings.Settings.Models.External;
 using Ombi.Store.Context;
 using Ombi.Store.Entities;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.SickRage
 {
@@ -22,6 +23,7 @@ namespace Ombi.Schedule.Jobs.SickRage
             _api = api;
             _log = l;
             _ctx = ctx;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<SickRageSettings> _settings;
@@ -29,7 +31,7 @@ namespace Ombi.Schedule.Jobs.SickRage
         private readonly ILogger<SickRageSync> _log;
         private readonly IExternalContext _ctx;
         
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             try
             {

src/Ombi.Schedule/Jobs/Sonarr/ISonarrSync.cs

@@ -4,6 +4,5 @@ namespace Ombi.Schedule.Jobs.Sonarr
 {
     public interface ISonarrSync : IBaseJob
     {
-        Task Start();
     }
 }

src/Ombi.Schedule/Jobs/Sonarr/SonarrSync.cs

@@ -14,6 +14,7 @@ using Ombi.Helpers;
 using Ombi.Settings.Settings.Models.External;
 using Ombi.Store.Context;
 using Ombi.Store.Entities;
+using Quartz;
 
 namespace Ombi.Schedule.Jobs.Sonarr
 {
@@ -25,6 +26,7 @@ namespace Ombi.Schedule.Jobs.Sonarr
             _api = api;
             _log = l;
             _ctx = ctx;
+            _settings.ClearCache();
         }
 
         private readonly ISettingsService<SonarrSettings> _settings;
@@ -32,7 +34,7 @@ namespace Ombi.Schedule.Jobs.Sonarr
         private readonly ILogger<SonarrSync> _log;
         private readonly IExternalContext _ctx;
         
-        public async Task Start()
+        public async Task Execute(IJobExecutionContext job)
         {
             try
             {

src/Ombi.Schedule/Ombi.Schedule.csproj

@@ -10,12 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.2" />
-    <PackageReference Include="Hangfire" Version="1.7.0" />
+    <PackageReference Include="Hangfire" Version="1.6.22" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.0" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.6.22" />
-    <PackageReference Include="Hangfire.Console" Version="1.4.2" />
+    <PackageReference Include="Hangfire.Console" Version="1.3.10" />
     <PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />
     <PackageReference Include="Hangfire.RecurringJobExtensions" Version="1.1.6" />
     <PackageReference Include="Hangfire.SQLite" Version="1.4.2" />
+    <PackageReference Include="Quartz" Version="3.0.7" />
     <PackageReference Include="Serilog" Version="2.8.0" />
     <PackageReference Include="SharpCompress" Version="0.18.2" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />

src/Ombi.Schedule/OmbiQuartz.cs

@@ -0,0 +1,84 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ombi.Helpers;
+using Quartz;
+using Quartz.Impl;
+using Quartz.Spi;
+
+namespace Ombi.Schedule
+{
+    public class OmbiQuartz
+    {
+        protected IScheduler _scheduler { get; set; }
+        
+        public static IScheduler Scheduler => Instance._scheduler;
+
+        // Singleton
+        protected static OmbiQuartz _instance;
+
+        /// <summary>
+        /// Singleton
+        /// </summary>
+        public static OmbiQuartz Instance => _instance ?? (_instance = new OmbiQuartz());
+
+        protected OmbiQuartz()
+        {
+            Init();
+        }
+
+        private async void Init()
+        {
+            _scheduler = await new StdSchedulerFactory().GetScheduler();
+        }
+        
+        public IScheduler UseJobFactory(IJobFactory jobFactory)
+        {
+            Scheduler.JobFactory = jobFactory;
+            return Scheduler;
+        }
+
+        public async Task AddJob<T>(string name, string group, string cronExpression, Dictionary<string, string> jobData = null)
+            where T : IJob
+        {
+            var jobBuilder = JobBuilder.Create<T>()
+                .WithIdentity(new JobKey(name, group));
+            if (jobData != null)
+            {
+                foreach (var o in jobData)
+                {
+                    jobBuilder.UsingJobData(o.Key, o.Value);
+                }
+            }
+
+            if(!cronExpression.HasValue())
+            {
+                jobBuilder.StoreDurably(true);
+            }
+
+            var job = jobBuilder.Build();
+            if (cronExpression.HasValue())
+            {
+                ITrigger jobTrigger = TriggerBuilder.Create()
+                    .WithIdentity(name + "Trigger", group)
+                    .WithCronSchedule(cronExpression)
+                    .Build();
+                await Scheduler.ScheduleJob(job, jobTrigger);
+            } 
+            else
+            {
+                await Scheduler.AddJob(job, true);
+            }
+            
+        }
+
+        public static async Task TriggerJob(string jobName, string group)
+        {
+            await Scheduler.TriggerJob(new JobKey(jobName, group));
+        }
+        
+        public static async Task Start()
+        {
+            await Scheduler.Start();
+        }
+    }
+}

src/Ombi.Schedule/OmbiScheduler.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Ombi.Core.Settings;
+using Ombi.Schedule.Jobs;
+using Ombi.Schedule.Jobs.Couchpotato;
+using Ombi.Schedule.Jobs.Emby;
+using Ombi.Schedule.Jobs.Lidarr;
+using Ombi.Schedule.Jobs.Ombi;
+using Ombi.Schedule.Jobs.Plex;
+using Ombi.Schedule.Jobs.Plex.Interfaces;
+using Ombi.Schedule.Jobs.Radarr;
+using Ombi.Schedule.Jobs.SickRage;
+using Ombi.Schedule.Jobs.Sonarr;
+using Ombi.Settings.Settings.Models;
+using Quartz;
+using Quartz.Spi;
+
+namespace Ombi.Schedule
+{
+    public static class OmbiScheduler
+    {
+        //public void Setup()
+        //{
+        //    CreateJobDefinitions();
+        //}
+
+        //public void CreateJobDefinitions()
+        //{
+        //    var contentSync = JobBuilder.Create<PlexContentSync>()
+        //        .UsingJobData("recentlyAddedSearch", false)
+        //        .WithIdentity(nameof(PlexContentSync), "Plex")
+        //        .Build();
+
+        //    var recentlyAdded = JobBuilder.Create<PlexContentSync>()
+        //        .UsingJobData("recentlyAddedSearch", true)
+        //        .WithIdentity("PlexRecentlyAdded", "Plex")
+        //        .Build();
+        //}
+
+        public static async Task UseQuartz(this IApplicationBuilder app)
+        {
+            // Job Factory through IOC container
+            var jobFactory = (IJobFactory)app.ApplicationServices.GetService(typeof(IJobFactory));
+            var service = (ISettingsService<JobSettings>)app.ApplicationServices.GetService(typeof(ISettingsService<JobSettings>));
+            var s = service.GetSettings();
+            // Set job factory
+            OmbiQuartz.Instance.UseJobFactory(jobFactory);
+
+            // Run Quartz
+            await OmbiQuartz.Start();
+
+            // Run configuration
+            await AddPlex(s);
+            await AddEmby(s);
+            await AddDvrApps(s);
+            await AddSystem(s);
+
+        }
+
+        private static async Task AddSystem(JobSettings s)
+        {
+            await OmbiQuartz.Instance.AddJob<IRefreshMetadata>(nameof(IRefreshMetadata), "System", JobSettingsHelper.RefreshMetadata(s));
+            await OmbiQuartz.Instance.AddJob<IIssuesPurge>(nameof(IIssuesPurge), "System", JobSettingsHelper.IssuePurge(s));
+            //OmbiQuartz.Instance.AddJob<IOmbiAutomaticUpdater>(nameof(IOmbiAutomaticUpdater), "System", JobSettingsHelper.Updater(s));
+            await OmbiQuartz.Instance.AddJob<INewsletterJob>(nameof(INewsletterJob), "System", JobSettingsHelper.Newsletter(s));
+            await OmbiQuartz.Instance.AddJob<IResendFailedRequests>(nameof(IResendFailedRequests), "System", JobSettingsHelper.ResendFailedRequests(s));
+            await OmbiQuartz.Instance.AddJob<IMediaDatabaseRefresh>(nameof(IMediaDatabaseRefresh), "System", JobSettingsHelper.MediaDatabaseRefresh(s));
+        }
+
+        private static async Task AddDvrApps(JobSettings s)
+        {
+            await OmbiQuartz.Instance.AddJob<ISonarrSync>(nameof(ISonarrSync), "DVR", JobSettingsHelper.Sonarr(s));
+            await OmbiQuartz.Instance.AddJob<IRadarrSync>(nameof(IRadarrSync), "DVR", JobSettingsHelper.Radarr(s));
+            await OmbiQuartz.Instance.AddJob<ICouchPotatoSync>(nameof(ICouchPotatoSync), "DVR", JobSettingsHelper.CouchPotato(s));
+            await OmbiQuartz.Instance.AddJob<ISickRageSync>(nameof(ISickRageSync), "DVR", JobSettingsHelper.SickRageSync(s));
+            await OmbiQuartz.Instance.AddJob<ILidarrArtistSync>(nameof(ILidarrArtistSync), "DVR", JobSettingsHelper.LidarrArtistSync(s));
+        }
+
+        private static async Task AddPlex(JobSettings s)
+        {
+            await OmbiQuartz.Instance.AddJob<IPlexContentSync>(nameof(IPlexContentSync), "Plex", JobSettingsHelper.PlexContent(s), new Dictionary<string, string> { { "recentlyAddedSearch", "false" } });
+            await OmbiQuartz.Instance.AddJob<IPlexContentSync>(nameof(IPlexContentSync) + "RecentlyAdded", "Plex", JobSettingsHelper.PlexRecentlyAdded(s), new Dictionary<string, string> { { "recentlyAddedSearch", "true" } });
+            await OmbiQuartz.Instance.AddJob<IPlexUserImporter>(nameof(IPlexUserImporter), "Plex", JobSettingsHelper.UserImporter(s));
+            await OmbiQuartz.Instance.AddJob<IPlexEpisodeSync>(nameof(IPlexEpisodeSync), "Plex", null);
+            await OmbiQuartz.Instance.AddJob<IPlexAvailabilityChecker>(nameof(IPlexAvailabilityChecker), "Plex", null);
+        }
+
+        private static async Task AddEmby(JobSettings s)
+        {
+            await OmbiQuartz.Instance.AddJob<IEmbyContentSync>(nameof(IEmbyContentSync), "Emby", JobSettingsHelper.EmbyContent(s));
+            await OmbiQuartz.Instance.AddJob<IEmbyEpisodeSync>(nameof(IEmbyEpisodeSync), "Emby", null);
+            await OmbiQuartz.Instance.AddJob<IEmbyAvaliabilityChecker>(nameof(IEmbyAvaliabilityChecker), "Emby", null);
+            await OmbiQuartz.Instance.AddJob<IEmbyUserImporter>(nameof(IEmbyUserImporter), "Emby", JobSettingsHelper.UserImporter(s));
+        }
+    }
+}

src/Ombi.Settings/Ombi.Settings.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
+    <PackageReference Include="Quartz" Version="3.0.7" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 

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

@@ -1,5 +1,6 @@
 using System;
 using Ombi.Helpers;
+using Quartz;
 
 namespace Ombi.Settings.Settings.Models
 {
@@ -7,71 +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)));
         }
 
         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(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.Store/Migrations/Settings/20190416204533_ResetSchedules.Designer.cs

@@ -0,0 +1,50 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Ombi.Store.Context;
+
+namespace Ombi.Store.Migrations.Settings
+{
+    [DbContext(typeof(SettingsContext))]
+    [Migration("20190416204533_ResetSchedules")]
+    partial class ResetSchedules
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.2-servicing-10034");
+
+            modelBuilder.Entity("Ombi.Store.Entities.ApplicationConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ApplicationConfiguration");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.GlobalSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Content");
+
+                    b.Property<string>("SettingsName");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("GlobalSettings");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Ombi.Store/Migrations/Settings/20190416204533_ResetSchedules.cs

@@ -0,0 +1,20 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Ombi.Store.Migrations.Settings
+{
+    public partial class ResetSchedules : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"
+                DELETE FROM GlobalSettings
+                    WHERE SettingsName = 'JobSettings'
+");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

src/Ombi.Store/Migrations/Settings/SettingsContextModelSnapshot.cs

@@ -13,7 +13,7 @@ namespace Ombi.Store.Migrations.Settings
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687");
+                .HasAnnotation("ProductVersion", "2.2.2-servicing-10034");
 
             modelBuilder.Entity("Ombi.Store.Entities.ApplicationConfiguration", b =>
                 {

src/Ombi/ClientApp/src/app/interfaces/ISettings.ts

@@ -222,7 +222,6 @@ export interface IIssueCategory extends ISettings {
 export interface ICronTestModel {
   success: boolean;
   message: string;
-  schedule: Date[];
 }
 
 export interface ICronViewModelBody {

src/Ombi/ClientApp/src/app/requests/music/musicrequests.component.ts

@@ -92,11 +92,10 @@ export class MusicRequestsComponent implements OnInit {
         this.searchChanged.next(text.target.value);
     }
 
-    public removeRequest(request: IAlbumRequest) {
+    public async removeRequest(request: IAlbumRequest) {
-        this.requestService.removeAlbumRequest(request).subscribe(x => {
+        await this.requestService.removeAlbumRequest(request).toPromise();
-            this.removeRequestFromUi(request);
+        this.removeRequestFromUi(request);
-            this.loadRequests(this.amountToLoad, this.currentlyLoaded = 0);
+        this.loadRequests(this.amountToLoad, this.currentlyLoaded = 0);
-        });
     }
 
     public changeAvailability(request: IAlbumRequest, available: boolean) {
@@ -337,7 +336,7 @@ export class MusicRequestsComponent implements OnInit {
     }
     private setAlbumBackground(req: IAlbumRequest) {
         if (req.disk === null) {
-            if(req.cover === null) {
+            if (req.cover === null) {
                 req.disk = this.defaultPoster;
             } else {
                 req.disk = req.cover;

src/Ombi/ClientApp/src/app/search/moviesearch.component.html

@@ -1,10 +1,8 @@
-
+<!-- Movie tab -->
-
-
 <div role="tabpanel" class="tab-pane active" id="MoviesTab">
 
     <div class="input-group search-bar-background">
-        <input id="search" type="text" class="form-control form-control-custom form-control-search form-control-withbuttons"
+        <input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate}}" class="form-control form-control-custom form-control-search form-control-withbuttons"
             (keyup)="search($event)">
         <div class="input-group-addon right-radius">
             <div class="btn-group" role="group">
@@ -27,7 +25,7 @@
             <i class="fa fa-search"></i>
         </div>
     </div>
-
+    <!-- Refine search options -->
     <div class="row top-spacing form-group vcenter" *ngIf="refineSearchEnabled">
         <div class="col-md-1">
             <div class="form-group">
@@ -37,6 +35,7 @@
             </div>
         </div>
 
+        <!-- <label for="name" class="col-xs-2 col-md-1">Language:</label> -->
         <div class="col-md-2">
             <div class="form-group">
                 <label for="select" class="control-label">Language</label>
@@ -64,6 +63,7 @@
 
     <remaining-requests [movie]="true" [quotaRefreshEvents]="movieRequested.asObservable()" #remainingFilms></remaining-requests>
 
+    <!-- Movie content -->
     <div id="movieList">
         <div *ngIf="searchApplied && movieResults?.length <= 0" class='no-search-results'>
             <i class='fa fa-film no-search-results-icon'></i>
@@ -101,10 +101,10 @@
                                     class="label label-info" [translate]="'Search.Movies.Trailer'"></span></a>
                             <span *ngIf="result.quality" id="qualityLabel" class="label label-success">{{result.quality}}p</span>
 
-                            <ng-template [ngIf]="result.available">
+                            <ng-template [ngIf]="result.available"><span class="label label-success" id="availableLabel"
-                                <span class="label label-success" id="availableLabel" [translate]="'Common.Available'"></span></ng-template>
+                                    [translate]="'Common.Available'"></span></ng-template>
-                            <ng-template [ngIf]="result.approved && !result.available">
+                            <ng-template [ngIf]="result.approved && !result.available"><span class="label label-info"
-                                <span class="label label-info" id="processingRequestLabel" [translate]="'Common.ProcessingRequest'"></span></ng-template>
+                                    id="processingRequestLabel" [translate]="'Common.ProcessingRequest'"></span></ng-template>
                             <ng-template [ngIf]="result.requested && !result.approved && !result.available"><span class="label label-warning"
                                     id="pendingApprovalLabel" [translate]="'Common.PendingApproval'"></span></ng-template>
                             <ng-template [ngIf]="!result.requested && !result.available && !result.approved"><span
@@ -181,4 +181,4 @@
 
 
 <issue-report [movie]="true" [visible]="issuesBarVisible" (visibleChange)="issuesBarVisible = $event;" [title]="issueRequestTitle"
-    [issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report> 
+    [issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report>

src/Ombi/ClientApp/src/app/search/music/musicsearch.component.html

@@ -1,7 +1,7 @@
 <!-- Movie tab -->
 <div role="tabpanel" class="tab-pane active" id="MoviesTab">
     <div class="input-group">
-        <input id="search" type="text" class="form-control form-control-custom form-control-search form-control-withbuttons" (keyup)="search($event)">
+        <input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate }}" class="form-control form-control-custom form-control-search form-control-withbuttons" (keyup)="search($event)">
         <div class="input-group-addon right-radius">
             <i class="fa fa-search"></i>
         </div>
@@ -49,4 +49,4 @@
 
 
 <issue-report [movie]="true" [visible]="issuesBarVisible" (visibleChange)="issuesBarVisible = $event;" [title]="issueRequestTitle"
-    [issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report>
+    [issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report>

src/Ombi/ClientApp/src/app/search/search.component.html

@@ -4,7 +4,7 @@
 <!-- Nav tabs -->
 
 
-<ul id="nav-tabs" class="nav nav-tabs" role="tablist">
+<ul id="nav-tabs" class="nav nav-tabs nav-justified" role="tablist">
 
     <li role="presentation" class="active">
         <a id="movieTabButton" href="#MoviesTab" aria-controls="home" role="tab" data-toggle="tab" (click)="selectMovieTab()"><i class="fa fa-film"></i>  {{ 'Search.MoviesTab' | translate }}</a>

src/Ombi/ClientApp/src/app/search/search.component.scss

@@ -16,6 +16,10 @@
     }
 }
 
+.tab-content {
+    margin-top: 1.5em;
+}
+
 .search-bar-background {
     background-color: #333333;
 }

src/Ombi/ClientApp/src/app/search/tvsearch.component.html

@@ -1,7 +1,7 @@
 <!-- Movie tab -->
 <div role="tabpanel" class="tab-pane" id="TvShowTab">
     <div class="input-group">
-        <input id="search" type="text" class="form-control form-control-custom form-control-search form-control-withbuttons" (keyup)="search($event)">
+        <input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate }}" class="form-control form-control-custom form-control-search form-control-withbuttons" (keyup)="search($event)">
         <div class="input-group-addon right-radius">
             <div class="btn-group">
                 <a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
@@ -164,4 +164,4 @@
 
 
 <issue-report [movie]="false" [visible]="issuesBarVisible" (visibleChange)="issuesBarVisible = $event;" [title]="issueRequestTitle"
-    [issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report>
+    [issueCategory]="issueCategorySelected" [id]="issueRequestId" [providerId]="issueProviderId"></issue-report>

src/Ombi/ClientApp/src/app/services/request.service.ts

@@ -186,7 +186,7 @@ export class RequestService extends ServiceHelpers {
     }
 
     public removeAlbumRequest(request: IAlbumRequest): any {
-        this.http.delete(`${this.url}music/${request.id}`, {headers: this.headers}).subscribe();
+        return this.http.delete(`${this.url}music/${request.id}`, {headers: this.headers});
     }
 
 }

src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html

@@ -7,7 +7,8 @@
         <legend>Job Settings</legend>
         <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)" style="padding-top:5%;">
             <div class="col-md-6">
-                <small>Changes to any of the below requires you to restart Ombi.</small>
+                <small>Changes to any of the below requires you to restart Ombi. </small>
+                <small>You can generate valid CRON Expressions here: <a href="http://www.cronmaker.com/" target="_blank">http://www.cronmaker.com/</a></small>
                 <div class="form-group">
                     <label for="sonarrSync" class="control-label">Sonarr Sync</label>              
                         <input type="text" class="form-control form-control-custom" [ngClass]="{'form-error': form.get('sonarrSync').hasError('required')}" id="sonarrSync" name="sonarrSync" formControlName="sonarrSync">
@@ -121,9 +122,3 @@
         </form>
     </fieldset>
 </div>
-
-<p-dialog header="CRON Schedule" [(visible)]="displayTest">
-    <ul *ngIf="testModel">
-        <li *ngFor="let item of testModel.schedule">{{item | date:'short'}}</li>
-    </ul>
-</p-dialog>

src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.ts

@@ -3,8 +3,6 @@
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { NotificationService, SettingsService } from "../../services";
 
-import { ICronTestModel } from "../../interfaces";
-
 @Component({
     templateUrl: "./jobs.component.html",
 })
@@ -13,8 +11,6 @@ export class JobsComponent implements OnInit {
     public form: FormGroup;
     
     public profilesRunning: boolean;
-    public testModel: ICronTestModel;
-    public displayTest: boolean;
     
     constructor(private readonly settingsService: SettingsService,
                 private readonly fb: FormBuilder,
@@ -44,9 +40,8 @@ export class JobsComponent implements OnInit {
 
     public testCron(expression: string) {
         this.settingsService.testCron({ expression }).subscribe(x => {
-            if(x.success) {
+            if(x.success) {    
-                this.testModel = x;
+                this.notificationService.success("Cron is Valid");    
-                this.displayTest = true;              
             } else {
                 this.notificationService.error(x.message);
             }

src/Ombi/Controllers/V1/JobController.cs

@@ -1,13 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Hangfire;
 using Microsoft.AspNetCore.Mvc;
 using Ombi.Attributes;
 using Ombi.Helpers;
+using Ombi.Schedule;
 using Ombi.Schedule.Jobs;
 using Ombi.Schedule.Jobs.Emby;
 using Ombi.Schedule.Jobs.Ombi;
 using Ombi.Schedule.Jobs.Plex;
+using Quartz;
 
 namespace Ombi.Controllers.V1
 {
@@ -17,35 +20,23 @@ namespace Ombi.Controllers.V1
     [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>
         /// <returns></returns>
         [HttpPost("update")]
-        public bool ForceUpdate()
+        public async Task<bool> ForceUpdate()
         {
-            BackgroundJob.Enqueue(() => _updater.Update(null));
+
+            await OmbiQuartz.TriggerJob(nameof(IOmbiAutomaticUpdater), "System");
             return true;
         }
 
@@ -92,9 +83,9 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <returns></returns>
         [HttpPost("plexuserimporter")]
-        public bool PlexUserImporter()
+        public async Task<bool> PlexUserImporter()
         {
-            BackgroundJob.Enqueue(() => _plexUserImporter.Start());
+            await OmbiQuartz.TriggerJob(nameof(IPlexUserImporter), "Plex");
             return true;
         }
 
@@ -103,9 +94,9 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <returns></returns>
         [HttpPost("embyuserimporter")]
-        public bool EmbyUserImporter()
+        public async Task<bool> EmbyUserImporter()
         {
-            BackgroundJob.Enqueue(() => _embyUserImporter.Start());
+            await OmbiQuartz.TriggerJob(nameof(IEmbyUserImporter), "Emby");
             return true;
         }
 
@@ -116,7 +107,7 @@ namespace Ombi.Controllers.V1
         [HttpPost("plexcontentcacher")]
         public bool StartPlexContentCacher()
         {
-            BackgroundJob.Enqueue(() => _plexContentSync.CacheContent(false));
+            OmbiQuartz.Scheduler.TriggerJob(new JobKey(nameof(IPlexContentSync), "Plex"), new JobDataMap(new Dictionary<string, string> { { "recentlyAddedSearch", "false" } }));
             return true;
         }
 
@@ -127,7 +118,7 @@ namespace Ombi.Controllers.V1
         [HttpPost("plexrecentlyadded")]
         public bool StartRecentlyAdded()
         {
-            BackgroundJob.Enqueue(() => _plexContentSync.CacheContent(true));
+            OmbiQuartz.Scheduler.TriggerJob(new JobKey(nameof(IPlexContentSync), "Plex"), new JobDataMap(new Dictionary<string, string> { { "recentlyAddedSearch", "true" } }));
             return true;
         }
 
@@ -136,9 +127,9 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <returns></returns>
         [HttpPost("embycontentcacher")]
-        public bool StartEmbyContentCacher()
+        public async Task<bool> StartEmbyContentCacher()
         {
-            BackgroundJob.Enqueue(() => _embyContentSync.Start());
+            await OmbiQuartz.TriggerJob(nameof(IEmbyContentSync), "Emby");
             return true;
         }
 
@@ -147,9 +138,9 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <returns></returns>
         [HttpPost("newsletter")]
-        public bool StartNewsletter()
+        public async Task<bool> StartNewsletter()
         {
-            BackgroundJob.Enqueue(() => _newsletterJob.Start());
+            await OmbiQuartz.TriggerJob(nameof(INewsletterJob), "System");
             return true;
         }
     }

src/Ombi/Controllers/V1/SearchController.cs

@@ -361,6 +361,19 @@ namespace Ombi.Controllers.V1
             return await MusicEngine.SearchAlbum(searchTerm);
         }
 
+        /// <summary>
+        /// Returns the album information specified by the foreignAlbumId passed in
+        /// </summary>
+        /// <remarks>We use Lidarr as the Provider</remarks>
+        /// <returns></returns>
+        [HttpGet("music/album/info/{foreignAlbumId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<SearchAlbumViewModel> GetAlbumInformation(string foreignAlbumId)
+        {
+            return await MusicEngine.GetAlbumInformation(foreignAlbumId);
+        }
+
         /// <summary>
         /// Returns all albums for the artist using the ForeignArtistId
         /// </summary>

src/Ombi/Controllers/V1/SettingsController.cs

@@ -27,6 +27,10 @@ using Ombi.Settings.Settings.Models.External;
 using Ombi.Settings.Settings.Models.Notifications;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Ombi.Api.Github;
+using Ombi.Core.Engine;
+using Ombi.Schedule;
+using Quartz;
 
 namespace Ombi.Controllers.V1
 {
@@ -44,7 +48,6 @@ namespace Ombi.Controllers.V1
             IMapper mapper,
             INotificationTemplatesRepository templateRepo,
             IEmbyApi embyApi,
-            IRadarrSync radarrSync,
             ICacheService memCache,
             IGithubApi githubApi,
             IRecentlyAddedEngine engine)
@@ -53,7 +56,6 @@ namespace Ombi.Controllers.V1
             Mapper = mapper;
             TemplateRepository = templateRepo;
             _embyApi = embyApi;
-            _radarrSync = radarrSync;
             _cache = memCache;
             _githubApi = githubApi;
             _recentlyAdded = engine;
@@ -63,7 +65,6 @@ namespace Ombi.Controllers.V1
         private IMapper Mapper { get; }
         private INotificationTemplatesRepository TemplateRepository { get; }
         private readonly IEmbyApi _embyApi;
-        private readonly IRadarrSync _radarrSync;
         private readonly ICacheService _cache;
         private readonly IGithubApi _githubApi;
         private readonly IRecentlyAddedEngine _recentlyAdded;
@@ -408,7 +409,8 @@ namespace Ombi.Controllers.V1
             {
                 _cache.Remove(CacheKeys.RadarrRootProfiles);
                 _cache.Remove(CacheKeys.RadarrQualityProfiles);
-                BackgroundJob.Enqueue(() => _radarrSync.CacheContent());
+
+                await OmbiQuartz.TriggerJob(nameof(IRadarrSync), "DVR");
             }
             return result;
         }
@@ -568,8 +570,8 @@ namespace Ombi.Controllers.V1
 
                 try
                 {
-                    var r = CrontabSchedule.TryParse(expression);
+                    var isValid = CronExpression.IsValidExpression(expression);
-                    if (r == null)
+                    if (!isValid)
                     {
                         return new JobSettingsViewModel
                         {
@@ -599,14 +601,15 @@ namespace Ombi.Controllers.V1
             var model = new CronTestModel();
             try
             {
-                var time = DateTime.UtcNow;
+                var isValid = CronExpression.IsValidExpression(body.Expression);
-                var result = CrontabSchedule.TryParse(body.Expression);
+                if (!isValid)
-                for (int i = 0; i < 10; i++)
                 {
-                    var next = result.GetNextOccurrence(time);
+                    return new CronTestModel
-                    model.Schedule.Add(next);
+                    {
-                    time = next;
+                        Message = $"CRON Expression {body.Expression} is not valid"
+                    };
                 }
+               
                 model.Success = true;
                 return model;
             }
@@ -617,8 +620,6 @@ namespace Ombi.Controllers.V1
                     Message = $"CRON Expression {body.Expression} is not valid"
                 };
             }
-
-
         }
 
 

src/Ombi/Models/CronTestModel.cs

@@ -7,6 +7,5 @@ namespace Ombi.Models
     {
         public bool Success { get; set; }
         public string Message { get; set; }
-        public List<DateTime> Schedule { get; set; } = new List<DateTime>();
     }
 }

src/Ombi/Startup.cs

@@ -136,6 +136,8 @@ namespace Ombi
                 ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
             });
 
+            app.UseQuartz().GetAwaiter().GetResult();
+
             var ctx = serviceProvider.GetService<IOmbiContext>();
             loggerFactory.AddSerilog();
 
@@ -194,8 +196,8 @@ namespace Ombi
             GlobalJobFilters.Filters.Add(new AutomaticRetryAttribute {Attempts = 3});
 
             // Setup the scheduler
-            var jobSetup = app.ApplicationServices.GetService<IJobSetup>();
+            //var jobSetup = app.ApplicationServices.GetService<IJobSetup>();
-            jobSetup.Setup();
+            //jobSetup.Setup();
             ctx.Seed();
             var settingsctx = serviceProvider.GetService<ISettingsContext>();
             var externalctx = serviceProvider.GetService<IExternalContext>();

src/Ombi/wwwroot/translations/en.json

@@ -78,8 +78,9 @@
     "ViewOnPlex": "View On Plex",
     "ViewOnEmby": "View On Emby",
     "RequestAdded": "Request for {{title}} has been added successfully",
-    "Similar": "Similar",
+    "Similar":"Similar",
-    "Refine": "Refine",
+    "Refine":"Refine",
+    "SearchBarPlaceholder":"Type Here to Search",
     "Movies": {
       "PopularMovies": "Popular Movies",
       "UpcomingMovies": "Upcoming Movies",