alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-27 02:56:54 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy.

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 20:26:35 -05:00
parent 931c0ea455
commit fdafa59683
88 changed files with 1025 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
View File

@@ -39,7 +39,7 @@ namespace MediaBrowser.WebDashboard.Api
/// <returns>Task{IEnumerable{TaskInfo}}.</returns>
protected override Task<DashboardInfo> GetDataToSend(object state)
{
return Task.FromResult(DashboardService.GetDashboardInfo((Kernel)Kernel));
return Task.FromResult(DashboardService.GetDashboardInfo((Kernel)Kernel, Logger));
}
}
}

10
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@@ -5,6 +5,7 @@ using MediaBrowser.Common.ScheduledTasks.Tasks;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Plugins;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Tasks;
using ServiceStack.ServiceHost;
using ServiceStack.WebHost.Endpoints;
@@ -97,18 +98,21 @@ namespace MediaBrowser.WebDashboard.Api
{
var kernel = (Kernel)Kernel;
return GetDashboardInfo(kernel);
return GetDashboardInfo(kernel, Logger);
}
/// <summary>
/// Gets the dashboard info.
/// </summary>
/// <param name="kernel">The kernel.</param>
/// <param name="logger">The logger.</param>
/// <returns>DashboardInfo.</returns>
public static DashboardInfo GetDashboardInfo(Kernel kernel)
public static DashboardInfo GetDashboardInfo(Kernel kernel, ILogger logger)
{
var connections = kernel.UserManager.ActiveConnections.ToArray();
var dtoBuilder = new DtoBuilder(logger);
return new DashboardInfo
{
SystemInfo = kernel.GetSystemInfo(),
@@ -121,7 +125,7 @@ namespace MediaBrowser.WebDashboard.Api
ActiveConnections = connections,
Users = kernel.Users.Where(u => connections.Any(c => c.UserId == u.Id)).Select(DtoBuilder.GetDtoUser).ToArray()
Users = kernel.Users.Where(u => connections.Any(c => c.UserId == u.Id)).Select(dtoBuilder.GetDtoUser).ToArray()
};
}