From 07072d9f7bf269926a4d7aad580e2e78c444a2cd Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Thu, 31 Jan 2019 15:12:18 +0900
Subject: move all scheduled tasks and triggers into folders

---
 .../Emby.Server.Implementations.csproj             |   3 +
 .../ScheduledTasks/ChapterImagesTask.cs            | 182 ---------------------
 .../ScheduledTasks/DailyTrigger.cs                 |  87 ----------
 .../ScheduledTasks/IntervalTrigger.cs              | 108 ------------
 .../ScheduledTasks/PeopleValidationTask.cs         |  81 ---------
 .../ScheduledTasks/PluginUpdateTask.cs             | 142 ----------------
 .../ScheduledTasks/RefreshMediaLibraryTask.cs      |  81 ---------
 .../ScheduledTasks/StartupTrigger.cs               |  63 -------
 .../ScheduledTasks/Tasks/ChapterImagesTask.cs      | 182 +++++++++++++++++++++
 .../ScheduledTasks/Tasks/PeopleValidationTask.cs   |  81 +++++++++
 .../ScheduledTasks/Tasks/PluginUpdateTask.cs       | 142 ++++++++++++++++
 .../Tasks/RefreshMediaLibraryTask.cs               |  81 +++++++++
 .../ScheduledTasks/Triggers/DailyTrigger.cs        |  87 ++++++++++
 .../ScheduledTasks/Triggers/IntervalTrigger.cs     | 108 ++++++++++++
 .../ScheduledTasks/Triggers/StartupTrigger.cs      |  63 +++++++
 .../ScheduledTasks/Triggers/WeeklyTrigger.cs       | 112 +++++++++++++
 .../ScheduledTasks/WeeklyTrigger.cs                | 112 -------------
 17 files changed, 859 insertions(+), 856 deletions(-)
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
 create mode 100644 Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
 delete mode 100644 Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 92e3172f14..daad6f287b 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -46,4 +46,7 @@
     <EmbeddedResource Include="Localization\Ratings\*.txt" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="ScheduledTasks\Triggers\" />
+  </ItemGroup>
 </Project>
