diff --git a/src/Lidarr.Api.V1/Commands/CommandController.cs b/src/Lidarr.Api.V1/Commands/CommandController.cs index 312e0fe66..0c444c97a 100644 --- a/src/Lidarr.Api.V1/Commands/CommandController.cs +++ b/src/Lidarr.Api.V1/Commands/CommandController.cs @@ -27,6 +27,8 @@ namespace Lidarr.Api.V1.Commands private readonly Debouncer _debouncer; private readonly Dictionary _pendingUpdates; + private readonly CommandPriorityComparer _commandPriorityComparer = new CommandPriorityComparer(); + public CommandController(IManageCommandQueue commandQueueManager, IBroadcastSignalRMessage signalRBroadcaster, KnownTypes knownTypes) @@ -35,10 +37,10 @@ namespace Lidarr.Api.V1.Commands _commandQueueManager = commandQueueManager; _knownTypes = knownTypes; - PostValidator.RuleFor(c => c.Name).NotBlank(); - _debouncer = new Debouncer(SendUpdates, TimeSpan.FromSeconds(0.1)); _pendingUpdates = new Dictionary(); + + PostValidator.RuleFor(c => c.Name).NotBlank(); } public override CommandResource GetResourceById(int id) @@ -74,7 +76,10 @@ namespace Lidarr.Api.V1.Commands [HttpGet] public List GetStartedCommands() { - return _commandQueueManager.All().ToResource(); + return _commandQueueManager.All() + .OrderBy(c => c.Status, _commandPriorityComparer) + .ThenByDescending(c => c.Priority) + .ToResource(); } [RestDeleteById] diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs index ec556b5f9..346f2c37e 100644 --- a/src/NzbDrone.Core/Datastore/TableMapping.cs +++ b/src/NzbDrone.Core/Datastore/TableMapping.cs @@ -61,7 +61,8 @@ namespace NzbDrone.Core.Datastore .Ignore(r => r.FreeSpace) .Ignore(r => r.TotalSpace); - Mapper.Entity("ScheduledTasks").RegisterModel(); + Mapper.Entity("ScheduledTasks").RegisterModel() + .Ignore(i => i.Priority); Mapper.Entity("Indexers").RegisterModel() .Ignore(x => x.ImplementationName) @@ -71,9 +72,9 @@ namespace NzbDrone.Core.Datastore .Ignore(i => i.SupportsSearch); Mapper.Entity("ImportLists").RegisterModel() - .Ignore(x => x.ImplementationName) - .Ignore(i => i.Enable) - .Ignore(i => i.ListType); + .Ignore(x => x.ImplementationName) + .Ignore(i => i.Enable) + .Ignore(i => i.ListType); Mapper.Entity("Notifications").RegisterModel() .Ignore(x => x.ImplementationName) @@ -101,64 +102,64 @@ namespace NzbDrone.Core.Datastore Mapper.Entity("History").RegisterModel(); Mapper.Entity("Artists") - .Ignore(s => s.RootFolderPath) - .Ignore(s => s.Name) - .Ignore(s => s.ForeignArtistId) - .HasOne(a => a.Metadata, a => a.ArtistMetadataId) - .HasOne(a => a.QualityProfile, a => a.QualityProfileId) - .HasOne(s => s.MetadataProfile, s => s.MetadataProfileId) - .LazyLoad(a => a.Albums, (db, a) => db.Query(new SqlBuilder(db.DatabaseType).Where(rg => rg.ArtistMetadataId == a.Id)).ToList(), a => a.Id > 0); + .Ignore(s => s.RootFolderPath) + .Ignore(s => s.Name) + .Ignore(s => s.ForeignArtistId) + .HasOne(a => a.Metadata, a => a.ArtistMetadataId) + .HasOne(a => a.QualityProfile, a => a.QualityProfileId) + .HasOne(s => s.MetadataProfile, s => s.MetadataProfileId) + .LazyLoad(a => a.Albums, (db, a) => db.Query(new SqlBuilder(db.DatabaseType).Where(rg => rg.ArtistMetadataId == a.Id)).ToList(), a => a.Id > 0); Mapper.Entity("ArtistMetadata").RegisterModel(); Mapper.Entity("Albums").RegisterModel() - .Ignore(x => x.ArtistId) - .HasOne(r => r.ArtistMetadata, r => r.ArtistMetadataId) - .LazyLoad(a => a.AlbumReleases, (db, album) => db.Query(new SqlBuilder(db.DatabaseType).Where(r => r.AlbumId == album.Id)).ToList(), a => a.Id > 0) - .LazyLoad(a => a.Artist, - (db, album) => ArtistRepository.Query(db, - new SqlBuilder(db.DatabaseType) - .Join((a, m) => a.ArtistMetadataId == m.Id) - .Where(a => a.ArtistMetadataId == album.ArtistMetadataId)).SingleOrDefault(), - a => a.ArtistMetadataId > 0); + .Ignore(x => x.ArtistId) + .HasOne(r => r.ArtistMetadata, r => r.ArtistMetadataId) + .LazyLoad(a => a.AlbumReleases, (db, album) => db.Query(new SqlBuilder(db.DatabaseType).Where(r => r.AlbumId == album.Id)).ToList(), a => a.Id > 0) + .LazyLoad(a => a.Artist, + (db, album) => ArtistRepository.Query(db, + new SqlBuilder(db.DatabaseType) + .Join((a, m) => a.ArtistMetadataId == m.Id) + .Where(a => a.ArtistMetadataId == album.ArtistMetadataId)).SingleOrDefault(), + a => a.ArtistMetadataId > 0); Mapper.Entity("AlbumReleases").RegisterModel() - .HasOne(r => r.Album, r => r.AlbumId) - .LazyLoad(x => x.Tracks, (db, release) => db.Query(new SqlBuilder(db.DatabaseType).Where(t => t.AlbumReleaseId == release.Id)).ToList(), r => r.Id > 0); + .HasOne(r => r.Album, r => r.AlbumId) + .LazyLoad(x => x.Tracks, (db, release) => db.Query(new SqlBuilder(db.DatabaseType).Where(t => t.AlbumReleaseId == release.Id)).ToList(), r => r.Id > 0); Mapper.Entity("Tracks").RegisterModel() - .Ignore(t => t.HasFile) - .Ignore(t => t.AlbumId) - .HasOne(track => track.AlbumRelease, track => track.AlbumReleaseId) - .HasOne(track => track.ArtistMetadata, track => track.ArtistMetadataId) - .LazyLoad(t => t.TrackFile, - (db, track) => MediaFileRepository.Query(db, - new SqlBuilder(db.DatabaseType) - .Join((l, r) => l.Id == r.TrackFileId) - .Join((l, r) => l.AlbumId == r.Id) - .Join((l, r) => l.ArtistMetadataId == r.ArtistMetadataId) - .Join((l, r) => l.ArtistMetadataId == r.Id) - .Where(t => t.Id == track.TrackFileId)).SingleOrDefault(), - t => t.TrackFileId > 0) - .LazyLoad(x => x.Artist, - (db, t) => ArtistRepository.Query(db, - new SqlBuilder(db.DatabaseType) - .Join((a, m) => a.ArtistMetadataId == m.Id) - .Join((l, r) => l.ArtistMetadataId == r.ArtistMetadataId) - .Join((l, r) => l.Id == r.AlbumId) - .Where(r => r.Id == t.AlbumReleaseId)).SingleOrDefault(), - t => t.Id > 0); + .Ignore(t => t.HasFile) + .Ignore(t => t.AlbumId) + .HasOne(track => track.AlbumRelease, track => track.AlbumReleaseId) + .HasOne(track => track.ArtistMetadata, track => track.ArtistMetadataId) + .LazyLoad(t => t.TrackFile, + (db, track) => MediaFileRepository.Query(db, + new SqlBuilder(db.DatabaseType) + .Join((l, r) => l.Id == r.TrackFileId) + .Join((l, r) => l.AlbumId == r.Id) + .Join((l, r) => l.ArtistMetadataId == r.ArtistMetadataId) + .Join((l, r) => l.ArtistMetadataId == r.Id) + .Where(t => t.Id == track.TrackFileId)).SingleOrDefault(), + t => t.TrackFileId > 0) + .LazyLoad(x => x.Artist, + (db, t) => ArtistRepository.Query(db, + new SqlBuilder(db.DatabaseType) + .Join((a, m) => a.ArtistMetadataId == m.Id) + .Join((l, r) => l.ArtistMetadataId == r.ArtistMetadataId) + .Join((l, r) => l.Id == r.AlbumId) + .Where(r => r.Id == t.AlbumReleaseId)).SingleOrDefault(), + t => t.Id > 0); Mapper.Entity("TrackFiles").RegisterModel() - .HasOne(f => f.Album, f => f.AlbumId) - .LazyLoad(x => x.Tracks, (db, file) => db.Query(new SqlBuilder(db.DatabaseType).Where(t => t.TrackFileId == file.Id)).ToList(), x => x.Id > 0) - .LazyLoad(x => x.Artist, - (db, f) => ArtistRepository.Query(db, - new SqlBuilder(db.DatabaseType) - .Join((a, m) => a.ArtistMetadataId == m.Id) - .Join((l, r) => l.ArtistMetadataId == r.ArtistMetadataId) - .Where(a => a.Id == f.AlbumId)).SingleOrDefault(), - t => t.Id > 0); + .HasOne(f => f.Album, f => f.AlbumId) + .LazyLoad(x => x.Tracks, (db, file) => db.Query(new SqlBuilder(db.DatabaseType).Where(t => t.TrackFileId == file.Id)).ToList(), x => x.Id > 0) + .LazyLoad(x => x.Artist, + (db, f) => ArtistRepository.Query(db, + new SqlBuilder(db.DatabaseType) + .Join((a, m) => a.ArtistMetadataId == m.Id) + .Join((l, r) => l.ArtistMetadataId == r.ArtistMetadataId) + .Where(a => a.Id == f.AlbumId)).SingleOrDefault(), + t => t.Id > 0); Mapper.Entity("QualityDefinitions").RegisterModel() .Ignore(d => d.GroupName) diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs index 2fee72e40..79ec696b8 100644 --- a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs +++ b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs @@ -54,7 +54,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads private void QueueRefresh() { - _manageCommandQueue.Push(new RefreshMonitoredDownloadsCommand()); + _manageCommandQueue.Push(new RefreshMonitoredDownloadsCommand(), CommandPriority.High); } private void Refresh() @@ -75,7 +75,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads _trackedDownloadService.UpdateTrackable(trackedDownloads); _eventAggregator.PublishEvent(new TrackedDownloadRefreshedEvent(trackedDownloads)); - _manageCommandQueue.Push(new ProcessMonitoredDownloadsCommand()); + _manageCommandQueue.Push(new ProcessMonitoredDownloadsCommand(), CommandPriority.High); } finally { diff --git a/src/NzbDrone.Core/Jobs/ScheduledTask.cs b/src/NzbDrone.Core/Jobs/ScheduledTask.cs index 3cdfa3132..82c948b2f 100644 --- a/src/NzbDrone.Core/Jobs/ScheduledTask.cs +++ b/src/NzbDrone.Core/Jobs/ScheduledTask.cs @@ -1,5 +1,6 @@ using System; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Messaging.Commands; namespace NzbDrone.Core.Jobs { @@ -9,5 +10,11 @@ namespace NzbDrone.Core.Jobs public int Interval { get; set; } public DateTime LastExecution { get; set; } public DateTime LastStartTime { get; set; } + public CommandPriority Priority { get; set; } + + public ScheduledTask() + { + Priority = CommandPriority.Low; + } } } diff --git a/src/NzbDrone.Core/Jobs/Scheduler.cs b/src/NzbDrone.Core/Jobs/Scheduler.cs index dffe4dba7..54e243467 100644 --- a/src/NzbDrone.Core/Jobs/Scheduler.cs +++ b/src/NzbDrone.Core/Jobs/Scheduler.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Threading; using System.Threading.Tasks; using NLog; @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Jobs foreach (var task in tasks) { - _commandQueueManager.Push(task.TypeName, task.LastExecution, task.LastStartTime, CommandPriority.Low, CommandTrigger.Scheduled); + _commandQueueManager.Push(task.TypeName, task.LastExecution, task.LastStartTime, task.Priority, CommandTrigger.Scheduled); } } finally diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs index bd1211a93..1668a2249 100644 --- a/src/NzbDrone.Core/Jobs/TaskManager.cs +++ b/src/NzbDrone.Core/Jobs/TaskManager.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using NLog; +using NzbDrone.Common.Cache; using NzbDrone.Core.Backup; using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration.Events; @@ -31,43 +32,81 @@ namespace NzbDrone.Core.Jobs private readonly IScheduledTaskRepository _scheduledTaskRepository; private readonly IConfigService _configService; private readonly Logger _logger; + private readonly ICached _cache; - public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, Logger logger) + public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, ICacheManager cacheManager, Logger logger) { _scheduledTaskRepository = scheduledTaskRepository; _configService = configService; + _cache = cacheManager.GetCache(GetType()); _logger = logger; } public IList GetPending() { - return _scheduledTaskRepository.All() - .Where(c => c.Interval > 0 && c.LastExecution.AddMinutes(c.Interval) < DateTime.UtcNow) - .ToList(); + return _cache.Values + .Where(c => c.Interval > 0 && c.LastExecution.AddMinutes(c.Interval) < DateTime.UtcNow) + .ToList(); } public List GetAll() { - return _scheduledTaskRepository.All().ToList(); + return _cache.Values.ToList(); } public DateTime GetNextExecution(Type type) { - var scheduledTask = _scheduledTaskRepository.All().Single(v => v.TypeName == type.FullName); + var scheduledTask = _cache.Find(type.FullName); + return scheduledTask.LastExecution.AddMinutes(scheduledTask.Interval); } public void Handle(ApplicationStartedEvent message) { - var defaultTasks = new[] + var defaultTasks = new List { - new ScheduledTask { Interval = 1, TypeName = typeof(RefreshMonitoredDownloadsCommand).FullName }, - new ScheduledTask { Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName }, - new ScheduledTask { Interval = 6 * 60, TypeName = typeof(ApplicationUpdateCheckCommand).FullName }, - new ScheduledTask { Interval = 6 * 60, TypeName = typeof(CheckHealthCommand).FullName }, - new ScheduledTask { Interval = 24 * 60, TypeName = typeof(RefreshArtistCommand).FullName }, - new ScheduledTask { Interval = 24 * 60, TypeName = typeof(RescanFoldersCommand).FullName }, - new ScheduledTask { Interval = 24 * 60, TypeName = typeof(HousekeepingCommand).FullName }, + new ScheduledTask + { + Interval = 1, + TypeName = typeof(RefreshMonitoredDownloadsCommand).FullName, + Priority = CommandPriority.High + }, + + new ScheduledTask + { + Interval = 5, + TypeName = typeof(MessagingCleanupCommand).FullName + }, + + new ScheduledTask + { + Interval = 6 * 60, + TypeName = typeof(ApplicationUpdateCheckCommand).FullName + }, + + new ScheduledTask + { + Interval = 6 * 60, + TypeName = typeof(CheckHealthCommand).FullName + }, + + new ScheduledTask + { + Interval = 24 * 60, + TypeName = typeof(RefreshArtistCommand).FullName + }, + + new ScheduledTask + { + Interval = 24 * 60, + TypeName = typeof(RescanFoldersCommand).FullName + }, + + new ScheduledTask + { + Interval = 24 * 60, + TypeName = typeof(HousekeepingCommand).FullName + }, new ScheduledTask { @@ -90,7 +129,7 @@ namespace NzbDrone.Core.Jobs var currentTasks = _scheduledTaskRepository.All().ToList(); - _logger.Trace("Initializing jobs. Available: {0} Existing: {1}", defaultTasks.Count(), currentTasks.Count()); + _logger.Trace("Initializing jobs. Available: {0} Existing: {1}", defaultTasks.Count, currentTasks.Count); foreach (var job in currentTasks) { @@ -112,6 +151,9 @@ namespace NzbDrone.Core.Jobs currentDefinition.LastExecution = DateTime.UtcNow; } + currentDefinition.Priority = defaultTask.Priority; + + _cache.Set(currentDefinition.TypeName, currentDefinition); _scheduledTaskRepository.Upsert(currentDefinition); } } @@ -170,6 +212,9 @@ namespace NzbDrone.Core.Jobs backup.Interval = GetBackupInterval(); _scheduledTaskRepository.UpdateMany(new List { rss, backup }); + + _cache.Find(rss.TypeName).Interval = rss.Interval; + _cache.Find(backup.TypeName).Interval = backup.Interval; } } } diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandPriorityComparer.cs b/src/NzbDrone.Core/Messaging/Commands/CommandPriorityComparer.cs new file mode 100644 index 000000000..5d8d5f13e --- /dev/null +++ b/src/NzbDrone.Core/Messaging/Commands/CommandPriorityComparer.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; + +namespace NzbDrone.Core.Messaging.Commands +{ + public class CommandPriorityComparer : IComparer + { + public int Compare(CommandStatus x, CommandStatus y) + { + if (x == CommandStatus.Started && y != CommandStatus.Started) + { + return -1; + } + + if (x != CommandStatus.Started && y == CommandStatus.Started) + { + return 1; + } + + if (x < y) + { + return -1; + } + + if (x > y) + { + return 1; + } + + return 0; + } + } +}