alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-29 21:36:31 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fixes around http response caching, updated the mb icon in the dashboard, and isolated web socket events

Browse Source
This commit is contained in:
LukePulverenti
2013-03-01 16:22:34 -05:00
parent 4c50301e7c
commit fe3323a492
20 changed files with 337 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@@ -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
/// </summary>
private readonly IXmlSerializer _xmlSerializer = new XmlSerializer();
private WebSocketEvents _webSocketEvents;
/// <summary>
/// Gets the server application paths.
/// </summary>
/// <value>The server application paths.</value>
protected IServerApplicationPaths ServerApplicationPaths
{
get { return (IServerApplicationPaths) ApplicationPaths; }
get { return (IServerApplicationPaths)ApplicationPaths; }
}
/// <summary>
@@ -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<ILibraryManager>(new LibraryManager(Kernel, Logger, taskManager, userManager));
}
/// <summary>
/// Finds the parts.
/// </summary>
protected override void FindParts()
{
base.FindParts();
Resolve<ILibraryManager>().AddParts(GetExports<IResolutionIgnoreRule>(), GetExports<IVirtualFolderCreator>(), GetExports<IBaseItemResolver>());
Kernel.InstallationManager = (InstallationManager)CreateInstance(typeof(InstallationManager));
_webSocketEvents = new WebSocketEvents(Resolve<IServerManager>(), Resolve<IKernel>(), Resolve<ILogger>(), Resolve<IUserManager>(), Resolve<ILibraryManager>(), Kernel.InstallationManager);
}
/// <summary>
/// Restarts this instance.
/// </summary>
@@ -164,8 +182,8 @@ namespace MediaBrowser.ServerApplication
var availablePackages = await pkgManager.GetAvailablePackages(Resolve<IHttpClient>(), Resolve<INetworkManager>(), Kernel.SecurityManager, Kernel.ResourcePools, Resolve<IJsonSerializer>(), 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 };
}
/// <summary>
@@ -228,5 +246,22 @@ namespace MediaBrowser.ServerApplication
{
App.Instance.Dispatcher.Invoke(App.Instance.Shutdown);
}
/// <summary>
/// Releases unmanaged and - optionally - managed resources.
/// </summary>
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
protected override void Dispose(bool dispose)
{
if (dispose)
{
if (_webSocketEvents != null)
{
_webSocketEvents.Dispose();
}
}
base.Dispose(dispose);
}
}
}