diff options
Diffstat (limited to 'MediaBrowser.Common.Implementations')
| -rw-r--r-- | MediaBrowser.Common.Implementations/BaseApplicationHost.cs | 49 | ||||
| -rw-r--r-- | MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs | 8 |
2 files changed, 51 insertions, 6 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 31db86ddf..0bd61dbc2 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -557,14 +557,59 @@ namespace MediaBrowser.Common.Implementations /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value> public abstract bool CanSelfUpdate { get; } + private Tuple<CheckForUpdateResult, DateTime> _lastUpdateCheckResult; + /// <summary> /// Checks for update. /// </summary> /// <param name="cancellationToken">The cancellation token.</param> /// <param name="progress">The progress.</param> /// <returns>Task{CheckForUpdateResult}.</returns> - public abstract Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, - IProgress<double> progress); + public async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, + IProgress<double> progress) + { + if (_lastUpdateCheckResult != null) + { + // Let dev users get results more often for testing purposes + var cacheLength = ConfigurationManager.CommonConfiguration.SystemUpdateLevel == PackageVersionClass.Dev + ? TimeSpan.FromHours(1) + : TimeSpan.FromHours(12); + + if ((DateTime.UtcNow - _lastUpdateCheckResult.Item2) < cacheLength) + { + return _lastUpdateCheckResult.Item1; + } + } + + var result = await CheckForApplicationUpdateInternal(cancellationToken, progress).ConfigureAwait(false); + + _lastUpdateCheckResult = new Tuple<CheckForUpdateResult, DateTime>(result, DateTime.UtcNow); + + return _lastUpdateCheckResult.Item1; + } + + /// <summary> + /// Checks for application update internal. + /// </summary> + /// <param name="cancellationToken">The cancellation token.</param> + /// <param name="progress">The progress.</param> + /// <returns>Task{CheckForUpdateResult}.</returns> + private async Task<CheckForUpdateResult> CheckForApplicationUpdateInternal(CancellationToken cancellationToken, + IProgress<double> progress) + { + var availablePackages = await InstallationManager.GetAvailablePackagesWithoutRegistrationInfo(CancellationToken.None).ConfigureAwait(false); + + var version = InstallationManager.GetLatestCompatibleVersion(availablePackages, ApplicationUpdatePackageName, ConfigurationManager.CommonConfiguration.SystemUpdateLevel); + + return version != null ? new CheckForUpdateResult { AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version } : + new CheckForUpdateResult { AvailableVersion = ApplicationVersion, IsUpdateAvailable = false }; + } + + /// <summary> + /// Gets the name of the application update package. + /// </summary> + /// <value>The name of the application update package.</value> + protected abstract string ApplicationUpdatePackageName { get; } /// <summary> /// Updates the application. diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs index 118939178..0a134b5e5 100644 --- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs @@ -50,11 +50,11 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks { return new ITaskTrigger[] { - // 1am - new DailyTrigger { TimeOfDay = TimeSpan.FromHours(1) }, + // At startup + new StartupTrigger (), - // Every three hours - new IntervalTrigger { Interval = TimeSpan.FromHours(3)} + // Every so often + new IntervalTrigger { Interval = TimeSpan.FromHours(24)} }; } |