Pushing missing changes

7 files changed, 1771 insertions, 0 deletions

diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
new file mode 100644
index 0000000000..709450bb23
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -0,0 +1,161 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    /// <summary>
+    /// Class BaseItemsByNameService
+    /// </summary>
+    /// <typeparam name="TItemType">The type of the T item type.</typeparam>
+    public abstract class BaseItemsByNameService<TItemType> : BaseRestService
+        where TItemType : BaseItem
+    {
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>Task{ItemsResult}.</returns>
+        protected async Task<ItemsResult> GetResult(GetItemsByName request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.Id, user.Id);
+
+            IEnumerable<BaseItem> items;
+
+            if (item.IsFolder)
+            {
+                var folder = (Folder)item;
+
+                items = request.Recursive ? folder.GetRecursiveChildren(user) : folder.GetChildren(user);
+            }
+            else
+            {
+                items = new[] { item };
+            }
+
+            var ibnItemsArray = GetAllItems(request, items, user).ToArray();
+            IEnumerable<Tuple<string, Func<int>>> ibnItems = ibnItemsArray;
+
+            var result = new ItemsResult
+            {
+                TotalRecordCount = ibnItemsArray.Length
+            };
+
+            if (request.StartIndex.HasValue || request.PageSize.HasValue)
+            {
+                if (request.StartIndex.HasValue)
+                {
+                    ibnItems = ibnItems.Skip(request.StartIndex.Value);
+                }
+
+                if (request.PageSize.HasValue)
+                {
+                    ibnItems = ibnItems.Take(request.PageSize.Value);
+                }
+
+            }
+
+            var tasks = ibnItems.Select(i => GetDto(i, user, new List<ItemFields>()));
+
+            var resultItems = await Task.WhenAll(tasks).ConfigureAwait(false);
+
+            result.Items = resultItems.Where(i => i != null).OrderByDescending(i => i.SortName ?? i.Name).ToArray();
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets all items.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
+        protected abstract IEnumerable<Tuple<string, Func<int>>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items, User user);
+
+        /// <summary>
+        /// Gets the entity.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>Task{BaseItem}.</returns>
+        protected abstract Task<TItemType> GetEntity(string name);
+
+        /// <summary>
+        /// Gets the dto.
+        /// </summary>
+        /// <param name="stub">The stub.</param>
+        /// <param name="user">The user.</param>
+        /// <param name="fields">The fields.</param>
+        /// <returns>Task{DtoBaseItem}.</returns>
+        private async Task<DtoBaseItem> GetDto(Tuple<string, Func<int>> stub, User user, List<ItemFields> fields)
+        {
+            BaseItem item;
+
+            try
+            {
+                item = await GetEntity(stub.Item1).ConfigureAwait(false);
+            }
+            catch (IOException ex)
+            {
+                Logger.ErrorException("Error getting IBN item {0}", ex, stub.Item1);
+                return null;
+            }
+
+            var dto = await DtoBuilder.GetDtoBaseItem(item, user, fields).ConfigureAwait(false);
+
+            dto.ChildCount = stub.Item2();
+
+            return dto;
+        }
+    }
+
+    /// <summary>
+    /// Class GetItemsByName
+    /// </summary>
+    public class GetItemsByName : IReturn<ItemsResult>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        /// <summary>
+        /// Gets or sets the start index.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+        /// <summary>
+        /// Gets or sets the size of the page.
+        /// </summary>
+        /// <value>The size of the page.</value>
+        public int? PageSize { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="GetItemsByName" /> is recursive.
+        /// </summary>
+        /// <value><c>true</c> if recursive; otherwise, <c>false</c>.</value>
+        public bool Recursive { get; set; }
+        /// <summary>
+        /// Gets or sets the sort order.
+        /// </summary>
+        /// <value>The sort order.</value>
+        public SortOrder? SortOrder { get; set; }
+        /// <summary>
+        /// If specified the search will be localized within a specific item or folder
+        /// </summary>
+        /// <value>The item id.</value>
+        public string Id { get; set; }
+    }
+}
diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
new file mode 100644
index 0000000000..ea97fea3ee
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/GenresService.cs
@@ -0,0 +1,69 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    /// <summary>
+    /// Class GetGenres
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/Genres", "GET")]
+    [Route("/Users/{UserId}/Items/Root/Genres", "GET")]
+    public class GetGenres : GetItemsByName
+    {
+    }
+
+    /// <summary>
+    /// Class GenresService
+    /// </summary>
+    [Export(typeof(IRestfulService))]
+    public class GenresService : BaseItemsByNameService<Genre>
+    {
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetGenres request)
+        {
+            var result = GetResult(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets all items.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
+        protected override IEnumerable<Tuple<string, Func<int>>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items, User user)
+        {
+            var itemsList = items.Where(i => i.Genres != null).ToList();
+
+            return itemsList
+                .SelectMany(i => i.Genres)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .Select(name => new Tuple<string, Func<int>>(name, () => itemsList.Count(i => i.Genres.Contains(name, StringComparer.OrdinalIgnoreCase))));
+        }
+
+        /// <summary>
+        /// Gets the entity.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>Task{Genre}.</returns>
+        protected override Task<Genre> GetEntity(string name)
+        {
+            var kernel = (Kernel)Kernel;
+
+            return kernel.LibraryManager.GetGenre(name);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
new file mode 100644
index 0000000000..764d099e71
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -0,0 +1,788 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    /// <summary>
+    /// Class GetItems
+    /// </summary>
+    [Route("/Users/{UserId}/Items", "GET")]
+    public class GetItems : IReturn<ItemsResult>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+
+        /// <summary>
+        /// Specify this to localize the search to a specific item or folder. Omit to use the root.
+        /// </summary>
+        /// <value>The parent id.</value>
+        public string ParentId { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Whether or not to perform the query recursively
+        /// </summary>
+        /// <value><c>true</c> if recursive; otherwise, <c>false</c>.</value>
+        public bool Recursive { get; set; }
+
+        /// <summary>
+        /// Limit results to items containing a specific person
+        /// </summary>
+        /// <value>The person.</value>
+        public string Person { get; set; }
+
+        /// <summary>
+        /// If the Person filter is used, this can also be used to restrict to a specific person type
+        /// </summary>
+        /// <value>The type of the person.</value>
+        public string PersonType { get; set; }
+
+        /// <summary>
+        /// Search characters used to find items
+        /// </summary>
+        /// <value>The index by.</value>
+        public string SearchTerm { get; set; }
+
+        /// <summary>
+        /// The dynamic, localized index function name
+        /// </summary>
+        /// <value>The index by.</value>
+        public string IndexBy { get; set; }
+
+        /// <summary>
+        /// The dynamic, localized sort function name
+        /// </summary>
+        /// <value>The dynamic sort by.</value>
+        public string DynamicSortBy { get; set; }
+
+        /// <summary>
+        /// What to sort the results by
+        /// </summary>
+        /// <value>The sort by.</value>
+        public string SortBy { get; set; }
+
+        /// <summary>
+        /// The sort order to return results with
+        /// </summary>
+        /// <value>The sort order.</value>
+        public string SortOrder { get; set; }
+
+        /// <summary>
+        /// Filters to apply to the results
+        /// </summary>
+        /// <value>The filters.</value>
+        public string Filters { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public string Fields { get; set; }
+
+        /// <summary>
+        /// Limit results to items containing specific genres
+        /// </summary>
+        /// <value>The genres.</value>
+        public string Genres { get; set; }
+
+        /// <summary>
+        /// Limit results to items containing specific studios
+        /// </summary>
+        /// <value>The studios.</value>
+        public string Studios { get; set; }
+
+        /// <summary>
+        /// Gets or sets the exclude item types.
+        /// </summary>
+        /// <value>The exclude item types.</value>
+        public string ExcludeItemTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the include item types.
+        /// </summary>
+        /// <value>The include item types.</value>
+        public string IncludeItemTypes { get; set; }
+
+        /// <summary>
+        /// Limit results to items containing specific years
+        /// </summary>
+        /// <value>The years.</value>
+        public string Years { get; set; }
+
+        /// <summary>
+        /// Gets or sets the image types.
+        /// </summary>
+        /// <value>The image types.</value>
+        public string ImageTypes { get; set; }
+    }
+
+    /// <summary>
+    /// Class ItemsService
+    /// </summary>
+    [Export(typeof(IRestfulService))]
+    public class ItemsService : BaseRestService
+    {
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetItems request)
+        {
+            var result = GetItems(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets the items.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>Task{ItemsResult}.</returns>
+        private async Task<ItemsResult> GetItems(GetItems request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var items = GetItemsToSerialize(request, user);
+
+            // Apply filters
+            // Run them starting with the ones that are likely to reduce the list the most
+            foreach (var filter in GetFilters(request).OrderByDescending(f => (int)f))
+            {
+                items = ApplyFilter(items, filter, user);
+            }
+
+            items = ApplyAdditionalFilters(request, items);
+
+            items = ApplySearchTerm(request, items);
+
+            items = ApplySortOrder(request, items, user);
+
+            var itemsArray = items.ToArray();
+
+            var pagedItems = ApplyPaging(request, itemsArray);
+
+            var fields = GetItemFields(request).ToList();
+
+            var returnItems = await Task.WhenAll(pagedItems.Select(i => DtoBuilder.GetDtoBaseItem(i, user, fields))).ConfigureAwait(false);
+
+            return new ItemsResult
+            {
+                TotalRecordCount = itemsArray.Length,
+                Items = returnItems
+            };
+        }
+
+        /// <summary>
+        /// Gets the items to serialize.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        /// <exception cref="System.InvalidOperationException"></exception>
+        private IEnumerable<BaseItem> GetItemsToSerialize(GetItems request, User user)
+        {
+            var item = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.ParentId, user.Id);
+
+            // Default list type = children
+
+            if (request.Recursive)
+            {
+                return ((Folder)item).GetRecursiveChildren(user);
+            }
+
+            return ((Folder)item).GetChildren(user, request.IndexBy, request.DynamicSortBy, GetSortOrder(request));
+        }
+
+        /// <summary>
+        /// Applies sort order
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        private IEnumerable<BaseItem> ApplySortOrder(GetItems request, IEnumerable<BaseItem> items, User user)
+        {
+            var isFirst = true;
+            var descending = (GetSortOrder(request) ?? SortOrder.Ascending) == SortOrder.Descending;
+
+            IOrderedEnumerable<BaseItem> orderedItems = null;
+
+            foreach (var orderBy in GetOrderBy(request).Select(o => GetComparer(o, user)))
+            {
+                if (isFirst)
+                {
+                    orderedItems = descending ? items.OrderByDescending(i => i, orderBy) : items.OrderBy(i => i, orderBy);
+                }
+                else
+                {
+                    orderedItems = descending ? orderedItems.ThenByDescending(i => i, orderBy) : orderedItems.ThenBy(i => i, orderBy);
+                }
+
+                isFirst = false;
+            }
+
+            return orderedItems ?? items;
+        }
+
+        /// <summary>
+        /// Gets the comparer.
+        /// </summary>
+        /// <param name="sortBy">The sort by.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IComparer{BaseItem}.</returns>
+        /// <exception cref="System.ArgumentException"></exception>
+        private IComparer<BaseItem> GetComparer(ItemSortBy sortBy, User user)
+        {
+            switch (sortBy)
+            {
+                case ItemSortBy.Album:
+                    return new AlbumComparer();
+                case ItemSortBy.AlbumArtist:
+                    return new AlbumArtistComparer();
+                case ItemSortBy.Artist:
+                    return new ArtistComparer();
+                case ItemSortBy.Random:
+                    return new RandomComparer();
+                case ItemSortBy.DateCreated:
+                    return new DateCreatedComparer();
+                case ItemSortBy.SortName:
+                    return new SortNameComparer();
+                case ItemSortBy.PremiereDate:
+                    return new PremiereDateComparer();
+                case ItemSortBy.DatePlayed:
+                    return new DatePlayedComparer { User = user };
+                default:
+                    throw new ArgumentException();
+            }
+        }
+
+        /// <summary>
+        /// Applies filtering
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="filter">The filter.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        private IEnumerable<BaseItem> ApplyFilter(IEnumerable<BaseItem> items, ItemFilter filter, User user)
+        {
+            switch (filter)
+            {
+                case ItemFilter.IsFavorite:
+                    return items.Where(item =>
+                    {
+                        var userdata = item.GetUserData(user, false);
+
+                        return userdata != null && userdata.IsFavorite;
+                    });
+
+                case ItemFilter.IsRecentlyAdded:
+                    return items.Where(item => item.IsRecentlyAdded(user));
+
+                case ItemFilter.IsResumable:
+                    return items.Where(item =>
+                    {
+                        var userdata = item.GetUserData(user, false);
+
+                        return userdata != null && userdata.PlaybackPositionTicks > 0;
+                    });
+
+                case ItemFilter.IsPlayed:
+                    return items.Where(item =>
+                    {
+                        var userdata = item.GetUserData(user, false);
+
+                        return userdata != null && userdata.PlayCount > 0;
+                    });
+
+                case ItemFilter.IsRecentlyPlayed:
+                    return items.Where(item => item.IsRecentlyPlayed(user));
+
+                case ItemFilter.IsUnplayed:
+                    return items.Where(item =>
+                    {
+                        var userdata = item.GetUserData(user, false);
+
+                        return userdata == null || userdata.PlayCount == 0;
+                    });
+
+                case ItemFilter.IsFolder:
+                    return items.Where(item => item.IsFolder);
+
+                case ItemFilter.IsNotFolder:
+                    return items.Where(item => !item.IsFolder);
+            }
+
+            return items;
+        }
+
+        /// <summary>
+        /// Applies the additional filters.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        private IEnumerable<BaseItem> ApplyAdditionalFilters(GetItems request, IEnumerable<BaseItem> items)
+        {
+            var imageTypes = GetImageTypes(request).ToArray();
+            if (imageTypes.Length > 0)
+            {
+                items = items.Where(item => imageTypes.Any(imageType => HasImage(item, imageType)));
+            }
+
+            // Exclude item types
+            var excludeItemTypes = request.ExcludeItemTypes;
+            if (!string.IsNullOrEmpty(excludeItemTypes))
+            {
+                var vals = excludeItemTypes.Split(',');
+                items = items.Where(f => !vals.Contains(f.GetType().Name, StringComparer.OrdinalIgnoreCase));
+            }
+
+            var includeItemTypes = request.IncludeItemTypes;
+            if (!string.IsNullOrEmpty(includeItemTypes))
+            {
+                var vals = includeItemTypes.Split(',');
+                items = items.Where(f => vals.Contains(f.GetType().Name, StringComparer.OrdinalIgnoreCase));
+            }
+
+            var genres = request.Genres;
+
+            // Apply genre filter
+            if (!string.IsNullOrEmpty(genres))
+            {
+                var vals = genres.Split(',');
+                items = items.Where(f => f.Genres != null && vals.Any(v => f.Genres.Contains(v, StringComparer.OrdinalIgnoreCase)));
+            }
+
+            var studios = request.Studios;
+
+            // Apply studio filter
+            if (!string.IsNullOrEmpty(studios))
+            {
+                var vals = studios.Split(',');
+                items = items.Where(f => f.Studios != null && vals.Any(v => f.Studios.Contains(v, StringComparer.OrdinalIgnoreCase)));
+            }
+
+            var years = request.Years;
+
+            // Apply year filter
+            if (!string.IsNullOrEmpty(years))
+            {
+                var vals = years.Split(',').Select(int.Parse);
+                items = items.Where(f => f.ProductionYear.HasValue && vals.Contains(f.ProductionYear.Value));
+            }
+
+            var personName = request.Person;
+
+            // Apply person filter
+            if (!string.IsNullOrEmpty(personName))
+            {
+                var personType = request.PersonType;
+
+                items = !string.IsNullOrEmpty(personType)
+                            ? items.Where(item => item.People != null && item.People.Any(p => p.Name.Equals(personName, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(personType, StringComparison.OrdinalIgnoreCase)))
+                            : items.Where(item => item.People != null && item.People.Any(p => p.Name.Equals(personName, StringComparison.OrdinalIgnoreCase)));
+            }
+
+            return items;
+        }
+
+        /// <summary>
+        /// Determines whether the specified item has image.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="imageType">Type of the image.</param>
+        /// <returns><c>true</c> if the specified item has image; otherwise, <c>false</c>.</returns>
+        private bool HasImage(BaseItem item, ImageType imageType)
+        {
+            if (imageType == ImageType.Backdrop)
+            {
+                return item.BackdropImagePaths != null && item.BackdropImagePaths.Count > 0;
+            }
+
+            if (imageType == ImageType.Screenshot)
+            {
+                return item.ScreenshotImagePaths != null && item.ScreenshotImagePaths.Count > 0;
+            }
+
+            if (imageType == ImageType.ChapterImage)
+            {
+                var video = item as Video;
+
+                if (video != null)
+                {
+                    return video.Chapters != null && video.Chapters.Any(c => !string.IsNullOrEmpty(c.ImagePath));
+                }
+
+                return false;
+            }
+
+            return item.HasImage(imageType);
+        }
+
+        /// <summary>
+        /// Applies the search term.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        private IEnumerable<BaseItem> ApplySearchTerm(GetItems request, IEnumerable<BaseItem> items)
+        {
+            var term = request.SearchTerm;
+
+            if (!string.IsNullOrEmpty(term))
+            {
+                items = items.Where(i => i.Name.StartsWith(term, StringComparison.OrdinalIgnoreCase));
+            }
+
+            return items;
+        }
+
+        /// <summary>
+        /// Applies the paging.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        private IEnumerable<BaseItem> ApplyPaging(GetItems 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;
+        }
+
+        /// <summary>
+        /// Gets the sort order.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Nullable{SortOrder}.</returns>
+        private SortOrder? GetSortOrder(GetItems request)
+        {
+            if (string.IsNullOrEmpty(request.SortOrder))
+            {
+                return null;
+            }
+
+            return (SortOrder)Enum.Parse(typeof(SortOrder), request.SortOrder, true);
+        }
+
+        /// <summary>
+        /// Gets the filters.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>IEnumerable{ItemFilter}.</returns>
+        private IEnumerable<ItemFilter> GetFilters(GetItems request)
+        {
+            var val = request.Filters;
+
+            if (string.IsNullOrEmpty(val))
+            {
+                return new ItemFilter[] { };
+            }
+
+            return val.Split(',').Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true));
+        }
+
+        /// <summary>
+        /// Gets the item fields.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>IEnumerable{ItemFields}.</returns>
+        private IEnumerable<ItemFields> GetItemFields(GetItems request)
+        {
+            var val = request.Fields;
+
+            if (string.IsNullOrEmpty(val))
+            {
+                return new ItemFields[] { };
+            }
+
+            return val.Split(',').Select(v => (ItemFields)Enum.Parse(typeof(ItemFields), v, true));
+        }
+
+        /// <summary>
+        /// Gets the order by.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>IEnumerable{ItemSortBy}.</returns>
+        private IEnumerable<ItemSortBy> GetOrderBy(GetItems request)
+        {
+            var val = request.SortBy;
+
+            if (string.IsNullOrEmpty(val))
+            {
+                return new ItemSortBy[] { };
+            }
+
+            return val.Split(',').Select(v => (ItemSortBy)Enum.Parse(typeof(ItemSortBy), v, true));
+        }
+
+        /// <summary>
+        /// Gets the image types.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>IEnumerable{ImageType}.</returns>
+        private IEnumerable<ImageType> GetImageTypes(GetItems request)
+        {
+            var val = request.ImageTypes;
+
+            if (string.IsNullOrEmpty(val))
+            {
+                return new ImageType[] { };
+            }
+
+            return val.Split(',').Select(v => (ImageType)Enum.Parse(typeof(ImageType), v, true));
+        }
+    }
+
+    /// <summary>
+    /// Class DateCreatedComparer
+    /// </summary>
+    public class DateCreatedComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return x.DateCreated.CompareTo(y.DateCreated);
+        }
+    }
+
+    /// <summary>
+    /// Class RandomComparer
+    /// </summary>
+    public class RandomComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return Guid.NewGuid().CompareTo(Guid.NewGuid());
+        }
+    }
+
+    /// <summary>
+    /// Class SortNameComparer
+    /// </summary>
+    public class SortNameComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return string.Compare(x.SortName, y.SortName, StringComparison.CurrentCultureIgnoreCase);
+        }
+    }
+
+    /// <summary>
+    /// Class AlbumArtistComparer
+    /// </summary>
+    public class AlbumArtistComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return string.Compare(GetValue(x), GetValue(y), StringComparison.CurrentCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>System.String.</returns>
+        private string GetValue(BaseItem x)
+        {
+            var audio = x as Audio;
+
+            return audio == null ? string.Empty : audio.AlbumArtist;
+        }
+    }
+
+    /// <summary>
+    /// Class AlbumComparer
+    /// </summary>
+    public class AlbumComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return string.Compare(GetValue(x), GetValue(y), StringComparison.CurrentCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>System.String.</returns>
+        private string GetValue(BaseItem x)
+        {
+            var audio = x as Audio;
+
+            return audio == null ? string.Empty : audio.Album;
+        }
+    }
+
+    /// <summary>
+    /// Class ArtistComparer
+    /// </summary>
+    public class ArtistComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return string.Compare(GetValue(x), GetValue(y), StringComparison.CurrentCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>System.String.</returns>
+        private string GetValue(BaseItem x)
+        {
+            var audio = x as Audio;
+
+            return audio == null ? string.Empty : audio.Artist;
+        }
+    }
+
+    /// <summary>
+    /// Class PremiereDateComparer
+    /// </summary>
+    public class PremiereDateComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return GetDate(x).CompareTo(GetDate(y));
+        }
+
+        /// <summary>
+        /// Gets the date.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>DateTime.</returns>
+        private DateTime GetDate(BaseItem x)
+        {
+            if (x.PremiereDate.HasValue)
+            {
+                return x.PremiereDate.Value;
+            }
+
+            if (x.ProductionYear.HasValue)
+            {
+                return new DateTime(x.ProductionYear.Value, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+            }
+            return DateTime.MaxValue;
+        }
+    }
+
+    /// <summary>
+    /// Class DatePlayedComparer
+    /// </summary>
+    public class DatePlayedComparer : IComparer<BaseItem>
+    {
+        /// <summary>
+        /// Gets or sets the user.
+        /// </summary>
+        /// <value>The user.</value>
+        public User User { get; set; }
+
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return GetDate(x).CompareTo(GetDate(y));
+        }
+
+        /// <summary>
+        /// Gets the date.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>DateTime.</returns>
+        private DateTime GetDate(BaseItem x)
+        {
+            var userdata = x.GetUserData(User, false);
+
+            if (userdata != null && userdata.LastPlayedDate.HasValue)
+            {
+                return userdata.LastPlayedDate.Value;
+            }
+
+            return DateTime.MaxValue;
+        }
+    }
+}
diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs
new file mode 100644
index 0000000000..71dc32b324
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs
@@ -0,0 +1,103 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    /// <summary>
+    /// Class GetPersons
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/Persons", "GET")]
+    [Route("/Users/{UserId}/Items/Root/Persons", "GET")]
+    public class GetPersons : GetItemsByName
+    {
+        /// <summary>
+        /// Gets or sets the person types.
+        /// </summary>
+        /// <value>The person types.</value>
+        public string PersonTypes { get; set; }
+    }
+
+    /// <summary>
+    /// Class PersonsService
+    /// </summary>
+    [Export(typeof(IRestfulService))]
+    public class PersonsService : BaseItemsByNameService<Person>
+    {
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetPersons request)
+        {
+            var result = GetResult(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets all items.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
+        protected override IEnumerable<Tuple<string, Func<int>>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items, User user)
+        {
+            var inputPersonTypes = ((GetPersons) request).PersonTypes;
+            var personTypes = string.IsNullOrEmpty(inputPersonTypes) ? new string[] { } : inputPersonTypes.Split(',');
+
+            var itemsList = items.Where(i => i.People != null).ToList();
+
+            // Either get all people, or all people filtered by a specific person type
+            var allPeople = GetAllPeople(itemsList, personTypes);
+
+            return allPeople
+                .Select(i => i.Name)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+
+                .Select(name => new Tuple<string, Func<int>>(name, () =>
+                {
+                    if (personTypes.Length == 0)
+                    {
+                        return itemsList.Count(i => i.People.Any(p => p.Name.Equals(name, StringComparison.OrdinalIgnoreCase)));
+                    }
+
+                    return itemsList.Count(i => i.People.Any(p => p.Name.Equals(name, StringComparison.OrdinalIgnoreCase) && personTypes.Contains(p.Type ?? string.Empty, StringComparer.OrdinalIgnoreCase)));
+                })
+            );
+        }
+
+        /// <summary>
+        /// Gets all people.
+        /// </summary>
+        /// <param name="itemsList">The items list.</param>
+        /// <param name="personTypes">The person types.</param>
+        /// <returns>IEnumerable{PersonInfo}.</returns>
+        private IEnumerable<PersonInfo> GetAllPeople(IEnumerable<BaseItem> itemsList, string[] personTypes)
+        {
+            return personTypes.Length == 0 ?
+                itemsList.SelectMany(i => i.People) :
+                itemsList.SelectMany(i => i.People.Where(p => personTypes.Contains(p.Type ?? string.Empty, StringComparer.OrdinalIgnoreCase)));
+        }
+
+        /// <summary>
+        /// Gets the entity.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>Task{Genre}.</returns>
+        protected override Task<Person> GetEntity(string name)
+        {
+            var kernel = (Kernel)Kernel;
+
+            return kernel.LibraryManager.GetPerson(name);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs
new file mode 100644
index 0000000000..da91063673
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs
@@ -0,0 +1,69 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    /// <summary>
+    /// Class GetStudios
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/Studios", "GET")]
+    [Route("/Users/{UserId}/Items/Root/Studios", "GET")]
+    public class GetStudios : GetItemsByName
+    {
+    }
+
+    /// <summary>
+    /// Class StudiosService
+    /// </summary>
+    [Export(typeof(IRestfulService))]
+    public class StudiosService : BaseItemsByNameService<Studio>
+    {
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetStudios request)
+        {
+            var result = GetResult(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets all items.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
+        protected override IEnumerable<Tuple<string, Func<int>>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items, User user)
+        {
+            var itemsList = items.Where(i => i.Studios != null).ToList();
+
+            return itemsList
+                .SelectMany(i => i.Studios)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .Select(name => new Tuple<string, Func<int>>(name, () => itemsList.Count(i => i.Studios.Contains(name, StringComparer.OrdinalIgnoreCase))));
+        }
+
+        /// <summary>
+        /// Gets the entity.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>Task{Studio}.</returns>
+        protected override Task<Studio> GetEntity(string name)
+        {
+            var kernel = (Kernel)Kernel;
+
+            return kernel.LibraryManager.GetStudio(name);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
new file mode 100644
index 0000000000..09c39b5d39
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -0,0 +1,506 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Serialization;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using ServiceStack.Text.Controller;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    /// <summary>
+    /// Class GetItem
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}", "GET")]
+    [Route("/Users/{UserId}/Items/Root", "GET")]
+    public class GetItem : IReturn<DtoBaseItem>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class GetIntros
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/Intros", "GET")]
+    [ServiceStack.ServiceHost.Api(("Gets intros to play before the main media item plays"))]
+    public class GetIntros : IReturn<List<string>>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the item id.
+        /// </summary>
+        /// <value>The item id.</value>
+        public string Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class UpdateDisplayPreferences
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/DisplayPreferences", "GET")]
+    [ServiceStack.ServiceHost.Api(("Updates a user's display preferences for an item"))]
+    public class UpdateDisplayPreferences : IReturnVoid, IRequiresRequestStream
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// The raw Http Request Input Stream
+        /// </summary>
+        /// <value>The request stream.</value>
+        public Stream RequestStream { get; set; }
+    }
+
+    /// <summary>
+    /// Class GetVirtualFolders
+    /// </summary>
+    [Route("/Users/{UserId}/VirtualFolders", "GET")]
+    public class GetVirtualFolders : IReturn<List<VirtualFolderInfo>>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+    }
+
+    /// <summary>
+    /// Class MarkFavoriteItem
+    /// </summary>
+    [Route("/Users/{UserId}/FavoriteItems/{Id}", "POST")]
+    public class MarkFavoriteItem : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class UnmarkFavoriteItem
+    /// </summary>
+    [Route("/Users/{UserId}/FavoriteItems/{Id}", "DELETE")]
+    public class UnmarkFavoriteItem : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class ClearUserItemRating
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/Rating", "DELETE")]
+    public class DeleteUserItemRating : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class UpdateUserItemRating
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/Rating", "POST")]
+    public class UpdateUserItemRating : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="UpdateUserItemRating" /> is likes.
+        /// </summary>
+        /// <value><c>true</c> if likes; otherwise, <c>false</c>.</value>
+        public bool Likes { get; set; }
+    }
+
+    /// <summary>
+    /// Class MarkPlayedItem
+    /// </summary>
+    [Route("/Users/{UserId}/PlayedItems/{Id}", "POST")]
+    public class MarkPlayedItem : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class MarkUnplayedItem
+    /// </summary>
+    [Route("/Users/{UserId}/PlayedItems/{Id}", "DELETE")]
+    public class MarkUnplayedItem : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+    [Route("/Users/{UserId}/Items/{Id}/LocalTrailers", "GET")]
+    public class GetLocalTrailers : IReturn<List<DtoBaseItem>>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+    [Route("/Users/{UserId}/Items/{Id}/SpecialFeatures", "GET")]
+    public class GetSpecialFeatures : IReturn<List<DtoBaseItem>>
+    {
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        public Guid UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
+
+
+    /// <summary>
+    /// Class UserLibraryService
+    /// </summary>
+    [Export(typeof(IRestfulService))]
+    public class UserLibraryService : BaseRestService
+    {
+        public object Get(GetSpecialFeatures request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = DtoBuilder.GetItemByClientId(request.Id, user.Id);
+            
+            // Get everything
+            var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
+
+            var movie = (Movie)item;
+
+            var items = movie.SpecialFeatures.Select(i => DtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList();
+
+            return ToOptimizedResult(items);
+        }
+        
+        public object Get(GetLocalTrailers request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = DtoBuilder.GetItemByClientId(request.Id, user.Id);
+            
+            // Get everything
+            var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
+
+            var items = item.LocalTrailers.Select(i => DtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList();
+
+            return ToOptimizedResult(items);
+        }
+        
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetItem request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : DtoBuilder.GetItemByClientId(request.Id, user.Id);
+            
+            // Get everything
+            var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
+
+            var result = DtoBuilder.GetDtoBaseItem(item, user, fields).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetVirtualFolders request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var result = kernel.LibraryManager.GetVirtualFolders(user).ToList();
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetIntros request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = DtoBuilder.GetItemByClientId(request.Id, user.Id);
+
+            var result = kernel.IntroProviders.SelectMany(i => i.GetIntros(item, user));
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(UpdateDisplayPreferences request)
+        {
+            // We need to parse this manually because we told service stack not to with IRequiresRequestStream
+            // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
+            var pathInfo = PathInfo.Parse(Request.PathInfo);
+            var userId = new Guid(pathInfo.GetArgumentValue<string>(1));
+            var itemId = pathInfo.GetArgumentValue<string>(3);
+
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(userId);
+
+            var item = (Folder)DtoBuilder.GetItemByClientId(itemId, user.Id);
+
+            var displayPreferences = JsonSerializer.DeserializeFromStream<DisplayPreferences>(request.RequestStream);
+
+            var task = kernel.LibraryManager.SaveDisplayPreferencesForFolder(user, item, displayPreferences);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(MarkFavoriteItem request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, user.Id);
+
+            // Get the user data for this item
+            var data = item.GetUserData(user, true);
+
+            // Set favorite status
+            data.IsFavorite = true;
+
+            var task = kernel.UserDataManager.SaveUserDataForItem(user, item, data);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Deletes the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Delete(UnmarkFavoriteItem request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, user.Id);
+
+            // Get the user data for this item
+            var data = item.GetUserData(user, true);
+
+            // Set favorite status
+            data.IsFavorite = false;
+
+            var task = kernel.UserDataManager.SaveUserDataForItem(user, item, data);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Deletes the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Delete(DeleteUserItemRating request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, user.Id);
+
+            // Get the user data for this item
+            var data = item.GetUserData(user, true);
+
+            data.Rating = null;
+
+            var task = kernel.UserDataManager.SaveUserDataForItem(user, item, data);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(UpdateUserItemRating request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var item = (Folder)DtoBuilder.GetItemByClientId(request.Id, user.Id);
+
+            // Get the user data for this item
+            var data = item.GetUserData(user, true);
+
+            data.Likes = request.Likes;
+
+            var task = kernel.UserDataManager.SaveUserDataForItem(user, item, data);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(MarkPlayedItem request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var task = UpdatePlayedStatus(user, request.Id, true);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Deletes the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Delete(MarkUnplayedItem request)
+        {
+            var kernel = (Kernel)Kernel;
+
+            var user = kernel.GetUserById(request.UserId);
+
+            var task = UpdatePlayedStatus(user, request.Id, false);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Updates the played status.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="itemId">The item id.</param>
+        /// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
+        /// <returns>Task.</returns>
+        private Task UpdatePlayedStatus(User user, string itemId, bool wasPlayed)
+        {
+            var item = DtoBuilder.GetItemByClientId(itemId, user.Id);
+
+            return item.SetPlayedStatus(user, wasPlayed);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs
new file mode 100644
index 0000000000..c3ea114206
--- /dev/null
+++ b/MediaBrowser.Api/UserLibrary/YearsService.cs
@@ -0,0 +1,75 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.UserLibrary
+{
+    /// <summary>
+    /// Class GetYears
+    /// </summary>
+    [Route("/Users/{UserId}/Items/{Id}/Years", "GET")]
+    [Route("/Users/{UserId}/Items/Root/Years", "GET")]
+    public class GetYears : GetItemsByName
+    {
+    }
+
+    /// <summary>
+    /// Class YearsService
+    /// </summary>
+    [Export(typeof(IRestfulService))]
+    public class YearsService : BaseItemsByNameService<Year>
+    {
+        /// <summary>
+        /// The us culture
+        /// </summary>
+        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetYears request)
+        {
+            var result = GetResult(request).Result;
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets all items.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="items">The items.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
+        protected override IEnumerable<Tuple<string, Func<int>>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items, User user)
+        {
+            var itemsList = items.Where(i => i.ProductionYear != null).ToList();
+
+            return itemsList
+                .Select(i => i.ProductionYear.Value)
+                .Distinct()
+                .Select(year => new Tuple<string, Func<int>>(year.ToString(UsCulture), () => itemsList.Count(i => i.ProductionYear.HasValue && i.ProductionYear.Value == year)));
+        }
+
+        /// <summary>
+        /// Gets the entity.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>Task{Studio}.</returns>
+        protected override Task<Year> GetEntity(string name)
+        {
+            var kernel = (Kernel)Kernel;
+
+            return kernel.LibraryManager.GetYear(int.Parse(name, UsCulture));
+        }
+    }
+}