diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-12 18:49:45 -0400 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-12 18:49:45 -0400 |
| commit | 0cc0fbbe4300e58ec4faae9ba9e94787382e1a79 (patch) | |
| tree | 292c8d97cc00aea0665490f896b6f507a134826a /MediaBrowser.WebDashboard | |
| parent | 6b327581c690b5c1c6241ab10adce8d56e6fdb68 (diff) | |
#22 - Need to strip html tags from overviews
Diffstat (limited to 'MediaBrowser.WebDashboard')
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs index 38d5d32a80..5fc1f75c5d 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs @@ -35,6 +35,7 @@ namespace MediaBrowser.WebDashboard.Api /// The _user manager /// </summary> private readonly IUserManager _userManager; + private readonly ILibraryManager _libraryManager; /// <summary> /// Initializes a new instance of the <see cref="DashboardInfoWebSocketListener" /> class. @@ -57,7 +58,7 @@ namespace MediaBrowser.WebDashboard.Api /// <returns>Task{IEnumerable{TaskInfo}}.</returns> protected override Task<DashboardInfo> GetDataToSend(object state) { - return DashboardService.GetDashboardInfo(_appHost, Logger, _taskManager, _userManager); + return DashboardService.GetDashboardInfo(_appHost, Logger, _taskManager, _userManager, _libraryManager); } } } diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 4c861c61bd..150341b885 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -91,17 +91,19 @@ namespace MediaBrowser.WebDashboard.Api private readonly IUserManager _userManager; private readonly IServerApplicationHost _appHost; + private readonly ILibraryManager _libraryManager; /// <summary> /// Initializes a new instance of the <see cref="DashboardService" /> class. /// </summary> /// <param name="taskManager">The task manager.</param> /// <param name="userManager">The user manager.</param> - public DashboardService(ITaskManager taskManager, IUserManager userManager, IServerApplicationHost appHost) + public DashboardService(ITaskManager taskManager, IUserManager userManager, IServerApplicationHost appHost, ILibraryManager libraryManager) { _taskManager = taskManager; _userManager = userManager; _appHost = appHost; + _libraryManager = libraryManager; } /// <summary> @@ -111,7 +113,7 @@ namespace MediaBrowser.WebDashboard.Api /// <returns>System.Object.</returns> public object Get(GetDashboardInfo request) { - return GetDashboardInfo(_appHost, Logger, _taskManager, _userManager).Result; + return GetDashboardInfo(_appHost, Logger, _taskManager, _userManager, _libraryManager).Result; } /// <summary> @@ -121,11 +123,11 @@ namespace MediaBrowser.WebDashboard.Api /// <param name="taskManager">The task manager.</param> /// <param name="userManager">The user manager.</param> /// <returns>DashboardInfo.</returns> - public static async Task<DashboardInfo> GetDashboardInfo(IServerApplicationHost appHost, ILogger logger, ITaskManager taskManager, IUserManager userManager) + public static async Task<DashboardInfo> GetDashboardInfo(IServerApplicationHost appHost, ILogger logger, ITaskManager taskManager, IUserManager userManager, ILibraryManager libraryManager) { var connections = userManager.ConnectedUsers.ToArray(); - var dtoBuilder = new DtoBuilder(logger); + var dtoBuilder = new DtoBuilder(logger, libraryManager); var tasks = userManager.Users.Where(u => connections.Any(c => c.UserId == u.Id)).Select(dtoBuilder.GetUserDto); var users = await Task.WhenAll(tasks).ConfigureAwait(false); |
