diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs | 62 |
1 files changed, 21 insertions, 41 deletions
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs b/MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs index b4bffc077..6325944f1 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs @@ -73,64 +73,44 @@ namespace MediaBrowser.Server.Implementations.EntryPoints _appHost.HasPendingRestartChanged += kernel_HasPendingRestartChanged; _installationManager.PluginUninstalled += InstallationManager_PluginUninstalled; - _installationManager.PackageInstalling += installationManager_PackageInstalling; - _installationManager.PackageInstallationCancelled += installationManager_PackageInstallationCancelled; - _installationManager.PackageInstallationCompleted += installationManager_PackageInstallationCompleted; - _installationManager.PackageInstallationFailed += installationManager_PackageInstallationFailed; + _installationManager.PackageInstalling += _installationManager_PackageInstalling; + _installationManager.PackageInstallationCancelled += _installationManager_PackageInstallationCancelled; + _installationManager.PackageInstallationCompleted += _installationManager_PackageInstallationCompleted; + _installationManager.PackageInstallationFailed += _installationManager_PackageInstallationFailed; _taskManager.TaskExecuting += _taskManager_TaskExecuting; _taskManager.TaskCompleted += _taskManager_TaskCompleted; } - void _taskManager_TaskCompleted(object sender, GenericEventArgs<TaskResult> e) + void _installationManager_PackageInstalling(object sender, InstallationEventArgs e) { - _serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument); + _serverManager.SendWebSocketMessage("PackageInstalling", e.InstallationInfo); } - void _taskManager_TaskExecuting(object sender, EventArgs e) + void _installationManager_PackageInstallationCancelled(object sender, InstallationEventArgs e) { - var task = (IScheduledTask)sender; - _serverManager.SendWebSocketMessage("ScheduledTaskStarted", task.Name); + _serverManager.SendWebSocketMessage("PackageInstallationCancelled", e.InstallationInfo); } - /// <summary> - /// Installations the manager_ package installation failed. - /// </summary> - /// <param name="sender">The sender.</param> - /// <param name="e">The e.</param> - void installationManager_PackageInstallationFailed(object sender, GenericEventArgs<InstallationInfo> e) + void _installationManager_PackageInstallationCompleted(object sender, InstallationEventArgs e) { - _serverManager.SendWebSocketMessage("PackageInstallationFailed", e.Argument); + _serverManager.SendWebSocketMessage("PackageInstallationCompleted", e.InstallationInfo); } - /// <summary> - /// Installations the manager_ package installation completed. - /// </summary> - /// <param name="sender">The sender.</param> - /// <param name="e">The e.</param> - void installationManager_PackageInstallationCompleted(object sender, GenericEventArgs<InstallationInfo> e) + void _installationManager_PackageInstallationFailed(object sender, InstallationFailedEventArgs e) { - _serverManager.SendWebSocketMessage("PackageInstallationCompleted", e.Argument); + _serverManager.SendWebSocketMessage("PackageInstallationFailed", e.InstallationInfo); } - /// <summary> - /// Installations the manager_ package installation cancelled. - /// </summary> - /// <param name="sender">The sender.</param> - /// <param name="e">The e.</param> - void installationManager_PackageInstallationCancelled(object sender, GenericEventArgs<InstallationInfo> e) + void _taskManager_TaskCompleted(object sender, GenericEventArgs<TaskResult> e) { - _serverManager.SendWebSocketMessage("PackageInstallationCancelled", e.Argument); + _serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument); } - /// <summary> - /// Installations the manager_ package installing. - /// </summary> - /// <param name="sender">The sender.</param> - /// <param name="e">The e.</param> - void installationManager_PackageInstalling(object sender, GenericEventArgs<InstallationInfo> e) + void _taskManager_TaskExecuting(object sender, EventArgs e) { - _serverManager.SendWebSocketMessage("PackageInstalling", e.Argument); + var task = (IScheduledTask)sender; + _serverManager.SendWebSocketMessage("ScheduledTaskStarted", task.Name); } /// <summary> @@ -195,10 +175,10 @@ namespace MediaBrowser.Server.Implementations.EntryPoints _userManager.UserUpdated -= userManager_UserUpdated; _installationManager.PluginUninstalled -= InstallationManager_PluginUninstalled; - _installationManager.PackageInstalling -= installationManager_PackageInstalling; - _installationManager.PackageInstallationCancelled -= installationManager_PackageInstallationCancelled; - _installationManager.PackageInstallationCompleted -= installationManager_PackageInstallationCompleted; - _installationManager.PackageInstallationFailed -= installationManager_PackageInstallationFailed; + _installationManager.PackageInstalling -= _installationManager_PackageInstalling; + _installationManager.PackageInstallationCancelled -= _installationManager_PackageInstallationCancelled; + _installationManager.PackageInstallationCompleted -= _installationManager_PackageInstallationCompleted; + _installationManager.PackageInstallationFailed -= _installationManager_PackageInstallationFailed; _appHost.HasPendingRestartChanged -= kernel_HasPendingRestartChanged; } |
