diff --git a/MediaBrowser.Common/ScheduledTasks/IntervalTrigger.cs b/MediaBrowser.Common/ScheduledTasks/IntervalTrigger.cs
index a12fea14cd..e07dfcceb4 100644
--- a/MediaBrowser.Common/ScheduledTasks/IntervalTrigger.cs
+++ b/MediaBrowser.Common/ScheduledTasks/IntervalTrigger.cs
@@ -1,6 +1,7 @@
using MediaBrowser.Model.Events;
using MediaBrowser.Model.Tasks;
using System;
+using System.Linq;
using System.Threading;
namespace MediaBrowser.Common.ScheduledTasks
@@ -30,16 +31,7 @@ namespace MediaBrowser.Common.ScheduledTasks
///
public TaskExecutionOptions TaskOptions { get; set; }
- ///
- /// Gets or sets the first run delay.
- ///
- /// The first run delay.
- public TimeSpan FirstRunDelay { get; set; }
-
- public IntervalTrigger()
- {
- FirstRunDelay = TimeSpan.FromHours(1);
- }
+ private DateTime _lastStartDate;
///
/// Stars waiting for the trigger action
@@ -50,20 +42,21 @@ namespace MediaBrowser.Common.ScheduledTasks
{
DisposeTimer();
- var triggerDate = lastResult != null ?
- lastResult.EndTimeUtc.Add(Interval) :
- DateTime.UtcNow.Add(FirstRunDelay);
+ 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)
{
- if (isApplicationStartup)
- {
- triggerDate = DateTime.UtcNow.AddMinutes(1);
- }
- else
- {
- triggerDate = DateTime.UtcNow.AddMinutes(1);
- }
+ triggerDate = DateTime.UtcNow.AddMinutes(1);
}
Timer = new Timer(state => OnTriggered(), null, triggerDate - DateTime.UtcNow, TimeSpan.FromMilliseconds(-1));
@@ -98,8 +91,11 @@ namespace MediaBrowser.Common.ScheduledTasks
///
private void OnTriggered()
{
+ DisposeTimer();
+
if (Triggered != null)
{
+ _lastStartDate = DateTime.UtcNow;
Triggered(this, new GenericEventArgs(TaskOptions));
}
}
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 62c2386f05..9fdb528dd8 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -4855,6 +4855,9 @@
Resources\dashboard-ui\strings\javascript\kk.json
+
+ Resources\dashboard-ui\strings\javascript\ko.json
+
Resources\dashboard-ui\strings\javascript\ms.json
@@ -4924,6 +4927,9 @@
Resources\dashboard-ui\thirdparty\headroom.js
+
+ Resources\dashboard-ui\thirdparty\hls.min.js
+
Resources\dashboard-ui\thirdparty\jquery.unveil-custom.js
diff --git a/README.md b/README.md
index f10556ee70..6ee0855b74 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ It features a REST-based api with built-in documention to facilitate client deve
## Emby Apps
- [Android Mobile (Play Store)](https://play.google.com/store/apps/details?id=com.mb.android "Android Mobile (Play Store)")
-- [Android Mobile (Amazon)](http://www.amazon.com/Emby-Mobile/dp/B017OSA1QS "Android Mobile (Amazon)")
+- [Android Mobile (Amazon)](http://www.amazon.com/Emby-for-Android/dp/B00GVH9O0I "Android Mobile (Amazon)")
- [Android TV](https://play.google.com/store/apps/details?id=tv.emby.embyatv "Android TV")
- [Amazon Fire TV](http://www.amazon.com/Emby-for-Fire-TV/dp/B00VVJKTW8 "Amazon Fire TV")
- [HTML5](http://app.emby.media "HTML5")