diff --git a/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
deleted file mode 100644
index 5373b4392b..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Class ChapterImagesTask
-    /// </summary>
-    class ChapterImagesTask : IScheduledTask
-    {
-        /// <summary>
-        /// The _logger
-        /// </summary>
-        private readonly ILogger _logger;
-        /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-
-        private readonly IItemRepository _itemRepo;
-
-        private readonly IApplicationPaths _appPaths;
-
-        private readonly IEncodingManager _encodingManager;
-        private readonly IFileSystem _fileSystem;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class.
-        /// </summary>
-        public ChapterImagesTask(ILoggerFactory loggerFactory, ILibraryManager libraryManager, IItemRepository itemRepo, IApplicationPaths appPaths, IEncodingManager encodingManager, IFileSystem fileSystem)
-        {
-            _logger = loggerFactory.CreateLogger(GetType().Name);
-            _libraryManager = libraryManager;
-            _itemRepo = itemRepo;
-            _appPaths = appPaths;
-            _encodingManager = encodingManager;
-            _fileSystem = fileSystem;
-        }
-
-        /// <summary>
-        /// Creates the triggers that define when the task will run
-        /// </summary>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-        {
-            return new[] {
-
-                new TaskTriggerInfo
-                {
-                    Type = TaskTriggerInfo.TriggerDaily,
-                    TimeOfDayTicks = TimeSpan.FromHours(2).Ticks,
-                    MaxRuntimeTicks = TimeSpan.FromHours(4).Ticks
-                }
-            };
-        }
-
-        public string Key => "RefreshChapterImages";
-
-        /// <summary>
-        /// Returns the task to be executed
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task.</returns>
-        public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            var videos = _libraryManager.GetItemList(new InternalItemsQuery
-            {
-                MediaTypes = new[] { MediaType.Video },
-                IsFolder = false,
-                Recursive = true,
-                DtoOptions = new DtoOptions(false)
-                {
-                    EnableImages = false
-                },
-                SourceTypes = new SourceType[] { SourceType.Library },
-                HasChapterImages = false,
-                IsVirtualItem = false
-
-            })
-                .OfType<Video>()
-                .ToList();
-
-            var numComplete = 0;
-
-            var failHistoryPath = Path.Combine(_appPaths.CachePath, "chapter-failures.txt");
-
-            List<string> previouslyFailedImages;
-
-            if (File.Exists(failHistoryPath))
-            {
-                try
-                {
-                    previouslyFailedImages = File.ReadAllText(failHistoryPath)
-                        .Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
-                        .ToList();
-                }
-                catch (IOException)
-                {
-                    previouslyFailedImages = new List<string>();
-                }
-            }
-            else
-            {
-                previouslyFailedImages = new List<string>();
-            }
-
-            var directoryService = new DirectoryService(_logger, _fileSystem);
-
-            foreach (var video in videos)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var key = video.Path + video.DateModified.Ticks;
-
-                var extract = !previouslyFailedImages.Contains(key, StringComparer.OrdinalIgnoreCase);
-
-                try
-                {
-                    var chapters = _itemRepo.GetChapters(video);
-
-                    var success = await _encodingManager.RefreshChapterImages(video, directoryService, chapters, extract, true, cancellationToken).ConfigureAwait(false);
-
-                    if (!success)
-                    {
-                        previouslyFailedImages.Add(key);
-
-                        var parentPath = Path.GetDirectoryName(failHistoryPath);
-
-                        Directory.CreateDirectory(parentPath);
-
-                        string text = string.Join("|", previouslyFailedImages);
-                        File.WriteAllText(failHistoryPath, text);
-                    }
-
-                    numComplete++;
-                    double percent = numComplete;
-                    percent /= videos.Count;
-
-                    progress.Report(100 * percent);
-                }
-                catch (ObjectDisposedException)
-                {
-                    //TODO Investigate and properly fix.
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the name of the task
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name => "Chapter image extraction";
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description => "Creates thumbnails for videos that have chapters.";
-
-        /// <summary>
-        /// Gets the category.
-        /// </summary>
-        /// <value>The category.</value>
-        public string Category => "Library";
-    }
-}
diff --git a/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
deleted file mode 100644
index 98685cebea..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Globalization;
-using System.Threading;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Represents a task trigger that fires everyday
-    /// </summary>
-    public class DailyTrigger : ITaskTrigger
-    {
-        /// <summary>
-        /// Get the time of day to trigger the task to run
-        /// </summary>
-        /// <value>The time of day.</value>
-        public TimeSpan TimeOfDay { get; set; }
-
-        /// <summary>
-        /// Gets or sets the options of this task.
-        /// </summary>
-        public TaskOptions TaskOptions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timer.
-        /// </summary>
-        /// <value>The timer.</value>
-        private Timer Timer { get; set; }
-
-        /// <summary>
-        /// Stars waiting for the trigger action
-        /// </summary>
-        /// <param name="lastResult">The last result.</param>
-        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
-        public void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
-        {
-            DisposeTimer();
-
-            var now = DateTime.Now;
-
-            var triggerDate = now.TimeOfDay > TimeOfDay ? now.Date.AddDays(1) : now.Date;
-            triggerDate = triggerDate.Add(TimeOfDay);
-
-            var dueTime = triggerDate - now;
-
-            logger.LogInformation("Daily trigger for {0} set to fire at {1}, which is {2} minutes from now.", taskName, triggerDate.ToString(), dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
-
-            Timer = new Timer(state => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
-        }
-
-        /// <summary>
-        /// Stops waiting for the trigger action
-        /// </summary>
-        public void Stop()
-        {
-            DisposeTimer();
-        }
-
-        /// <summary>
-        /// Disposes the timer.
-        /// </summary>
-        private void DisposeTimer()
-        {
-            if (Timer != null)
-            {
-                Timer.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [triggered].
-        /// </summary>
-        public event EventHandler<EventArgs> Triggered;
-
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
-        {
-            if (Triggered != null)
-            {
-                Triggered(this, EventArgs.Empty);
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
deleted file mode 100644
index 3a34da3af2..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Represents a task trigger that runs repeatedly on an interval
-    /// </summary>
-    public class IntervalTrigger : ITaskTrigger
-    {
-        /// <summary>
-        /// Gets or sets the interval.
-        /// </summary>
-        /// <value>The interval.</value>
-        public TimeSpan Interval { get; set; }
-
-        /// <summary>
-        /// Gets or sets the options of this task.
-        /// </summary>
-        public TaskOptions TaskOptions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timer.
-        /// </summary>
-        /// <value>The timer.</value>
-        private Timer Timer { get; set; }
-
-        private DateTime _lastStartDate;
-
-        /// <summary>
-        /// Stars waiting for the trigger action
-        /// </summary>
-        /// <param name="lastResult">The last result.</param>
-        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
-        public void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
-        {
-            DisposeTimer();
-
-            DateTime triggerDate;
-
-            if (lastResult == null)
-            {
-                // Task has never been completed before
-                triggerDate = DateTime.UtcNow.AddHours(1);
-            }
-            else
-            {
-                triggerDate = new[] { lastResult.EndTimeUtc, _lastStartDate }.Max().Add(Interval);
-            }
-
-            if (DateTime.UtcNow > triggerDate)
-            {
-                triggerDate = DateTime.UtcNow.AddMinutes(1);
-            }
-
-            var dueTime = triggerDate - DateTime.UtcNow;
-            var maxDueTime = TimeSpan.FromDays(7);
-
-            if (dueTime > maxDueTime)
-            {
-                dueTime = maxDueTime;
-            }
-
-            Timer = new Timer(state => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
-        }
-
-        /// <summary>
-        /// Stops waiting for the trigger action
-        /// </summary>
-        public void Stop()
-        {
-            DisposeTimer();
-        }
-
-        /// <summary>
-        /// Disposes the timer.
-        /// </summary>
-        private void DisposeTimer()
-        {
-            if (Timer != null)
-            {
-                Timer.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [triggered].
-        /// </summary>
-        public event EventHandler<EventArgs> Triggered;
-
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
-        {
-            DisposeTimer();
-
-            if (Triggered != null)
-            {
-                _lastStartDate = DateTime.UtcNow;
-                Triggered(this, EventArgs.Empty);
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
deleted file mode 100644
index 68031170fd..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Tasks;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Class PeopleValidationTask
-    /// </summary>
-    public class PeopleValidationTask : IScheduledTask
-    {
-        /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-
-        private readonly IServerApplicationHost _appHost;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PeopleValidationTask" /> class.
-        /// </summary>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="appHost">The server application host</param>
-        public PeopleValidationTask(ILibraryManager libraryManager, IServerApplicationHost appHost)
-        {
-            _libraryManager = libraryManager;
-            _appHost = appHost;
-        }
-
-        /// <summary>
-        /// Creates the triggers that define when the task will run
-        /// </summary>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-        {
-            return new[]
-            {
-                // Every so often
-                new TaskTriggerInfo
-                {
-                    Type = TaskTriggerInfo.TriggerInterval,
-                    IntervalTicks = TimeSpan.FromDays(7).Ticks
-                }
-            };
-        }
-
-        public string Key => "RefreshPeople";
-
-        /// <summary>
-        /// Returns the task to be executed
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task.</returns>
-        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            return _libraryManager.ValidatePeople(cancellationToken, progress);
-        }
-
-        /// <summary>
-        /// Gets the name of the task
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name => "Refresh people";
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description => "Updates metadata for actors and directors in your media library.";
-
-        /// <summary>
-        /// Gets the category.
-        /// </summary>
-        /// <value>The category.</value>
-        public string Category => "Library";
-    }
-}
diff --git a/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
deleted file mode 100644
index 62533a0173..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using MediaBrowser.Common;
-using MediaBrowser.Common.Updates;
-using MediaBrowser.Model.Net;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Progress;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Plugin Update Task
-    /// </summary>
-    public class PluginUpdateTask : IScheduledTask, IConfigurableScheduledTask
-    {
-        /// <summary>
-        /// The _logger
-        /// </summary>
-        private readonly ILogger _logger;
-
-        private readonly IInstallationManager _installationManager;
-
-        private readonly IApplicationHost _appHost;
-
-        public PluginUpdateTask(ILogger logger, IInstallationManager installationManager, IApplicationHost appHost)
-        {
-            _logger = logger;
-            _installationManager = installationManager;
-            _appHost = appHost;
-        }
-
-        /// <summary>
-        /// Creates the triggers that define when the task will run
-        /// </summary>
-        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-        {
-            return new[] { 
-            
-                // At startup
-                new TaskTriggerInfo {Type = TaskTriggerInfo.TriggerStartup},
-
-                // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks}
-            };
-        }
-
-        public string Key
-        {
-            get { return "PluginUpdates"; }
-        }
-
-        /// <summary>
-        /// Update installed plugins
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task.</returns>
-        public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            progress.Report(0);
-
-            var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(typeof(PluginUpdateTask).Assembly.GetName().Version, true, cancellationToken).ConfigureAwait(false)).ToList();
-
-            progress.Report(10);
-
-            var numComplete = 0;
-
-            foreach (var package in packagesToInstall)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                try
-                {
-                    await _installationManager.InstallPackage(package, true, new SimpleProgress<double>(), cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    // InstallPackage has it's own inner cancellation token, so only throw this if it's ours
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        throw;
-                    }
-                }
-                catch (HttpException ex)
-                {
-                    _logger.LogError(ex, "Error downloading {0}", package.name);
-                }
-                catch (IOException ex)
-                {
-                    _logger.LogError(ex, "Error updating {0}", package.name);
-                }
-
-                // Update progress
-                lock (progress)
-                {
-                    numComplete++;
-                    double percent = numComplete;
-                    percent /= packagesToInstall.Count;
-
-                    progress.Report(90 * percent + 10);
-                }
-            }
-
-            progress.Report(100);
-        }
-
-        /// <summary>
-        /// Gets the name of the task
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get { return "Check for plugin updates"; }
-        }
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description
-        {
-            get { return "Downloads and installs updates for plugins that are configured to update automatically."; }
-        }
-
-        public string Category
-        {
-            get { return "Application"; }
-        }
-
-        public bool IsHidden => true;
-
-        public bool IsEnabled => true;
-
-        public bool IsLogged => true;
-    }
-}
diff --git a/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs b/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
deleted file mode 100644
index f6fa64d136..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.Server.Implementations.Library;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Tasks;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Class RefreshMediaLibraryTask
-    /// </summary>
-    public class RefreshMediaLibraryTask : IScheduledTask
-    {
-        /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-        private readonly IServerConfigurationManager _config;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefreshMediaLibraryTask" /> class.
-        /// </summary>
-        /// <param name="libraryManager">The library manager.</param>
-        public RefreshMediaLibraryTask(ILibraryManager libraryManager, IServerConfigurationManager config)
-        {
-            _libraryManager = libraryManager;
-            _config = config;
-        }
-
-        /// <summary>
-        /// Creates the triggers that define when the task will run
-        /// </summary>
-        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-        {
-            return new[] {
-
-                // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(12).Ticks}
-            };
-        }
-
-        /// <summary>
-        /// Executes the internal.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task.</returns>
-        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            progress.Report(0);
-
-            return ((LibraryManager)_libraryManager).ValidateMediaLibraryInternal(progress, cancellationToken);
-        }
-
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name => "Scan media library";
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description => "Scans your media library and refreshes metatata based on configuration.";
-
-        /// <summary>
-        /// Gets the category.
-        /// </summary>
-        /// <value>The category.</value>
-        public string Category => "Library";
-
-        public string Key => "RefreshLibrary";
-    }
-}
diff --git a/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
deleted file mode 100644
index 08ff4f55f7..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Class StartupTaskTrigger
-    /// </summary>
-    public class StartupTrigger : ITaskTrigger
-    {
-        public int DelayMs { get; set; }
-
-        /// <summary>
-        /// Gets or sets the options of this task.
-        /// </summary>
-        public TaskOptions TaskOptions { get; set; }
-
-        public StartupTrigger()
-        {
-            DelayMs = 3000;
-        }
-
-        /// <summary>
-        /// Stars waiting for the trigger action
-        /// </summary>
-        /// <param name="lastResult">The last result.</param>
-        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
-        public async void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
-        {
-            if (isApplicationStartup)
-            {
-                await Task.Delay(DelayMs).ConfigureAwait(false);
-
-                OnTriggered();
-            }
-        }
-
-        /// <summary>
-        /// Stops waiting for the trigger action
-        /// </summary>
-        public void Stop()
-        {
-        }
-
-        /// <summary>
-        /// Occurs when [triggered].
-        /// </summary>
-        public event EventHandler<EventArgs> Triggered;
-
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
-        {
-            if (Triggered != null)
-            {
-                Triggered(this, EventArgs.Empty);
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
new file mode 100644
index 0000000000..5373b4392b
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Class ChapterImagesTask
+    /// </summary>
+    class ChapterImagesTask : IScheduledTask
+    {
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+        /// <summary>
+        /// The _library manager
+        /// </summary>
+        private readonly ILibraryManager _libraryManager;
+
+        private readonly IItemRepository _itemRepo;
+
+        private readonly IApplicationPaths _appPaths;
+
+        private readonly IEncodingManager _encodingManager;
+        private readonly IFileSystem _fileSystem;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class.
+        /// </summary>
+        public ChapterImagesTask(ILoggerFactory loggerFactory, ILibraryManager libraryManager, IItemRepository itemRepo, IApplicationPaths appPaths, IEncodingManager encodingManager, IFileSystem fileSystem)
+        {
+            _logger = loggerFactory.CreateLogger(GetType().Name);
+            _libraryManager = libraryManager;
+            _itemRepo = itemRepo;
+            _appPaths = appPaths;
+            _encodingManager = encodingManager;
+            _fileSystem = fileSystem;
+        }
+
+        /// <summary>
+        /// Creates the triggers that define when the task will run
+        /// </summary>
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+        {
+            return new[] {
+
+                new TaskTriggerInfo
+                {
+                    Type = TaskTriggerInfo.TriggerDaily,
+                    TimeOfDayTicks = TimeSpan.FromHours(2).Ticks,
+                    MaxRuntimeTicks = TimeSpan.FromHours(4).Ticks
+                }
+            };
+        }
+
+        public string Key => "RefreshChapterImages";
+
+        /// <summary>
+        /// Returns the task to be executed
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns>Task.</returns>
+        public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            var videos = _libraryManager.GetItemList(new InternalItemsQuery
+            {
+                MediaTypes = new[] { MediaType.Video },
+                IsFolder = false,
+                Recursive = true,
+                DtoOptions = new DtoOptions(false)
+                {
+                    EnableImages = false
+                },
+                SourceTypes = new SourceType[] { SourceType.Library },
+                HasChapterImages = false,
+                IsVirtualItem = false
+
+            })
+                .OfType<Video>()
+                .ToList();
+
+            var numComplete = 0;
+
+            var failHistoryPath = Path.Combine(_appPaths.CachePath, "chapter-failures.txt");
+
+            List<string> previouslyFailedImages;
+
+            if (File.Exists(failHistoryPath))
+            {
+                try
+                {
+                    previouslyFailedImages = File.ReadAllText(failHistoryPath)
+                        .Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
+                        .ToList();
+                }
+                catch (IOException)
+                {
+                    previouslyFailedImages = new List<string>();
+                }
+            }
+            else
+            {
+                previouslyFailedImages = new List<string>();
+            }
+
+            var directoryService = new DirectoryService(_logger, _fileSystem);
+
+            foreach (var video in videos)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var key = video.Path + video.DateModified.Ticks;
+
+                var extract = !previouslyFailedImages.Contains(key, StringComparer.OrdinalIgnoreCase);
+
+                try
+                {
+                    var chapters = _itemRepo.GetChapters(video);
+
+                    var success = await _encodingManager.RefreshChapterImages(video, directoryService, chapters, extract, true, cancellationToken).ConfigureAwait(false);
+
+                    if (!success)
+                    {
+                        previouslyFailedImages.Add(key);
+
+                        var parentPath = Path.GetDirectoryName(failHistoryPath);
+
+                        Directory.CreateDirectory(parentPath);
+
+                        string text = string.Join("|", previouslyFailedImages);
+                        File.WriteAllText(failHistoryPath, text);
+                    }
+
+                    numComplete++;
+                    double percent = numComplete;
+                    percent /= videos.Count;
+
+                    progress.Report(100 * percent);
+                }
+                catch (ObjectDisposedException)
+                {
+                    //TODO Investigate and properly fix.
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the task
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name => "Chapter image extraction";
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description => "Creates thumbnails for videos that have chapters.";
+
+        /// <summary>
+        /// Gets the category.
+        /// </summary>
+        /// <value>The category.</value>
+        public string Category => "Library";
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
new file mode 100644
index 0000000000..68031170fd
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Tasks;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Class PeopleValidationTask
+    /// </summary>
+    public class PeopleValidationTask : IScheduledTask
+    {
+        /// <summary>
+        /// The _library manager
+        /// </summary>
+        private readonly ILibraryManager _libraryManager;
+
+        private readonly IServerApplicationHost _appHost;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PeopleValidationTask" /> class.
+        /// </summary>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="appHost">The server application host</param>
+        public PeopleValidationTask(ILibraryManager libraryManager, IServerApplicationHost appHost)
+        {
+            _libraryManager = libraryManager;
+            _appHost = appHost;
+        }
+
+        /// <summary>
+        /// Creates the triggers that define when the task will run
+        /// </summary>
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+        {
+            return new[]
+            {
+                // Every so often
+                new TaskTriggerInfo
+                {
+                    Type = TaskTriggerInfo.TriggerInterval,
+                    IntervalTicks = TimeSpan.FromDays(7).Ticks
+                }
+            };
+        }
+
+        public string Key => "RefreshPeople";
+
+        /// <summary>
+        /// Returns the task to be executed
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns>Task.</returns>
+        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            return _libraryManager.ValidatePeople(cancellationToken, progress);
+        }
+
+        /// <summary>
+        /// Gets the name of the task
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name => "Refresh people";
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description => "Updates metadata for actors and directors in your media library.";
+
+        /// <summary>
+        /// Gets the category.
+        /// </summary>
+        /// <value>The category.</value>
+        public string Category => "Library";
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
new file mode 100644
index 0000000000..62533a0173
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
@@ -0,0 +1,142 @@
+using MediaBrowser.Common;
+using MediaBrowser.Common.Updates;
+using MediaBrowser.Model.Net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Progress;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Plugin Update Task
+    /// </summary>
+    public class PluginUpdateTask : IScheduledTask, IConfigurableScheduledTask
+    {
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+
+        private readonly IInstallationManager _installationManager;
+
+        private readonly IApplicationHost _appHost;
+
+        public PluginUpdateTask(ILogger logger, IInstallationManager installationManager, IApplicationHost appHost)
+        {
+            _logger = logger;
+            _installationManager = installationManager;
+            _appHost = appHost;
+        }
+
+        /// <summary>
+        /// Creates the triggers that define when the task will run
+        /// </summary>
+        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+        {
+            return new[] { 
+            
+                // At startup
+                new TaskTriggerInfo {Type = TaskTriggerInfo.TriggerStartup},
+
+                // Every so often
+                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks}
+            };
+        }
+
+        public string Key
+        {
+            get { return "PluginUpdates"; }
+        }
+
+        /// <summary>
+        /// Update installed plugins
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns>Task.</returns>
+        public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            progress.Report(0);
+
+            var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(typeof(PluginUpdateTask).Assembly.GetName().Version, true, cancellationToken).ConfigureAwait(false)).ToList();
+
+            progress.Report(10);
+
+            var numComplete = 0;
+
+            foreach (var package in packagesToInstall)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                try
+                {
+                    await _installationManager.InstallPackage(package, true, new SimpleProgress<double>(), cancellationToken).ConfigureAwait(false);
+                }
+                catch (OperationCanceledException)
+                {
+                    // InstallPackage has it's own inner cancellation token, so only throw this if it's ours
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        throw;
+                    }
+                }
+                catch (HttpException ex)
+                {
+                    _logger.LogError(ex, "Error downloading {0}", package.name);
+                }
+                catch (IOException ex)
+                {
+                    _logger.LogError(ex, "Error updating {0}", package.name);
+                }
+
+                // Update progress
+                lock (progress)
+                {
+                    numComplete++;
+                    double percent = numComplete;
+                    percent /= packagesToInstall.Count;
+
+                    progress.Report(90 * percent + 10);
+                }
+            }
+
+            progress.Report(100);
+        }
+
+        /// <summary>
+        /// Gets the name of the task
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return "Check for plugin updates"; }
+        }
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description
+        {
+            get { return "Downloads and installs updates for plugins that are configured to update automatically."; }
+        }
+
+        public string Category
+        {
+            get { return "Application"; }
+        }
+
+        public bool IsHidden => true;
+
+        public bool IsEnabled => true;
+
+        public bool IsLogged => true;
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
new file mode 100644
index 0000000000..f6fa64d136
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.Server.Implementations.Library;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Tasks;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Class RefreshMediaLibraryTask
+    /// </summary>
+    public class RefreshMediaLibraryTask : IScheduledTask
+    {
+        /// <summary>
+        /// The _library manager
+        /// </summary>
+        private readonly ILibraryManager _libraryManager;
+        private readonly IServerConfigurationManager _config;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RefreshMediaLibraryTask" /> class.
+        /// </summary>
+        /// <param name="libraryManager">The library manager.</param>
+        public RefreshMediaLibraryTask(ILibraryManager libraryManager, IServerConfigurationManager config)
+        {
+            _libraryManager = libraryManager;
+            _config = config;
+        }
+
+        /// <summary>
+        /// Creates the triggers that define when the task will run
+        /// </summary>
+        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+        {
+            return new[] {
+
+                // Every so often
+                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(12).Ticks}
+            };
+        }
+
+        /// <summary>
+        /// Executes the internal.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns>Task.</returns>
+        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            progress.Report(0);
+
+            return ((LibraryManager)_libraryManager).ValidateMediaLibraryInternal(progress, cancellationToken);
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name => "Scan media library";
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description => "Scans your media library and refreshes metatata based on configuration.";
+
+        /// <summary>
+        /// Gets the category.
+        /// </summary>
+        /// <value>The category.</value>
+        public string Category => "Library";
+
+        public string Key => "RefreshLibrary";
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
new file mode 100644
index 0000000000..98685cebea
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Globalization;
+using System.Threading;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Represents a task trigger that fires everyday
+    /// </summary>
+    public class DailyTrigger : ITaskTrigger
+    {
+        /// <summary>
+        /// Get the time of day to trigger the task to run
+        /// </summary>
+        /// <value>The time of day.</value>
+        public TimeSpan TimeOfDay { get; set; }
+
+        /// <summary>
+        /// Gets or sets the options of this task.
+        /// </summary>
+        public TaskOptions TaskOptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the timer.
+        /// </summary>
+        /// <value>The timer.</value>
+        private Timer Timer { get; set; }
+
+        /// <summary>
+        /// Stars waiting for the trigger action
+        /// </summary>
+        /// <param name="lastResult">The last result.</param>
+        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
+        public void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+        {
+            DisposeTimer();
+
+            var now = DateTime.Now;
+
+            var triggerDate = now.TimeOfDay > TimeOfDay ? now.Date.AddDays(1) : now.Date;
+            triggerDate = triggerDate.Add(TimeOfDay);
+
+            var dueTime = triggerDate - now;
+
+            logger.LogInformation("Daily trigger for {0} set to fire at {1}, which is {2} minutes from now.", taskName, triggerDate.ToString(), dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+
+            Timer = new Timer(state => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
+        }
+
+        /// <summary>
+        /// Stops waiting for the trigger action
+        /// </summary>
+        public void Stop()
+        {
+            DisposeTimer();
+        }
+
+        /// <summary>
+        /// Disposes the timer.
+        /// </summary>
+        private void DisposeTimer()
+        {
+            if (Timer != null)
+            {
+                Timer.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Occurs when [triggered].
+        /// </summary>
+        public event EventHandler<EventArgs> Triggered;
+
+        /// <summary>
+        /// Called when [triggered].
+        /// </summary>
+        private void OnTriggered()
+        {
+            if (Triggered != null)
+            {
+                Triggered(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
new file mode 100644
index 0000000000..3a34da3af2
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Linq;
+using System.Threading;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Represents a task trigger that runs repeatedly on an interval
+    /// </summary>
+    public class IntervalTrigger : ITaskTrigger
+    {
+        /// <summary>
+        /// Gets or sets the interval.
+        /// </summary>
+        /// <value>The interval.</value>
+        public TimeSpan Interval { get; set; }
+
+        /// <summary>
+        /// Gets or sets the options of this task.
+        /// </summary>
+        public TaskOptions TaskOptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the timer.
+        /// </summary>
+        /// <value>The timer.</value>
+        private Timer Timer { get; set; }
+
+        private DateTime _lastStartDate;
+
+        /// <summary>
+        /// Stars waiting for the trigger action
+        /// </summary>
+        /// <param name="lastResult">The last result.</param>
+        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
+        public void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+        {
+            DisposeTimer();
+
+            DateTime triggerDate;
+
+            if (lastResult == null)
+            {
+                // Task has never been completed before
+                triggerDate = DateTime.UtcNow.AddHours(1);
+            }
+            else
+            {
+                triggerDate = new[] { lastResult.EndTimeUtc, _lastStartDate }.Max().Add(Interval);
+            }
+
+            if (DateTime.UtcNow > triggerDate)
+            {
+                triggerDate = DateTime.UtcNow.AddMinutes(1);
+            }
+
+            var dueTime = triggerDate - DateTime.UtcNow;
+            var maxDueTime = TimeSpan.FromDays(7);
+
+            if (dueTime > maxDueTime)
+            {
+                dueTime = maxDueTime;
+            }
+
+            Timer = new Timer(state => OnTriggered(), null, dueTime, TimeSpan.FromMilliseconds(-1));
+        }
+
+        /// <summary>
+        /// Stops waiting for the trigger action
+        /// </summary>
+        public void Stop()
+        {
+            DisposeTimer();
+        }
+
+        /// <summary>
+        /// Disposes the timer.
+        /// </summary>
+        private void DisposeTimer()
+        {
+            if (Timer != null)
+            {
+                Timer.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Occurs when [triggered].
+        /// </summary>
+        public event EventHandler<EventArgs> Triggered;
+
+        /// <summary>
+        /// Called when [triggered].
+        /// </summary>
+        private void OnTriggered()
+        {
+            DisposeTimer();
+
+            if (Triggered != null)
+            {
+                _lastStartDate = DateTime.UtcNow;
+                Triggered(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
new file mode 100644
index 0000000000..08ff4f55f7
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Class StartupTaskTrigger
+    /// </summary>
+    public class StartupTrigger : ITaskTrigger
+    {
+        public int DelayMs { get; set; }
+
+        /// <summary>
+        /// Gets or sets the options of this task.
+        /// </summary>
+        public TaskOptions TaskOptions { get; set; }
+
+        public StartupTrigger()
+        {
+            DelayMs = 3000;
+        }
+
+        /// <summary>
+        /// Stars waiting for the trigger action
+        /// </summary>
+        /// <param name="lastResult">The last result.</param>
+        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
+        public async void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+        {
+            if (isApplicationStartup)
+            {
+                await Task.Delay(DelayMs).ConfigureAwait(false);
+
+                OnTriggered();
+            }
+        }
+
+        /// <summary>
+        /// Stops waiting for the trigger action
+        /// </summary>
+        public void Stop()
+        {
+        }
+
+        /// <summary>
+        /// Occurs when [triggered].
+        /// </summary>
+        public event EventHandler<EventArgs> Triggered;
+
+        /// <summary>
+        /// Called when [triggered].
+        /// </summary>
+        private void OnTriggered()
+        {
+            if (Triggered != null)
+            {
+                Triggered(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
new file mode 100644
index 0000000000..2a6a7b13cd
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Threading;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Represents a task trigger that fires on a weekly basis
+    /// </summary>
+    public class WeeklyTrigger : ITaskTrigger
+    {
+        /// <summary>
+        /// Get the time of day to trigger the task to run
+        /// </summary>
+        /// <value>The time of day.</value>
+        public TimeSpan TimeOfDay { get; set; }
+
+        /// <summary>
+        /// Gets or sets the day of week.
+        /// </summary>
+        /// <value>The day of week.</value>
+        public DayOfWeek DayOfWeek { get; set; }
+
+        /// <summary>
+        /// Gets or sets the options of this task.
+        /// </summary>
+        public TaskOptions TaskOptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the timer.
+        /// </summary>
+        /// <value>The timer.</value>
+        private Timer Timer { get; set; }
+
+        /// <summary>
+        /// Stars waiting for the trigger action
+        /// </summary>
+        /// <param name="lastResult">The last result.</param>
+        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
+        public void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
+        {
+            DisposeTimer();
+
+            var triggerDate = GetNextTriggerDateTime();
+
+            Timer = new Timer(state => OnTriggered(), null, triggerDate - DateTime.Now, TimeSpan.FromMilliseconds(-1));
+        }
+
+        /// <summary>
+        /// Gets the next trigger date time.
+        /// </summary>
+        /// <returns>DateTime.</returns>
+        private DateTime GetNextTriggerDateTime()
+        {
+            var now = DateTime.Now;
+
+            // If it's on the same day
+            if (now.DayOfWeek == DayOfWeek)
+            {
+                // It's either later today, or a week from now
+                return now.TimeOfDay < TimeOfDay ? now.Date.Add(TimeOfDay) : now.Date.AddDays(7).Add(TimeOfDay);
+            }
+
+            var triggerDate = now.Date;
+
+            // Walk the date forward until we get to the trigger day
+            while (triggerDate.DayOfWeek != DayOfWeek)
+            {
+                triggerDate = triggerDate.AddDays(1);
+            }
+
+            // Return the trigger date plus the time offset
+            return triggerDate.Add(TimeOfDay);
+        }
+
+        /// <summary>
+        /// Stops waiting for the trigger action
+        /// </summary>
+        public void Stop()
+        {
+            DisposeTimer();
+        }
+
+        /// <summary>
+        /// Disposes the timer.
+        /// </summary>
+        private void DisposeTimer()
+        {
+            if (Timer != null)
+            {
+                Timer.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Occurs when [triggered].
+        /// </summary>
+        public event EventHandler<EventArgs> Triggered;
+
+        /// <summary>
+        /// Called when [triggered].
+        /// </summary>
+        private void OnTriggered()
+        {
+            if (Triggered != null)
+            {
+                Triggered(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs
deleted file mode 100644
index 2a6a7b13cd..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Threading;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.ScheduledTasks
-{
-    /// <summary>
-    /// Represents a task trigger that fires on a weekly basis
-    /// </summary>
-    public class WeeklyTrigger : ITaskTrigger
-    {
-        /// <summary>
-        /// Get the time of day to trigger the task to run
-        /// </summary>
-        /// <value>The time of day.</value>
-        public TimeSpan TimeOfDay { get; set; }
-
-        /// <summary>
-        /// Gets or sets the day of week.
-        /// </summary>
-        /// <value>The day of week.</value>
-        public DayOfWeek DayOfWeek { get; set; }
-
-        /// <summary>
-        /// Gets or sets the options of this task.
-        /// </summary>
-        public TaskOptions TaskOptions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timer.
-        /// </summary>
-        /// <value>The timer.</value>
-        private Timer Timer { get; set; }
-
-        /// <summary>
-        /// Stars waiting for the trigger action
-        /// </summary>
-        /// <param name="lastResult">The last result.</param>
-        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
-        public void Start(TaskResult lastResult, ILogger logger, string taskName, bool isApplicationStartup)
-        {
-            DisposeTimer();
-
-            var triggerDate = GetNextTriggerDateTime();
-
-            Timer = new Timer(state => OnTriggered(), null, triggerDate - DateTime.Now, TimeSpan.FromMilliseconds(-1));
-        }
-
-        /// <summary>
-        /// Gets the next trigger date time.
-        /// </summary>
-        /// <returns>DateTime.</returns>
-        private DateTime GetNextTriggerDateTime()
-        {
-            var now = DateTime.Now;
-
-            // If it's on the same day
-            if (now.DayOfWeek == DayOfWeek)
-            {
-                // It's either later today, or a week from now
-                return now.TimeOfDay < TimeOfDay ? now.Date.Add(TimeOfDay) : now.Date.AddDays(7).Add(TimeOfDay);
-            }
-
-            var triggerDate = now.Date;
-
-            // Walk the date forward until we get to the trigger day
-            while (triggerDate.DayOfWeek != DayOfWeek)
-            {
-                triggerDate = triggerDate.AddDays(1);
-            }
-
-            // Return the trigger date plus the time offset
-            return triggerDate.Add(TimeOfDay);
-        }
-
-        /// <summary>
-        /// Stops waiting for the trigger action
-        /// </summary>
-        public void Stop()
-        {
-            DisposeTimer();
-        }
-
-        /// <summary>
-        /// Disposes the timer.
-        /// </summary>
-        private void DisposeTimer()
-        {
-            if (Timer != null)
-            {
-                Timer.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [triggered].
-        /// </summary>
-        public event EventHandler<EventArgs> Triggered;
-
-        /// <summary>
-        /// Called when [triggered].
-        /// </summary>
-        private void OnTriggered()
-        {
-            if (Triggered != null)
-            {
-                Triggered(this, EventArgs.Empty);
-            }
-        }
-    }
-}
-- 
cgit v1.2.3