aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Api/Movies/TrailersService.cs79
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemsService.cs82
-rw-r--r--MediaBrowser.Controller/Entities/Trailer.cs6
3 files changed, 27 insertions, 140 deletions
diff --git a/MediaBrowser.Api/Movies/TrailersService.cs b/MediaBrowser.Api/Movies/TrailersService.cs
index 39c7b7f44..4883b38fb 100644
--- a/MediaBrowser.Api/Movies/TrailersService.cs
+++ b/MediaBrowser.Api/Movies/TrailersService.cs
@@ -12,6 +12,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Controller.Collections;
+using MediaBrowser.Controller.Localization;
+using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Api.Movies
{
@@ -41,77 +44,37 @@ namespace MediaBrowser.Api.Movies
private readonly ILibraryManager _libraryManager;
private readonly IDtoService _dtoService;
- private readonly IChannelManager _channelManager;
+ private readonly ICollectionManager _collectionManager;
+ private readonly ILocalizationManager _localizationManager;
+ private readonly IJsonSerializer _json;
- /// <summary>
- /// Initializes a new instance of the <see cref="TrailersService"/> class.
- /// </summary>
- /// <param name="userManager">The user manager.</param>
- /// <param name="userDataRepository">The user data repository.</param>
- /// <param name="libraryManager">The library manager.</param>
- public TrailersService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IDtoService dtoService, IChannelManager channelManager)
+ public TrailersService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IDtoService dtoService, ICollectionManager collectionManager, ILocalizationManager localizationManager, IJsonSerializer json)
{
_userManager = userManager;
_userDataRepository = userDataRepository;
_libraryManager = libraryManager;
_dtoService = dtoService;
- _channelManager = channelManager;
+ _collectionManager = collectionManager;
+ _localizationManager = localizationManager;
+ _json = json;
}
- public async Task<object> Get(Getrailers request)
+ public object Get(Getrailers request)
{
- var user = !string.IsNullOrWhiteSpace(request.UserId) ? _userManager.GetUserById(request.UserId) : null;
- var result = await GetAllTrailers(user).ConfigureAwait(false);
-
- IEnumerable<BaseItem> items = result.Items;
-
- // Apply filters
- // Run them starting with the ones that are likely to reduce the list the most
- foreach (var filter in request.GetFilters().OrderByDescending(f => (int)f))
- {
- items = ItemsService.ApplyFilter(items, filter, user, _userDataRepository);
- }
+ var json = _json.SerializeToString(request);
+ var getItems = _json.DeserializeFromString<GetItems>(json);
- items = _libraryManager.Sort(items, user, request.GetOrderBy(), request.SortOrder ?? SortOrder.Ascending);
+ getItems.IncludeItemTypes = "Trailer";
- var itemsArray = items.ToList();
-
- var pagedItems = ApplyPaging(request, itemsArray);
-
- var dtoOptions = GetDtoOptions(request);
-
- var returnItems = _dtoService.GetBaseItemDtos(pagedItems, dtoOptions, user).ToArray();
-
- return new ItemsResult
+ return new ItemsService(_userManager, _libraryManager, _userDataRepository, _localizationManager, _dtoService, _collectionManager)
{
- TotalRecordCount = itemsArray.Count,
- Items = returnItems
- };
- }
+ AuthorizationContext = AuthorizationContext,
+ Logger = Logger,
+ Request = Request,
+ ResultFactory = ResultFactory,
+ SessionContext = SessionContext
- private IEnumerable<BaseItem> ApplyPaging(Getrailers request, IEnumerable<BaseItem> items)
- {
- // Start at
- if (request.StartIndex.HasValue)
- {
- items = items.Skip(request.StartIndex.Value);
- }
-
- // Return limit
- if (request.Limit.HasValue)
- {
- items = items.Take(request.Limit.Value);
- }
-
- return items;
- }
-
- private async Task<QueryResult<BaseItem>> GetAllTrailers(User user)
- {
- return _libraryManager.GetItems(new InternalItemsQuery(user)
- {
- IncludeItemTypes = new[] {typeof (Trailer).Name}
- });
+ }.Get(getItems);
}
}
}
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 761d10760..93e123dea 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -281,88 +281,6 @@ namespace MediaBrowser.Api.UserLibrary
return query;
}
- /// <summary>
- /// Applies filtering
- /// </summary>
- /// <param name="items">The items.</param>
- /// <param name="filter">The filter.</param>
- /// <param name="user">The user.</param>
- /// <param name="repository">The repository.</param>
- /// <returns>IEnumerable{BaseItem}.</returns>
- internal static IEnumerable<BaseItem> ApplyFilter(IEnumerable<BaseItem> items, ItemFilter filter, User user, IUserDataManager repository)
- {
- // Avoid implicitly captured closure
- var currentUser = user;
-
- switch (filter)
- {
- case ItemFilter.IsFavoriteOrLikes:
- return items.Where(item =>
- {
- var userdata = repository.GetUserData(user.Id, item.GetUserDataKey());
-
- if (userdata == null)
- {
- return false;
- }
-
- var likes = userdata.Likes ?? false;
- var favorite = userdata.IsFavorite;
-
- return likes || favorite;
- });
-
- case ItemFilter.Likes:
- return items.Where(item =>
- {
- var userdata = repository.GetUserData(user.Id, item.GetUserDataKey());
-
- return userdata != null && userdata.Likes.HasValue && userdata.Likes.Value;
- });
-
- case ItemFilter.Dislikes:
- return items.Where(item =>
- {
- var userdata = repository.GetUserData(user.Id, item.GetUserDataKey());
-
- return userdata != null && userdata.Likes.HasValue && !userdata.Likes.Value;
- });
-
- case ItemFilter.IsFavorite:
- return items.Where(item =>
- {
- var userdata = repository.GetUserData(user.Id, item.GetUserDataKey());
-
- return userdata != null && userdata.IsFavorite;
- });
-
- case ItemFilter.IsResumable:
- return items.Where(item =>
- {
- var userdata = repository.GetUserData(user.Id, item.GetUserDataKey());
-
- return userdata != null && userdata.PlaybackPositionTicks > 0;
- });
-
- case ItemFilter.IsPlayed:
- return items.Where(item => item.IsPlayed(currentUser));
-
- case ItemFilter.IsUnplayed:
- return items.Where(item => item.IsUnplayed(currentUser));
-
- case ItemFilter.IsFolder:
- return items.Where(item => item.IsFolder);
-
- case ItemFilter.IsNotFolder:
- return items.Where(item => !item.IsFolder);
-
- case ItemFilter.IsRecentlyAdded:
- return items.Where(item => (DateTime.UtcNow - item.DateCreated).TotalDays <= 10);
- }
-
- return items;
- }
-
private bool ApplyAdditionalFilters(GetItems request, BaseItem i, User user, ILibraryManager libraryManager)
{
// Artists
diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index a4ac34545..43d95a8d3 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -35,6 +35,12 @@ namespace MediaBrowser.Controller.Entities
public List<string> Keywords { get; set; }
+ [IgnoreDataMember]
+ public bool IsLocalTrailer
+ {
+ get { return TrailerTypes.Contains(TrailerType.LocalTrailer); }
+ }
+
/// <summary>
/// Gets or sets the taglines.
/// </summary>
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-08 01:57:30 +0000