From af7aa597c35279e286ee88641854db69744e7b15 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Thu, 28 Feb 2013 14:32:41 -0500 Subject: referenced core plugins, fixed some dashboard issues, extracted library manager --- .../UserLibrary/BaseItemsByNameService.cs | 8 +++-- MediaBrowser.Api/UserLibrary/GenresService.cs | 11 +++--- MediaBrowser.Api/UserLibrary/ItemsService.cs | 12 +++++-- MediaBrowser.Api/UserLibrary/PersonsService.cs | 7 ++-- MediaBrowser.Api/UserLibrary/StudiosService.cs | 11 +++--- MediaBrowser.Api/UserLibrary/UserLibraryService.cs | 41 +++++++++++----------- MediaBrowser.Api/UserLibrary/YearsService.cs | 13 +++---- 7 files changed, 51 insertions(+), 52 deletions(-) (limited to 'MediaBrowser.Api/UserLibrary') diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs index 3cb17ff352..ce3d9d8e0c 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs @@ -24,14 +24,16 @@ namespace MediaBrowser.Api.UserLibrary /// The _user manager /// protected readonly IUserManager UserManager; + protected readonly ILibraryManager LibraryManager; /// /// Initializes a new instance of the class. /// /// The user manager. - protected BaseItemsByNameService(IUserManager userManager) + protected BaseItemsByNameService(IUserManager userManager, ILibraryManager libraryManager) { UserManager = userManager; + LibraryManager = libraryManager; } /// @@ -43,7 +45,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = UserManager.GetUserById(request.UserId); - var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.Id, UserManager, user.Id); + var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.Id, UserManager, LibraryManager, user.Id); IEnumerable items; @@ -126,7 +128,7 @@ namespace MediaBrowser.Api.UserLibrary return null; } - var dto = await new DtoBuilder(Logger).GetDtoBaseItem(item, user, fields).ConfigureAwait(false); + var dto = await new DtoBuilder(Logger).GetDtoBaseItem(item, user, fields, LibraryManager).ConfigureAwait(false); dto.ChildCount = stub.Item2(); diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs index 1c002a7c9f..a3b471d54e 100644 --- a/MediaBrowser.Api/UserLibrary/GenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GenresService.cs @@ -1,6 +1,4 @@ -using MediaBrowser.Common.Net; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using ServiceStack.ServiceHost; using System; @@ -24,7 +22,8 @@ namespace MediaBrowser.Api.UserLibrary /// public class GenresService : BaseItemsByNameService { - public GenresService(IUserManager userManager) : base(userManager) + public GenresService(IUserManager userManager, ILibraryManager libraryManager) + : base(userManager, libraryManager) { } @@ -64,9 +63,7 @@ namespace MediaBrowser.Api.UserLibrary /// Task{Genre}. protected override Task GetEntity(string name) { - var kernel = (Kernel)Kernel; - - return kernel.LibraryManager.GetGenre(name); + return LibraryManager.GetGenre(name); } } } diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index efc97651b9..c248ae582a 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -150,13 +150,19 @@ namespace MediaBrowser.Api.UserLibrary /// private readonly IUserManager _userManager; + /// + /// The _library manager + /// + private readonly ILibraryManager _libraryManager; + /// /// Initializes a new instance of the class. /// /// The user manager. - public ItemsService(IUserManager userManager) + public ItemsService(IUserManager userManager, ILibraryManager libraryManager) { _userManager = userManager; + _libraryManager = libraryManager; } /// @@ -203,7 +209,7 @@ namespace MediaBrowser.Api.UserLibrary var dtoBuilder = new DtoBuilder(Logger); - var returnItems = await Task.WhenAll(pagedItems.Select(i => dtoBuilder.GetDtoBaseItem(i, user, fields))).ConfigureAwait(false); + var returnItems = await Task.WhenAll(pagedItems.Select(i => dtoBuilder.GetDtoBaseItem(i, user, fields, _libraryManager))).ConfigureAwait(false); return new ItemsResult { @@ -221,7 +227,7 @@ namespace MediaBrowser.Api.UserLibrary /// private IEnumerable GetItemsToSerialize(GetItems request, User user) { - var item = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.ParentId, _userManager, user.Id); + var item = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.ParentId, _userManager, _libraryManager, user.Id); // Default list type = children diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs index 4528cb2bc0..21e6a9049c 100644 --- a/MediaBrowser.Api/UserLibrary/PersonsService.cs +++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs @@ -29,7 +29,8 @@ namespace MediaBrowser.Api.UserLibrary /// public class PersonsService : BaseItemsByNameService { - public PersonsService(IUserManager userManager) : base(userManager) + public PersonsService(IUserManager userManager, ILibraryManager libraryManager) + : base(userManager, libraryManager) { } @@ -98,9 +99,7 @@ namespace MediaBrowser.Api.UserLibrary /// Task{Genre}. protected override Task GetEntity(string name) { - var kernel = (Kernel)Kernel; - - return kernel.LibraryManager.GetPerson(name); + return LibraryManager.GetPerson(name); } } } diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs index cfb0179a2a..7e9a0445d4 100644 --- a/MediaBrowser.Api/UserLibrary/StudiosService.cs +++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Controller; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using ServiceStack.ServiceHost; using System; @@ -23,8 +22,8 @@ namespace MediaBrowser.Api.UserLibrary /// public class StudiosService : BaseItemsByNameService { - public StudiosService(IUserManager userManager) - : base(userManager) + public StudiosService(IUserManager userManager, ILibraryManager libraryManager) + : base(userManager, libraryManager) { } @@ -64,9 +63,7 @@ namespace MediaBrowser.Api.UserLibrary /// Task{Studio}. protected override Task GetEntity(string name) { - var kernel = (Kernel)Kernel; - - return kernel.LibraryManager.GetStudio(name); + return LibraryManager.GetStudio(name); } } } diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs index 1ca72b24f7..920532609c 100644 --- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs +++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs @@ -316,13 +316,15 @@ namespace MediaBrowser.Api.UserLibrary /// The _user manager /// private readonly IUserManager _userManager; + + private readonly ILibraryManager _libraryManager; /// /// Initializes a new instance of the class. /// /// The json serializer. /// jsonSerializer - public UserLibraryService(IJsonSerializer jsonSerializer, IUserManager userManager) + public UserLibraryService(IJsonSerializer jsonSerializer, IUserManager userManager, ILibraryManager libraryManager) : base() { if (jsonSerializer == null) @@ -332,6 +334,7 @@ namespace MediaBrowser.Api.UserLibrary _jsonSerializer = jsonSerializer; _userManager = userManager; + _libraryManager = libraryManager; } /// @@ -343,7 +346,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); // Get everything var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList(); @@ -352,7 +355,7 @@ namespace MediaBrowser.Api.UserLibrary var dtoBuilder = new DtoBuilder(Logger); - var items = movie.SpecialFeatures.Select(i => dtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList(); + var items = movie.SpecialFeatures.Select(i => dtoBuilder.GetDtoBaseItem(item, user, fields, _libraryManager)).AsParallel().Select(t => t.Result).ToList(); return ToOptimizedResult(items); } @@ -366,14 +369,14 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); // Get everything var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList(); var dtoBuilder = new DtoBuilder(Logger); - var items = item.LocalTrailers.Select(i => dtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList(); + var items = item.LocalTrailers.Select(i => dtoBuilder.GetDtoBaseItem(item, user, fields, _libraryManager)).AsParallel().Select(t => t.Result).ToList(); return ToOptimizedResult(items); } @@ -387,14 +390,14 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); // Get everything var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList(); var dtoBuilder = new DtoBuilder(Logger); - var result = dtoBuilder.GetDtoBaseItem(item, user, fields).Result; + var result = dtoBuilder.GetDtoBaseItem(item, user, fields, _libraryManager).Result; return ToOptimizedResult(result); } @@ -410,7 +413,7 @@ namespace MediaBrowser.Api.UserLibrary var user = _userManager.GetUserById(request.UserId); - var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); var result = kernel.IntroProviders.SelectMany(i => i.GetIntros(item, user)); @@ -429,15 +432,13 @@ namespace MediaBrowser.Api.UserLibrary var userId = new Guid(pathInfo.GetArgumentValue(1)); var itemId = pathInfo.GetArgumentValue(3); - var kernel = (Kernel)Kernel; - var user = _userManager.GetUserById(userId); - var item = (Folder)DtoBuilder.GetItemByClientId(itemId, _userManager, user.Id); + var item = (Folder)DtoBuilder.GetItemByClientId(itemId, _userManager, _libraryManager, user.Id); var displayPreferences = _jsonSerializer.DeserializeFromStream(request.RequestStream); - var task = kernel.LibraryManager.SaveDisplayPreferencesForFolder(user, item, displayPreferences); + var task = _libraryManager.SaveDisplayPreferencesForFolder(user, item, displayPreferences); Task.WaitAll(task); } @@ -450,7 +451,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); // Get the user data for this item var data = item.GetUserData(user, true); @@ -471,7 +472,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); // Get the user data for this item var data = item.GetUserData(user, true); @@ -492,7 +493,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); // Get the user data for this item var data = item.GetUserData(user, true); @@ -512,7 +513,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); // Get the user data for this item var data = item.GetUserData(user, true); @@ -545,7 +546,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); _userManager.OnPlaybackStart(user, item, ClientType.Other, string.Empty); } @@ -558,7 +559,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); var task = _userManager.OnPlaybackProgress(user, item, request.PositionTicks, ClientType.Other, string.Empty); @@ -573,7 +574,7 @@ namespace MediaBrowser.Api.UserLibrary { var user = _userManager.GetUserById(request.UserId); - var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, user.Id); + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, user.Id); var task = _userManager.OnPlaybackStopped(user, item, request.PositionTicks, ClientType.Other, string.Empty); @@ -602,7 +603,7 @@ namespace MediaBrowser.Api.UserLibrary /// Task. private Task UpdatePlayedStatus(User user, string itemId, bool wasPlayed) { - var item = DtoBuilder.GetItemByClientId(itemId, _userManager, user.Id); + var item = DtoBuilder.GetItemByClientId(itemId, _userManager, _libraryManager, user.Id); return item.SetPlayedStatus(user, wasPlayed, _userManager); } diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs index 8112b2da9f..07b08eb54a 100644 --- a/MediaBrowser.Api/UserLibrary/YearsService.cs +++ b/MediaBrowser.Api/UserLibrary/YearsService.cs @@ -1,6 +1,4 @@ -using MediaBrowser.Common.Net; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using ServiceStack.ServiceHost; using System; @@ -29,8 +27,9 @@ namespace MediaBrowser.Api.UserLibrary /// The us culture /// private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); - - public YearsService(IUserManager userManager) : base(userManager) + + public YearsService(IUserManager userManager, ILibraryManager libraryManager) + : base(userManager, libraryManager) { } @@ -70,9 +69,7 @@ namespace MediaBrowser.Api.UserLibrary /// Task{Studio}. protected override Task GetEntity(string name) { - var kernel = (Kernel)Kernel; - - return kernel.LibraryManager.GetYear(int.Parse(name, UsCulture)); + return LibraryManager.GetYear(int.Parse(name, UsCulture)); } } } -- cgit v1.2.3