From 02ebeb0e5bc85a62a395e5605b66b9b558c4e2c8 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 29 Sep 2013 20:51:04 -0400 Subject: added logging during app update, and IsHD --- .../BaseApplicationHost.cs | 2 + .../MediaBrowser.Common.Implementations.csproj | 1 + .../ScheduledTasks/Tasks/PluginUpdateTask.cs | 134 +++++++++++++++++++++ .../Updates/InstallationManager.cs | 10 +- 4 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs (limited to 'MediaBrowser.Common.Implementations') diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 0d96df9a2..8bd203dcd 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -586,6 +586,8 @@ namespace MediaBrowser.Common.Implementations /// The new version. protected void OnApplicationUpdated(Version newVersion) { + Logger.Info("Application has been updated to version {0}", newVersion); + EventHelper.QueueEventIfNotNull(ApplicationUpdated, this, new GenericEventArgs { Argument = newVersion }, Logger); NotifyPendingRestart(); diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index 11da950f7..af71afcd1 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -79,6 +79,7 @@ + diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs new file mode 100644 index 000000000..f70b849ee --- /dev/null +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs @@ -0,0 +1,134 @@ +using MediaBrowser.Common.ScheduledTasks; +using MediaBrowser.Common.Updates; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Net; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks +{ + /// + /// Plugin Update Task + /// + public class PluginUpdateTask : IScheduledTask + { + /// + /// The _logger + /// + 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; + } + + /// + /// Creates the triggers that define when the task will run + /// + /// IEnumerable{BaseTaskTrigger}. + public IEnumerable GetDefaultTriggers() + { + return new ITaskTrigger[] { + + // At startup + new StartupTrigger (), + + // Every so often + new IntervalTrigger { Interval = TimeSpan.FromHours(24)} + }; + } + + /// + /// Update installed plugins + /// + /// The cancellation token. + /// The progress. + /// Task. + public async Task Execute(CancellationToken cancellationToken, IProgress progress) + { + progress.Report(0); + + var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(_appHost.ApplicationVersion, true, cancellationToken).ConfigureAwait(false)).ToList(); + + progress.Report(10); + + var numComplete = 0; + + // Create tasks for each one + var tasks = packagesToInstall.Select(i => Task.Run(async () => + { + cancellationToken.ThrowIfCancellationRequested(); + + try + { + await _installationManager.InstallPackage(i, new Progress(), 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.ErrorException("Error downloading {0}", ex, i.name); + } + catch (IOException ex) + { + _logger.ErrorException("Error updating {0}", ex, i.name); + } + + // Update progress + lock (progress) + { + numComplete++; + double percent = numComplete; + percent /= packagesToInstall.Count; + + progress.Report((90 * percent) + 10); + } + })); + + cancellationToken.ThrowIfCancellationRequested(); + + await Task.WhenAll(tasks).ConfigureAwait(false); + + progress.Report(100); + } + + /// + /// Gets the name of the task + /// + /// The name. + public string Name + { + get { return "Check for plugin updates"; } + } + + /// + /// Gets the description. + /// + /// The description. + public string Description + { + get { return "Downloads and installs updates for plugins that are configured to update automatically."; } + } + + public string Category + { + get { return "Application"; } + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs index e1757afd5..b3b63da15 100644 --- a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs +++ b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs @@ -439,7 +439,6 @@ namespace MediaBrowser.Common.Implementations.Updates finally { // Dispose the progress object and remove the installation from the in-progress list - innerProgress.Dispose(); tuple.Item2.Dispose(); } @@ -457,8 +456,10 @@ namespace MediaBrowser.Common.Implementations.Updates // Do the install await PerformPackageInstallation(progress, package, cancellationToken).ConfigureAwait(false); + var extension = Path.GetExtension(package.targetFilename) ?? ""; + // Do plugin-specific processing - if (!(Path.GetExtension(package.targetFilename) ?? "").Equals(".zip", StringComparison.OrdinalIgnoreCase)) + if (!string.Equals(extension, ".zip", StringComparison.OrdinalIgnoreCase) && !string.Equals(extension, ".rar", StringComparison.OrdinalIgnoreCase) && !string.Equals(extension, ".7z", StringComparison.OrdinalIgnoreCase)) { // Set last update time if we were installed before var plugin = _applicationHost.Plugins.FirstOrDefault(p => p.Name.Equals(package.name, StringComparison.OrdinalIgnoreCase)); @@ -471,7 +472,6 @@ namespace MediaBrowser.Common.Implementations.Updates { OnPluginInstalled(package); } - } } @@ -479,7 +479,8 @@ namespace MediaBrowser.Common.Implementations.Updates { // Target based on if it is an archive or single assembly // zip archives are assumed to contain directory structures relative to our ProgramDataPath - var isArchive = string.Equals(Path.GetExtension(package.targetFilename), ".zip", StringComparison.OrdinalIgnoreCase); + var extension = Path.GetExtension(package.targetFilename); + var isArchive = string.Equals(extension, ".zip", StringComparison.OrdinalIgnoreCase) || string.Equals(extension, ".rar", StringComparison.OrdinalIgnoreCase) || string.Equals(extension, ".7z", StringComparison.OrdinalIgnoreCase); var target = Path.Combine(isArchive ? _appPaths.TempUpdatePath : _appPaths.PluginsPath, package.targetFilename); // Download to temporary file so that, if interrupted, it won't destroy the existing installation @@ -536,7 +537,6 @@ namespace MediaBrowser.Common.Implementations.Updates } } - /// /// Uninstalls a plugin /// -- cgit v1.2.3