From fe3323a492a35cae736350e896afd077e13e111d Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Fri, 1 Mar 2013 16:22:34 -0500 Subject: fixes around http response caching, updated the mb icon in the dashboard, and isolated web socket events --- MediaBrowser.ServerApplication/ApplicationHost.cs | 45 ++++- .../MediaBrowser.ServerApplication.csproj | 1 + MediaBrowser.ServerApplication/WebSocketEvents.cs | 199 +++++++++++++++++++++ 3 files changed, 240 insertions(+), 5 deletions(-) create mode 100644 MediaBrowser.ServerApplication/WebSocketEvents.cs (limited to 'MediaBrowser.ServerApplication') diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 894f7cc756..9034434838 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -1,5 +1,4 @@ using MediaBrowser.Api; -using MediaBrowser.ClickOnce; using MediaBrowser.Common.Implementations; using MediaBrowser.Common.Implementations.HttpServer; using MediaBrowser.Common.Implementations.Logging; @@ -13,7 +12,10 @@ using MediaBrowser.Common.Net; using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Common.Updates; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Resolvers; +using MediaBrowser.Controller.Updates; using MediaBrowser.IsoMounter; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; @@ -57,13 +59,15 @@ namespace MediaBrowser.ServerApplication /// private readonly IXmlSerializer _xmlSerializer = new XmlSerializer(); + private WebSocketEvents _webSocketEvents; + /// /// Gets the server application paths. /// /// The server application paths. protected IServerApplicationPaths ServerApplicationPaths { - get { return (IServerApplicationPaths) ApplicationPaths; } + get { return (IServerApplicationPaths)ApplicationPaths; } } /// @@ -74,7 +78,7 @@ namespace MediaBrowser.ServerApplication : base() { Kernel = new Kernel(this, ServerApplicationPaths, _xmlSerializer, Logger); - + var networkManager = new NetworkManager(); var serverManager = new ServerManager(this, Kernel, networkManager, _jsonSerializer, Logger); @@ -135,6 +139,20 @@ namespace MediaBrowser.ServerApplication RegisterSingleInstance(new LibraryManager(Kernel, Logger, taskManager, userManager)); } + /// + /// Finds the parts. + /// + protected override void FindParts() + { + base.FindParts(); + + Resolve().AddParts(GetExports(), GetExports(), GetExports()); + + Kernel.InstallationManager = (InstallationManager)CreateInstance(typeof(InstallationManager)); + + _webSocketEvents = new WebSocketEvents(Resolve(), Resolve(), Resolve(), Resolve(), Resolve(), Kernel.InstallationManager); + } + /// /// Restarts this instance. /// @@ -164,8 +182,8 @@ namespace MediaBrowser.ServerApplication var availablePackages = await pkgManager.GetAvailablePackages(Resolve(), Resolve(), Kernel.SecurityManager, Kernel.ResourcePools, Resolve(), CancellationToken.None).ConfigureAwait(false); var version = Kernel.InstallationManager.GetLatestCompatibleVersion(availablePackages, "MBServer", Kernel.Configuration.SystemUpdateLevel); - return version != null ? new CheckForUpdateResult {AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version} : - new CheckForUpdateResult {AvailableVersion = ApplicationVersion, IsUpdateAvailable = false}; + return version != null ? new CheckForUpdateResult { AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version } : + new CheckForUpdateResult { AvailableVersion = ApplicationVersion, IsUpdateAvailable = false }; } /// @@ -228,5 +246,22 @@ namespace MediaBrowser.ServerApplication { App.Instance.Dispatcher.Invoke(App.Instance.Shutdown); } + + /// + /// Releases unmanaged and - optionally - managed resources. + /// + /// true to release both managed and unmanaged resources; false to release only unmanaged resources. + protected override void Dispose(bool dispose) + { + if (dispose) + { + if (_webSocketEvents != null) + { + _webSocketEvents.Dispose(); + } + } + + base.Dispose(dispose); + } } } diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index bc69c96648..a55b49b659 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -162,6 +162,7 @@ + MSBuild:Compile Designer diff --git a/MediaBrowser.ServerApplication/WebSocketEvents.cs b/MediaBrowser.ServerApplication/WebSocketEvents.cs new file mode 100644 index 0000000000..6ffd077f8d --- /dev/null +++ b/MediaBrowser.ServerApplication/WebSocketEvents.cs @@ -0,0 +1,199 @@ +using MediaBrowser.Common.Events; +using MediaBrowser.Common.Kernel; +using MediaBrowser.Common.Plugins; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Updates; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Updates; +using System; + +namespace MediaBrowser.ServerApplication +{ + /// + /// Class WebSocketEvents + /// + public class WebSocketEvents : IDisposable + { + /// + /// The _server manager + /// + private readonly IServerManager _serverManager; + /// + /// The _logger + /// + private readonly ILogger _logger; + + /// + /// The _user manager + /// + private readonly IUserManager _userManager; + + /// + /// The _library manager + /// + private readonly ILibraryManager _libraryManager; + + /// + /// The _installation manager + /// + private readonly InstallationManager _installationManager; + + /// + /// The _kernel + /// + private readonly IKernel _kernel; + + /// + /// Initializes a new instance of the class. + /// + /// The server manager. + /// The logger. + /// The user manager. + public WebSocketEvents(IServerManager serverManager, IKernel kernel, ILogger logger, IUserManager userManager, ILibraryManager libraryManager, InstallationManager installationManager) + { + _serverManager = serverManager; + _logger = logger; + _userManager = userManager; + _libraryManager = libraryManager; + _installationManager = installationManager; + _kernel = kernel; + + _userManager.UserDeleted += userManager_UserDeleted; + _userManager.UserUpdated += userManager_UserUpdated; + + _libraryManager.LibraryChanged += libraryManager_LibraryChanged; + + kernel.HasPendingRestartChanged += kernel_HasPendingRestartChanged; + + installationManager.PluginUninstalled += InstallationManager_PluginUninstalled; + installationManager.PackageInstalling += installationManager_PackageInstalling; + installationManager.PackageInstallationCancelled += installationManager_PackageInstallationCancelled; + installationManager.PackageInstallationCompleted += installationManager_PackageInstallationCompleted; + installationManager.PackageInstallationFailed += installationManager_PackageInstallationFailed; + } + + /// + /// Installations the manager_ package installation failed. + /// + /// The sender. + /// The e. + void installationManager_PackageInstallationFailed(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstallationFailed", e.Argument); + } + + /// + /// Installations the manager_ package installation completed. + /// + /// The sender. + /// The e. + void installationManager_PackageInstallationCompleted(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstallationCompleted", e.Argument); + } + + /// + /// Installations the manager_ package installation cancelled. + /// + /// The sender. + /// The e. + void installationManager_PackageInstallationCancelled(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstallationCancelled", e.Argument); + } + + /// + /// Installations the manager_ package installing. + /// + /// The sender. + /// The e. + void installationManager_PackageInstalling(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstalling", e.Argument); + } + + /// + /// Handles the LibraryChanged event of the libraryManager control. + /// + /// The source of the event. + /// The instance containing the event data. + void libraryManager_LibraryChanged(object sender, ChildrenChangedEventArgs e) + { + _serverManager.SendWebSocketMessage("LibraryChanged", () => DtoBuilder.GetLibraryUpdateInfo(e)); + } + + /// + /// Installations the manager_ plugin uninstalled. + /// + /// The sender. + /// The e. + void InstallationManager_PluginUninstalled(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PluginUninstalled", e.Argument.GetPluginInfo()); + } + + /// + /// Handles the HasPendingRestartChanged event of the kernel control. + /// + /// The source of the event. + /// The instance containing the event data. + void kernel_HasPendingRestartChanged(object sender, EventArgs e) + { + var kernel = (IKernel)sender; + + _serverManager.SendWebSocketMessage("HasPendingRestartChanged", kernel.GetSystemInfo()); + } + + /// + /// Users the manager_ user updated. + /// + /// The sender. + /// The e. + void userManager_UserUpdated(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("UserUpdated", new DtoBuilder(_logger).GetDtoUser(e.Argument)); + } + + /// + /// Users the manager_ user deleted. + /// + /// The sender. + /// The e. + void userManager_UserDeleted(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("UserDeleted", e.Argument.Id.ToString()); + } + + /// + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// + public void Dispose() + { + Dispose(true); + } + + /// + /// Releases unmanaged and - optionally - managed resources. + /// + /// true to release both managed and unmanaged resources; false to release only unmanaged resources. + protected virtual void Dispose(bool dispose) + { + if (dispose) + { + _userManager.UserDeleted -= userManager_UserDeleted; + _userManager.UserUpdated -= userManager_UserUpdated; + + _libraryManager.LibraryChanged -= libraryManager_LibraryChanged; + + _installationManager.PluginUninstalled -= InstallationManager_PluginUninstalled; + _installationManager.PackageInstalling -= installationManager_PackageInstalling; + _installationManager.PackageInstallationCancelled -= installationManager_PackageInstallationCancelled; + _installationManager.PackageInstallationCompleted -= installationManager_PackageInstallationCompleted; + _installationManager.PackageInstallationFailed -= installationManager_PackageInstallationFailed; + + _kernel.HasPendingRestartChanged -= kernel_HasPendingRestartChanged; + } + } + } +} -- cgit v1.2.3