Merge remote-tracking branch 'official/master'

7 files changed, 171 insertions, 766 deletions

diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
deleted file mode 100644
index 21ba47bd4d..0000000000
--- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
+++ /dev/null
@@ -1,673 +0,0 @@
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using ServiceStack;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MediaBrowser.Api.DefaultTheme
-{
-    [Route("/MBT/DefaultTheme/Games", "GET")]
-    public class GetGamesView : IReturn<GamesView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-
-        [ApiMember(Name = "RecentlyPlayedGamesLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int RecentlyPlayedGamesLimit { get; set; }
-
-        public string ParentId { get; set; }
-    }
-
-    [Route("/MBT/DefaultTheme/TV", "GET")]
-    public class GetTvView : IReturn<TvView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-
-        [ApiMember(Name = "ComedyGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string ComedyGenre { get; set; }
-
-        [ApiMember(Name = "RomanceGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string RomanceGenre { get; set; }
-
-        [ApiMember(Name = "TopCommunityRating", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public double TopCommunityRating { get; set; }
-
-        [ApiMember(Name = "NextUpEpisodeLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int NextUpEpisodeLimit { get; set; }
-
-        [ApiMember(Name = "ResumableEpisodeLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int ResumableEpisodeLimit { get; set; }
-
-        [ApiMember(Name = "LatestEpisodeLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int LatestEpisodeLimit { get; set; }
-
-        public string ParentId { get; set; }
-    }
-
-    [Route("/MBT/DefaultTheme/Movies", "GET")]
-    public class GetMovieView : IReturn<MoviesView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-
-        [ApiMember(Name = "FamilyGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string FamilyGenre { get; set; }
-
-        [ApiMember(Name = "ComedyGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string ComedyGenre { get; set; }
-
-        [ApiMember(Name = "RomanceGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string RomanceGenre { get; set; }
-
-        [ApiMember(Name = "LatestMoviesLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int LatestMoviesLimit { get; set; }
-
-        [ApiMember(Name = "LatestTrailersLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int LatestTrailersLimit { get; set; }
-
-        public string ParentId { get; set; }
-    }
-
-    [Route("/MBT/DefaultTheme/Favorites", "GET")]
-    public class GetFavoritesView : IReturn<FavoritesView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-    }
-
-    [Authenticated]
-    public class DefaultThemeService : BaseApiService
-    {
-        private readonly IUserManager _userManager;
-        private readonly IDtoService _dtoService;
-        private readonly ILogger _logger;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IUserDataManager _userDataManager;
-
-        private readonly IImageProcessor _imageProcessor;
-        private readonly IItemRepository _itemRepo;
-
-        public DefaultThemeService(IUserManager userManager, IDtoService dtoService, ILogger logger, ILibraryManager libraryManager, IImageProcessor imageProcessor, IUserDataManager userDataManager, IItemRepository itemRepo)
-        {
-            _userManager = userManager;
-            _dtoService = dtoService;
-            _logger = logger;
-            _libraryManager = libraryManager;
-            _imageProcessor = imageProcessor;
-            _userDataManager = userDataManager;
-            _itemRepo = itemRepo;
-        }
-
-        public object Get(GetFavoritesView request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            var allItems = user.RootFolder.GetRecursiveChildren(user)
-                .ToList();
-
-            var allFavoriteItems = allItems.Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite)
-                .ToList();
-
-            var itemsWithImages = allFavoriteItems.Where(i => !string.IsNullOrEmpty(i.PrimaryImagePath))
-                .ToList();
-
-            var itemsWithBackdrops = allFavoriteItems.Where(i => i.GetImages(ImageType.Backdrop).Any())
-                .ToList();
-
-            var view = new FavoritesView();
-
-            var fields = new List<ItemFields>();
-
-            view.BackdropItems = FilterItemsForBackdropDisplay(itemsWithBackdrops)
-                .Randomize("backdrop")
-                .Take(10)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var spotlightItems = itemsWithBackdrops.Randomize("spotlight")
-                                                   .Take(10)
-                                                   .ToList();
-
-            view.SpotlightItems = spotlightItems
-              .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-              .ToList();
-
-            fields.Add(ItemFields.PrimaryImageAspectRatio);
-
-            view.Albums = itemsWithImages
-                .OfType<MusicAlbum>()
-                .Randomize()
-                .Take(4)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Books = itemsWithImages
-                .OfType<Book>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Episodes = itemsWithImages
-                .OfType<Episode>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Games = itemsWithImages
-                .OfType<Game>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Movies = itemsWithImages
-                .OfType<Movie>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Series = itemsWithImages
-                .OfType<Series>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Songs = itemsWithImages
-                .OfType<Audio>()
-                .Randomize()
-                .Take(4)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.MiniSpotlights = itemsWithBackdrops
-                .Except(spotlightItems)
-                .Randomize()
-                .Take(5)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var artists = allItems.OfType<Audio>()
-                .SelectMany(i => i.AllArtists)
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .Randomize()
-            .Select(i =>
-            {
-                try
-                {
-                    return _libraryManager.GetArtist(i);
-                }
-                catch
-                {
-                    return null;
-                }
-            })
-                .Where(i => i != null && _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite)
-                .Take(4)
-                .ToList();
-
-            view.Artists = artists
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        public object Get(GetGamesView request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            var items = GetAllLibraryItems(user.Id, _userManager, _libraryManager, request.ParentId).Where(i => i is Game || i is GameSystem)
-                .ToList();
-
-            var gamesWithImages = items.OfType<Game>().Where(i => !string.IsNullOrEmpty(i.PrimaryImagePath)).ToList();
-
-            var itemsWithBackdrops = FilterItemsForBackdropDisplay(items.Where(i => i.GetImages(ImageType.Backdrop).Any())).ToList();
-
-            var gamesWithBackdrops = itemsWithBackdrops.OfType<Game>().ToList();
-
-            var view = new GamesView();
-
-            var fields = new List<ItemFields>();
-
-            view.GameSystems = items
-                .OfType<GameSystem>()
-                .OrderBy(i => i.SortName)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var currentUserId = user.Id;
-            view.RecentlyPlayedGames = gamesWithImages
-                .OrderByDescending(i => _userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).LastPlayedDate ?? DateTime.MinValue)
-                .Take(request.RecentlyPlayedGamesLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.BackdropItems = gamesWithBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.SpotlightItems = gamesWithBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.MultiPlayerItems = gamesWithImages
-            .Where(i => i.PlayersSupported.HasValue && i.PlayersSupported.Value > 1)
-            .Randomize()
-            .Select(i => GetItemStub(i, ImageType.Primary))
-            .Where(i => i != null)
-            .Take(1)
-            .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        public object Get(GetTvView request)
-        {
-            var romanceGenres = request.RomanceGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-            var comedyGenres = request.ComedyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            var user = _userManager.GetUserById(request.UserId);
-
-            var series = GetAllLibraryItems(user.Id, _userManager, _libraryManager, request.ParentId)
-                .OfType<Series>()
-                .ToList();
-
-            var seriesWithBackdrops = series.Where(i => i.GetImages(ImageType.Backdrop).Any()).ToList();
-
-            var view = new TvView();
-
-            var fields = new List<ItemFields>();
-
-            var seriesWithBestBackdrops = FilterItemsForBackdropDisplay(seriesWithBackdrops).ToList();
-
-            view.BackdropItems = seriesWithBestBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.ShowsItems = series
-               .Where(i => i.GetImages(ImageType.Backdrop).Any())
-               .Randomize("all")
-               .Select(i => GetItemStub(i, ImageType.Backdrop))
-               .Where(i => i != null)
-               .Take(1)
-               .ToList();
-
-            view.RomanceItems = seriesWithBackdrops
-             .Where(i => i.Genres.Any(romanceGenres.ContainsKey))
-             .Randomize("romance")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.ComedyItems = seriesWithBackdrops
-             .Where(i => i.Genres.Any(comedyGenres.ContainsKey))
-             .Randomize("comedy")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            var spotlightSeries = seriesWithBestBackdrops
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 8.5)
-                .ToList();
-
-            if (spotlightSeries.Count < 20)
-            {
-                spotlightSeries = seriesWithBestBackdrops;
-            }
-
-            spotlightSeries = spotlightSeries
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .ToList();
-
-            view.SpotlightItems = spotlightSeries
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var miniSpotlightItems = seriesWithBackdrops
-                .Except(spotlightSeries.OfType<Series>())
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 8)
-                .ToList();
-
-            if (miniSpotlightItems.Count < 15)
-            {
-                miniSpotlightItems = seriesWithBackdrops;
-            }
-
-            view.MiniSpotlights = miniSpotlightItems
-              .Randomize("minispotlight")
-              .Take(5)
-              .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-              .ToList();
-
-            var nextUpEpisodes = new TvShowsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService)
-                .GetNextUpEpisodes(new GetNextUpEpisodes { UserId = user.Id }, series)
-                .ToList();
-
-            fields.Add(ItemFields.PrimaryImageAspectRatio);
-
-            view.NextUpEpisodes = nextUpEpisodes
-                .Take(request.NextUpEpisodeLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.SeriesIdsInProgress = nextUpEpisodes.Select(i => i.Series.Id.ToString("N")).ToList();
-
-            // Avoid implicitly captured closure
-            var currentUser1 = user;
-
-            var ownedEpisodes = series
-                .SelectMany(i => i.GetRecursiveChildren(currentUser1).Where(j => j.LocationType != LocationType.Virtual))
-                .OfType<Episode>()
-                .ToList();
-
-            // Avoid implicitly captured closure
-            var currentUser = user;
-
-            view.LatestEpisodes = ownedEpisodes
-                .OrderByDescending(i => i.DateCreated)
-                .Where(i => !_userDataManager.GetUserData(currentUser.Id, i.GetUserDataKey()).Played)
-                .Take(request.LatestEpisodeLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.ResumableEpisodes = ownedEpisodes
-                .Where(i => _userDataManager.GetUserData(currentUser.Id, i.GetUserDataKey()).PlaybackPositionTicks > 0)
-                .OrderByDescending(i => _userDataManager.GetUserData(currentUser.Id, i.GetUserDataKey()).LastPlayedDate ?? DateTime.MinValue)
-                .Take(request.ResumableEpisodeLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        public object Get(GetMovieView request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            var items = GetAllLibraryItems(user.Id, _userManager, _libraryManager, request.ParentId)
-                .Where(i => i is Movie || i is Trailer || i is BoxSet)
-                .ToList();
-
-            var view = new MoviesView();
-
-            var movies = items.OfType<Movie>()
-                .ToList();
-
-            var trailers = items.OfType<Trailer>()
-               .ToList();
-
-            var hdMovies = movies.Where(i => i.IsHD).ToList();
-
-            var familyGenres = request.FamilyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            var familyMovies = movies.Where(i => i.Genres.Any(familyGenres.ContainsKey)).ToList();
-
-            view.HDMoviePercentage = 100 * hdMovies.Count;
-            view.HDMoviePercentage /= movies.Count;
-
-            view.FamilyMoviePercentage = 100 * familyMovies.Count;
-            view.FamilyMoviePercentage /= movies.Count;
-
-            var moviesWithBackdrops = movies
-               .Where(i => i.GetImages(ImageType.Backdrop).Any())
-               .ToList();
-
-            var fields = new List<ItemFields>();
-
-            var itemsWithTopBackdrops = FilterItemsForBackdropDisplay(moviesWithBackdrops).ToList();
-
-            view.BackdropItems = itemsWithTopBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.MovieItems = moviesWithBackdrops
-               .Randomize("all")
-               .Select(i => GetItemStub(i, ImageType.Backdrop))
-               .Where(i => i != null)
-               .Take(1)
-               .ToList();
-
-            view.TrailerItems = trailers
-             .Where(i => !string.IsNullOrEmpty(i.PrimaryImagePath))
-             .Randomize()
-             .Select(i => GetItemStub(i, ImageType.Primary))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.BoxSetItems = items
-             .OfType<BoxSet>()
-             .Where(i => i.GetImages(ImageType.Backdrop).Any())
-             .Randomize()
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.ThreeDItems = moviesWithBackdrops
-             .Where(i => i.Is3D)
-             .Randomize("3d")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            var romanceGenres = request.RomanceGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-            var comedyGenres = request.ComedyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            view.RomanceItems = moviesWithBackdrops
-             .Where(i => i.Genres.Any(romanceGenres.ContainsKey))
-             .Randomize("romance")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.ComedyItems = moviesWithBackdrops
-             .Where(i => i.Genres.Any(comedyGenres.ContainsKey))
-             .Randomize("comedy")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.HDItems = hdMovies
-             .Where(i => i.GetImages(ImageType.Backdrop).Any())
-             .Randomize("hd")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.FamilyMovies = familyMovies
-             .Where(i => i.GetImages(ImageType.Backdrop).Any())
-             .Randomize("family")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            var currentUserId = user.Id;
-            var spotlightItems = itemsWithTopBackdrops
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 8)
-                .Where(i => !_userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).Played)
-                .ToList();
-
-            if (spotlightItems.Count < 20)
-            {
-                spotlightItems = itemsWithTopBackdrops;
-            }
-
-            spotlightItems = spotlightItems
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .ToList();
-
-            view.SpotlightItems = spotlightItems
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var miniSpotlightItems = moviesWithBackdrops
-                .Except(spotlightItems)
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 7.5)
-                .ToList();
-
-            if (miniSpotlightItems.Count < 15)
-            {
-                miniSpotlightItems = itemsWithTopBackdrops;
-            }
-
-            miniSpotlightItems = miniSpotlightItems
-              .Randomize("minispotlight")
-              .ToList();
-
-            // Avoid implicitly captured closure
-            miniSpotlightItems.InsertRange(0, moviesWithBackdrops
-                .Where(i => _userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).PlaybackPositionTicks > 0)
-                .OrderByDescending(i => _userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).LastPlayedDate ?? DateTime.MaxValue)
-                .Take(3));
-
-            view.MiniSpotlights = miniSpotlightItems
-              .Take(3)
-              .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-              .ToList();
-
-            // Avoid implicitly captured closure
-            var currentUserId1 = user.Id;
-
-            view.LatestMovies = movies
-                .OrderByDescending(i => i.DateCreated)
-                .Where(i => !_userDataManager.GetUserData(currentUserId1, i.GetUserDataKey()).Played)
-                .Take(request.LatestMoviesLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.LatestTrailers = trailers
-                .OrderByDescending(i => i.DateCreated)
-                .Where(i => !_userDataManager.GetUserData(currentUserId1, i.GetUserDataKey()).Played)
-                .Take(request.LatestTrailersLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        private IEnumerable<BaseItem> FilterItemsForBackdropDisplay(IEnumerable<BaseItem> items)
-        {
-            var tuples = items
-                .Select(i => new Tuple<BaseItem, double>(i, GetResolution(i, ImageType.Backdrop, 0)))
-                .Where(i => i.Item2 > 0)
-                .ToList();
-
-            var topItems = tuples
-                .Where(i => i.Item2 >= 1920)
-                .ToList();
-
-            if (topItems.Count >= 10)
-            {
-                return topItems.Select(i => i.Item1);
-            }
-
-            return tuples.Select(i => i.Item1);
-        }
-
-        private double GetResolution(BaseItem item, ImageType type, int index)
-        {
-            try
-            {
-                var info = item.GetImageInfo(type, index);
-
-                var size = _imageProcessor.GetImageSize(info.Path, info.DateModified);
-
-                return size.Width;
-            }
-            catch
-            {
-                return 0;
-            }
-        }
-
-        private ItemStub GetItemStub(BaseItem item, ImageType imageType)
-        {
-            var stub = new ItemStub
-            {
-                Id = _dtoService.GetDtoId(item),
-                Name = item.Name,
-                ImageType = imageType
-            };
-
-            try
-            {
-                var tag = _imageProcessor.GetImageCacheTag(item, imageType);
-
-                if (tag != null)
-                {
-                    stub.ImageTag = tag;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error getting image tag for {0}", ex, item.Path);
-                return null;
-            }
-
-            return stub;
-        }
-    }
-
-    static class RandomExtension
-    {
-        public static IEnumerable<T> Randomize<T>(this IEnumerable<T> sequence, string type = "none")
-            where T : BaseItem
-        {
-            var hour = DateTime.Now.Hour + DateTime.Now.Day + 2;
-
-            var typeCode = type.GetHashCode();
-
-            return sequence.OrderBy(i =>
-            {
-                var val = i.Id.GetHashCode() + i.Genres.Count + i.People.Count + (i.ProductionYear ?? 0) + i.DateCreated.Minute + i.DateModified.Minute + typeCode;
-
-                return val % hour;
-            });
-        }
-
-        public static IEnumerable<string> Randomize(this IEnumerable<string> sequence)
-        {
-            var hour = DateTime.Now.Hour + 2;
-
-            return sequence.OrderBy(i => i.GetHashCode() % hour);
-        }
-    }
-}
diff --git a/MediaBrowser.Api/DefaultTheme/Models.cs b/MediaBrowser.Api/DefaultTheme/Models.cs
deleted file mode 100644
index 6cc7af4993..0000000000
--- a/MediaBrowser.Api/DefaultTheme/Models.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Api.DefaultTheme
-{
-    public class ItemStub
-    {
-        public string Name { get; set; }
-        public string Id { get; set; }
-        public string ImageTag { get; set; }
-        public ImageType ImageType { get; set; }
-    }
-
-    public class MoviesView : BaseView
-    {
-        public List<ItemStub> MovieItems { get; set; }
-
-        public List<ItemStub> BoxSetItems { get; set; }
-        public List<ItemStub> TrailerItems { get; set; }
-        public List<ItemStub> HDItems { get; set; }
-        public List<ItemStub> ThreeDItems { get; set; }
-
-        public List<ItemStub> FamilyMovies { get; set; }
-
-        public List<ItemStub> RomanceItems { get; set; }
-        public List<ItemStub> ComedyItems { get; set; }
-
-        public double FamilyMoviePercentage { get; set; }
-
-        public double HDMoviePercentage { get; set; }
-
-        public List<BaseItemDto> LatestTrailers { get; set; }
-        public List<BaseItemDto> LatestMovies { get; set; }
-    }
-
-    public class TvView : BaseView
-    {
-        public List<ItemStub> ShowsItems { get; set; }
-
-        public List<ItemStub> RomanceItems { get; set; }
-        public List<ItemStub> ComedyItems { get; set; }
-
-        public List<string> SeriesIdsInProgress { get; set; }
-
-        public List<BaseItemDto> LatestEpisodes { get; set; }
-        public List<BaseItemDto> NextUpEpisodes { get; set; }
-        public List<BaseItemDto> ResumableEpisodes { get; set; }
-    }
-
-    public class ItemByNameInfo
-    {
-        public string Name { get; set; }
-        public int ItemCount { get; set; }
-    }
-
-    public class GamesView : BaseView
-    {
-        public List<ItemStub> MultiPlayerItems { get; set; }
-        public List<BaseItemDto> GameSystems { get; set; }
-        public List<BaseItemDto> RecentlyPlayedGames { get; set; }
-    }
-
-    public class BaseView
-    {
-        public List<BaseItemDto> BackdropItems { get; set; }
-        public List<BaseItemDto> SpotlightItems { get; set; }
-        public List<BaseItemDto> MiniSpotlights { get; set; }
-    }
-
-    public class FavoritesView : BaseView
-    {
-        public List<BaseItemDto> Movies { get; set; }
-        public List<BaseItemDto> Series { get; set; }
-        public List<BaseItemDto> Episodes { get; set; }
-        public List<BaseItemDto> Games { get; set; }
-        public List<BaseItemDto> Books { get; set; }
-        public List<BaseItemDto> Albums { get; set; }
-        public List<BaseItemDto> Songs { get; set; }
-        public List<BaseItemDto> Artists { get; set; }
-    }
-}
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index f6588714e0..56f66bd6b0 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -284,6 +284,11 @@ namespace MediaBrowser.Api.Library
             return ToOptimizedResult(result);
         }
 
+        public void Post(PostUpdatedSeries request)
+        {
+            
+        }
+
         public object Get(GetFile request)
         {
             var item = _libraryManager.GetItemById(request.Id);
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index e619e28250..8f20613cd4 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -70,14 +70,13 @@
     <Compile Include="Dlna\DlnaServerService.cs" />
     <Compile Include="Dlna\DlnaService.cs" />
     <Compile Include="Library\ChapterService.cs" />
+    <Compile Include="PlaylistService.cs" />
     <Compile Include="Subtitles\SubtitleService.cs" />
     <Compile Include="Movies\CollectionService.cs" />
     <Compile Include="Music\AlbumsService.cs" />
     <Compile Include="AppThemeService.cs" />
     <Compile Include="BaseApiService.cs" />
     <Compile Include="ConfigurationService.cs" />
-    <Compile Include="DefaultTheme\DefaultThemeService.cs" />
-    <Compile Include="DefaultTheme\Models.cs" />
     <Compile Include="DisplayPreferencesService.cs" />
     <Compile Include="EnvironmentService.cs" />
     <Compile Include="GamesService.cs" />
diff --git a/MediaBrowser.Api/Movies/CollectionService.cs b/MediaBrowser.Api/Movies/CollectionService.cs
index 19e47eb857..e3816aa518 100644
--- a/MediaBrowser.Api/Movies/CollectionService.cs
+++ b/MediaBrowser.Api/Movies/CollectionService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Collections;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
@@ -92,9 +93,4 @@ namespace MediaBrowser.Api.Movies
             Task.WaitAll(task);
         }
     }
-
-    public class CollectionCreationResult
-    {
-        public string Id { get; set; }
-    }
 }
diff --git a/MediaBrowser.Api/PlaylistService.cs b/MediaBrowser.Api/PlaylistService.cs
new file mode 100644
index 0000000000..b4d2e2f0f2
--- /dev/null
+++ b/MediaBrowser.Api/PlaylistService.cs
@@ -0,0 +1,161 @@
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Playlists;
+using MediaBrowser.Model.Querying;
+using ServiceStack;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api
+{
+    [Route("/Playlists", "POST", Summary = "Creates a new playlist")]
+    public class CreatePlaylist : IReturn<PlaylistCreationResult>
+    {
+        [ApiMember(Name = "Name", Description = "The name of the new playlist.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string Name { get; set; }
+
+        [ApiMember(Name = "Ids", Description = "Item Ids to add to the playlist", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
+        public string Ids { get; set; }
+
+        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string UserId { get; set; }
+    }
+
+    [Route("/Playlists/{Id}/Items", "POST", Summary = "Adds items to a playlist")]
+    public class AddToPlaylist : IReturnVoid
+    {
+        [ApiMember(Name = "Ids", Description = "Item id, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string Ids { get; set; }
+
+        [ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+    }
+
+    [Route("/Playlists/{Id}/Items", "DELETE", Summary = "Removes items from a playlist")]
+    public class RemoveFromPlaylist : IReturnVoid
+    {
+        [ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+        public string Id { get; set; }
+    }
+
+    [Route("/Playlists/{Id}/Items", "GET", Summary = "Gets the original items of a playlist")]
+    public class GetPlaylistItems : IReturn<QueryResult<BaseItemDto>>, IHasItemFields
+    {
+        [ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public Guid? UserId { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        [ApiMember(Name = "StartIndex", Description = "Optional. The record index to start at. All items with a lower index will be dropped from the results.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        [ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, CriticRatingSummary, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Fields { get; set; }
+    }
+
+    [Authenticated]
+    public class PlaylistService : BaseApiService
+    {
+        private readonly IPlaylistManager _playlistManager;
+        private readonly IDtoService _dtoService;
+        private readonly IUserManager _userManager;
+        private readonly ILibraryManager _libraryManager;
+
+        public PlaylistService(IDtoService dtoService, IPlaylistManager playlistManager, IUserManager userManager, ILibraryManager libraryManager)
+        {
+            _dtoService = dtoService;
+            _playlistManager = playlistManager;
+            _userManager = userManager;
+            _libraryManager = libraryManager;
+        }
+
+        public object Post(CreatePlaylist request)
+        {
+            var task = _playlistManager.CreatePlaylist(new PlaylistCreationOptions
+            {
+                Name = request.Name,
+                ItemIdList = (request.Ids ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(),
+                UserId = request.UserId
+            });
+
+            var item = task.Result;
+
+            var dto = _dtoService.GetBaseItemDto(item, new List<ItemFields>());
+
+            return ToOptimizedResult(new PlaylistCreationResult
+            {
+                Id = dto.Id
+            });
+        }
+
+        public void Post(AddToPlaylist request)
+        {
+            var task = _playlistManager.AddToPlaylist(request.Id, request.Ids.Split(','));
+
+            Task.WaitAll(task);
+        }
+
+        public void Delete(RemoveFromPlaylist request)
+        {
+            //var task = _playlistManager.RemoveFromPlaylist(request.Id, request.Ids.Split(',').Select(i => new Guid(i)));
+
+            //Task.WaitAll(task);
+        }
+
+        public object Get(GetPlaylistItems request)
+        {
+            var playlist = (Playlist)_libraryManager.GetItemById(request.Id);
+            var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
+            var items = playlist.GetManageableItems().ToArray();
+
+            var count = items.Length;
+
+            if (request.StartIndex.HasValue)
+            {
+                items = items.Skip(request.StartIndex.Value).ToArray();
+            }
+
+            if (request.Limit.HasValue)
+            {
+                items = items.Take(request.Limit.Value).ToArray();
+            }
+
+            var dtos = items
+                   .Select(i => _dtoService.GetBaseItemDto(i, request.GetItemFields().ToList(), user))
+                   .ToArray();
+
+            var result = new ItemsResult
+            {
+                Items = dtos,
+                TotalRecordCount = count
+            };
+
+            return ToOptimizedResult(result);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
index 7cd518a187..f236100147 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Linq;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace MediaBrowser.Api.UserLibrary
 {