Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

8 files changed, 226 insertions, 116 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index d2d435414..46c32cc56 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -148,11 +148,16 @@ namespace MediaBrowser.Server.Implementations.Library
                 .ThenBy(i => i.SortName);
         }
 
+        public Task<UserView> GetUserView(string name, string parentId, string type, User user, string sortName, CancellationToken cancellationToken)
+        {
+            return _libraryManager.GetSpecialFolder(user, name, parentId, type, sortName, cancellationToken);
+        }
+
         public Task<UserView> GetUserView(string parentId, string type, User user, string sortName, CancellationToken cancellationToken)
         {
             var name = _localizationManager.GetLocalizedString("ViewType" + type);
 
-            return _libraryManager.GetSpecialFolder(user, name, parentId, type, sortName, cancellationToken);
+            return GetUserView(name, parentId, type, user, sortName, cancellationToken);
         }
 
         public Task<UserView> GetUserView(string type, string sortName, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index a484cbbb8..21658f3ff 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -288,7 +288,7 @@
     "LabelPremiereProgram": "PREMIERE",
     "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
-    "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
+    "HeaderChangeFolderTypeHelp": "To change the type, please remove and rebuild the folder with the new type.",
     "HeaderAlert": "Alert",
     "MessagePleaseRestart": "Please restart to finish updating.",
     "ButtonRestart": "Restart",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 1d52a42ae..a1591156c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -145,9 +145,11 @@
     "OptionBudget": "Budget",
     "OptionRevenue": "Revenue",
     "OptionPoster": "Poster",
+    "OptionPosterCard":  "Poster card",
     "OptionBackdrop": "Backdrop",
     "OptionTimeline": "Timeline",
     "OptionThumb": "Thumb",
+    "OptionThumbCard": "Thumb card",
     "OptionBanner": "Banner",
     "OptionCriticRating": "Critic Rating",
     "OptionVideoBitrate": "Video Bitrate",
@@ -455,7 +457,7 @@
     "LinkApiDocumentation": "Api Documentation",
     "LabelFriendlyServerName": "Friendly server name:",
     "LabelFriendlyServerNameHelp": "This name will be used to identify this server. If left blank, the computer name will be used.",
-    "LabelPreferredDisplayLanguage": "Preferred display language",
+    "LabelPreferredDisplayLanguage": "Preferred display language:",
     "LabelPreferredDisplayLanguageHelp": "Translating Media Browser is an ongoing project and is not yet complete.",
     "LabelReadHowYouCanContribute": "Read about how you can contribute.",
     "HeaderNewCollection": "New Collection",
@@ -847,6 +849,8 @@
     "ViewTypeTvShows": "TV",
     "ViewTypeGames": "Games",
     "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
     "ViewTypeBoxSets": "Collections",
     "ViewTypeChannels": "Channels",
     "ViewTypeLiveTV": "Live TV",
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 82da5373c..591dfba49 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -219,7 +219,7 @@
     <Compile Include="LiveTv\RefreshChannelsScheduledTask.cs" />
     <Compile Include="Localization\LocalizationManager.cs" />
     <Compile Include="MediaEncoder\EncodingManager.cs" />
-    <Compile Include="Music\MusicDynamicImageProvider.cs" />
+    <Compile Include="Photos\DynamicImageProvider.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
     <Compile Include="News\NewsService.cs" />
     <Compile Include="Notifications\CoreNotificationTypes.cs" />
diff --git a/MediaBrowser.Server.Implementations/Music/MusicDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Music/MusicDynamicImageProvider.cs
deleted file mode 100644
index 846357529..000000000
--- a/MediaBrowser.Server.Implementations/Music/MusicDynamicImageProvider.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Server.Implementations.Photos;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.Music
-{
-    public class MusicDynamicImageProvider : BaseDynamicImageProvider<UserView>, ICustomMetadataProvider<UserView>
-    {
-        private readonly IUserManager _userManager;
-
-        public MusicDynamicImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IUserManager userManager)
-            : base(fileSystem, providerManager)
-        {
-            _userManager = userManager;
-        }
-
-        protected override async Task<List<BaseItem>> GetItemsWithImages(IHasImages item)
-        {
-            var view = (UserView)item;
-
-            if (!view.UserId.HasValue)
-            {
-                return new List<BaseItem>();
-            }
-
-            var result = await view.GetItems(new InternalItemsQuery
-            {
-                User = _userManager.GetUserById(view.UserId.Value)
-
-            }).ConfigureAwait(false);
-
-            return GetFinalItems(result.Items.Where(i => i.HasImage(ImageType.Primary)).ToList());
-        }
-
-        protected override bool Supports(IHasImages item)
-        {
-            var view = item as UserView;
-
-            if (view != null && view.UserId.HasValue)
-            {
-                var supported = new[]
-                {
-                    SpecialFolder.TvFavoriteEpisodes,
-                    SpecialFolder.TvFavoriteSeries,
-                    SpecialFolder.TvGenres,
-                    SpecialFolder.TvLatest,
-                    SpecialFolder.TvNextUp,
-                    SpecialFolder.TvResume,
-                    SpecialFolder.TvShowSeries,
-
-                    SpecialFolder.MovieCollections,
-                    SpecialFolder.MovieFavorites,
-                    SpecialFolder.MovieGenres,
-                    SpecialFolder.MovieLatest,
-                    SpecialFolder.MovieMovies,
-                    SpecialFolder.MovieResume,
-
-                    SpecialFolder.GameFavorites,
-                    SpecialFolder.GameGenres,
-                    SpecialFolder.GameSystems,
-                    SpecialFolder.LatestGames,
-                    SpecialFolder.RecentlyPlayedGames,
-
-                    SpecialFolder.MusicArtists,
-                    SpecialFolder.MusicAlbumArtists,
-                    SpecialFolder.MusicAlbums,
-                    SpecialFolder.MusicGenres,
-                    SpecialFolder.MusicLatest,
-                    SpecialFolder.MusicSongs,
-                    SpecialFolder.MusicFavorites,
-                    SpecialFolder.MusicFavoriteArtists,
-                    SpecialFolder.MusicFavoriteAlbums,
-                    SpecialFolder.MusicFavoriteSongs
-                };
-
-                return supported.Contains(view.ViewType, StringComparer.OrdinalIgnoreCase) &&
-                    _userManager.GetUserById(view.UserId.Value) != null;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
index 1abefdef1..dbaf23656 100644
--- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
@@ -6,8 +6,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -74,36 +72,48 @@ namespace MediaBrowser.Server.Implementations.Photos
             MetadataRefreshOptions options, 
             CancellationToken cancellationToken)
         {
-            var img = await CreateImageAsync(item, itemsWithImages, imageType, 0).ConfigureAwait(false);
+            var stream = await CreateImageAsync(item, itemsWithImages, imageType, 0).ConfigureAwait(false);
 
-            if (img == null)
+            if (stream == null)
             {
                 return ItemUpdateType.None;
             }
 
-            using (var ms = new MemoryStream())
+            if (stream is MemoryStream)
             {
-                img.Save(ms, ImageFormat.Png);
+                using (stream)
+                {
+                    stream.Position = 0;
 
-                ms.Position = 0;
+                    await ProviderManager.SaveImage(item, stream, "image/png", imageType, null, cacheKey, cancellationToken).ConfigureAwait(false);
+                }
+            }
+            else
+            {
+                using (var ms = new MemoryStream())
+                {
+                    await stream.CopyToAsync(ms).ConfigureAwait(false);
+
+                    ms.Position = 0;
 
-                await ProviderManager.SaveImage(item, ms, "image/png", imageType, null, cacheKey, cancellationToken).ConfigureAwait(false);
+                    await ProviderManager.SaveImage(item, ms, "image/png", imageType, null, cacheKey, cancellationToken).ConfigureAwait(false);
+                }
             }
 
             return ItemUpdateType.ImageUpdate;
         }
 
-        protected Task<Image> GetThumbCollage(List<BaseItem> items)
+        protected Task<Stream> GetThumbCollage(List<BaseItem> items)
         {
-            return DynamicImageHelpers.GetThumbCollage(items.Select(i => i.GetImagePath(ImageType.Primary)).ToList(),
+            return DynamicImageHelpers.GetThumbCollage(items.Select(i => i.GetImagePath(ImageType.Primary) ?? i.GetImagePath(ImageType.Thumb)).ToList(),
                 FileSystem,
                 1600,
                 900);
         }
 
-        protected Task<Image> GetSquareCollage(List<BaseItem> items)
+        protected Task<Stream> GetSquareCollage(List<BaseItem> items)
         {
-            return DynamicImageHelpers.GetSquareCollage(items.Select(i => i.GetImagePath(ImageType.Primary)).ToList(),
+            return DynamicImageHelpers.GetSquareCollage(items.Select(i => i.GetImagePath(ImageType.Primary) ?? i.GetImagePath(ImageType.Thumb)).ToList(),
                 FileSystem,
                 800);
         }
@@ -113,7 +123,7 @@ namespace MediaBrowser.Server.Implementations.Photos
             get { return "Dynamic Image Provider"; }
         }
 
-        public async Task<Image> CreateImageAsync(IHasImages item, 
+        public async Task<Stream> CreateImageAsync(IHasImages item, 
             List<BaseItem> itemsWithImages,
             ImageType imageType, 
             int imageIndex)
diff --git a/MediaBrowser.Server.Implementations/Photos/DynamicImageHelpers.cs b/MediaBrowser.Server.Implementations/Photos/DynamicImageHelpers.cs
index 2c5cedf65..1099bd170 100644
--- a/MediaBrowser.Server.Implementations/Photos/DynamicImageHelpers.cs
+++ b/MediaBrowser.Server.Implementations/Photos/DynamicImageHelpers.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Server.Implementations.Photos
 {
     public static class DynamicImageHelpers
     {
-        public static async Task<Image> GetThumbCollage(List<string> files,
+        public static async Task<Stream> GetThumbCollage(List<string> files,
             IFileSystem fileSystem,
             int width,
             int height)
@@ -23,8 +23,8 @@ namespace MediaBrowser.Server.Implementations.Photos
             const int rows = 1;
             const int cols = 3;
 
-             int cellWidth = 2 * (width / 3);
-             int cellHeight = height;
+            int cellWidth = 2 * (width / 3);
+            int cellHeight = height;
             var index = 0;
 
             var img = new Bitmap(width, height, PixelFormat.Format32bppPArgb);
@@ -67,10 +67,10 @@ namespace MediaBrowser.Server.Implementations.Photos
                 }
             }
 
-            return img;
+            return GetStream(img);
         }
-        
-        public static async Task<Image> GetSquareCollage(List<string> files,
+
+        public static async Task<Stream> GetSquareCollage(List<string> files,
             IFileSystem fileSystem,
             int size)
         {
@@ -122,12 +122,23 @@ namespace MediaBrowser.Server.Implementations.Photos
                 }
             }
 
-            return img;
+            return GetStream(img);
+        }
+
+        private static Task<Stream> GetSingleImage(List<string> files, IFileSystem fileSystem)
+        {
+            return Task.FromResult<Stream>(fileSystem.GetFileStream(files[0], FileMode.Open, FileAccess.Read, FileShare.Read));
         }
 
-        private static Task<Image> GetSingleImage(List<string> files, IFileSystem fileSystem)
+        private static Stream GetStream(Image image)
         {
-            return GetImage(files[0], fileSystem);
+            var ms = new MemoryStream();
+
+            image.Save(ms, ImageFormat.Png);
+
+            ms.Position = 0;
+
+            return ms;
         }
 
         private static async Task<Image> GetImage(string file, IFileSystem fileSystem)
diff --git a/MediaBrowser.Server.Implementations/Photos/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/DynamicImageProvider.cs
new file mode 100644
index 000000000..f3e48c412
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Photos/DynamicImageProvider.cs
@@ -0,0 +1,170 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MoreLinq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.Photos
+{
+    public class MusicDynamicImageProvider : BaseDynamicImageProvider<UserView>, ICustomMetadataProvider<UserView>
+    {
+        private readonly IUserManager _userManager;
+        private readonly ILibraryManager _libraryManager;
+
+        public MusicDynamicImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IUserManager userManager, ILibraryManager libraryManager)
+            : base(fileSystem, providerManager)
+        {
+            _userManager = userManager;
+            _libraryManager = libraryManager;
+        }
+
+        protected override async Task<List<BaseItem>> GetItemsWithImages(IHasImages item)
+        {
+            var view = (UserView)item;
+
+            if (!view.UserId.HasValue)
+            {
+                return new List<BaseItem>();
+            }
+
+            if (string.Equals(view.ViewType, SpecialFolder.GameGenre, StringComparison.OrdinalIgnoreCase))
+            {
+                var list = new List<BaseItem>();
+
+                var genre = _libraryManager.GetGameGenre(view.Name);
+
+                if (genre.HasImage(ImageType.Primary) || genre.HasImage(ImageType.Thumb))
+                {
+                    list.Add(genre);
+                }
+                return list;
+            }
+            if (string.Equals(view.ViewType, SpecialFolder.MusicGenre, StringComparison.OrdinalIgnoreCase))
+            {
+                var list = new List<BaseItem>();
+
+                var genre = _libraryManager.GetMusicGenre(view.Name);
+
+                if (genre.HasImage(ImageType.Primary) || genre.HasImage(ImageType.Thumb))
+                {
+                    list.Add(genre);
+                }
+                return list;
+            }
+            if (string.Equals(view.ViewType, SpecialFolder.MovieGenre, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(view.ViewType, SpecialFolder.TvGenre, StringComparison.OrdinalIgnoreCase))
+            {
+                var list = new List<BaseItem>();
+
+                var genre = _libraryManager.GetGenre(view.Name);
+
+                if (genre.HasImage(ImageType.Primary) || genre.HasImage(ImageType.Thumb))
+                {
+                    list.Add(genre);
+                }
+                return list;
+            }
+
+            var result = await view.GetItems(new InternalItemsQuery
+            {
+                User = _userManager.GetUserById(view.UserId.Value)
+
+            }).ConfigureAwait(false);
+
+            var items = result.Items.Select(i =>
+            {
+                var episode = i as Episode;
+                if (episode != null)
+                {
+                    var series = episode.Series;
+                    if (series != null)
+                    {
+                        return series;
+                    }
+                    var episodeSeason = episode.Season;
+                    if (episodeSeason != null)
+                    {
+                        return episodeSeason;
+                    }
+
+                    return episode;
+                }
+
+                var season = i as Season;
+                if (season != null)
+                {
+                    var series = season.Series;
+                    if (series != null)
+                    {
+                        return series;
+                    }
+
+                    return season;
+                }
+
+                return i;
+
+            }).DistinctBy(i => i.Id);
+
+            return GetFinalItems(items.Where(i => i.HasImage(ImageType.Primary)).ToList());
+        }
+
+        protected override bool Supports(IHasImages item)
+        {
+            var view = item as UserView;
+
+            if (view != null && view.UserId.HasValue)
+            {
+                var supported = new[]
+                {
+                    SpecialFolder.TvFavoriteEpisodes,
+                    SpecialFolder.TvFavoriteSeries,
+                    SpecialFolder.TvGenres,
+                    SpecialFolder.TvGenre,
+                    SpecialFolder.TvLatest,
+                    SpecialFolder.TvNextUp,
+                    SpecialFolder.TvResume,
+                    SpecialFolder.TvShowSeries,
+
+                    SpecialFolder.MovieCollections,
+                    SpecialFolder.MovieFavorites,
+                    SpecialFolder.MovieGenres,
+                    SpecialFolder.MovieGenre,
+                    SpecialFolder.MovieLatest,
+                    SpecialFolder.MovieMovies,
+                    SpecialFolder.MovieResume,
+
+                    SpecialFolder.GameFavorites,
+                    SpecialFolder.GameGenres,
+                    SpecialFolder.GameGenre,
+                    SpecialFolder.GameSystems,
+                    SpecialFolder.LatestGames,
+                    SpecialFolder.RecentlyPlayedGames,
+
+                    SpecialFolder.MusicArtists,
+                    SpecialFolder.MusicAlbumArtists,
+                    SpecialFolder.MusicAlbums,
+                    SpecialFolder.MusicGenres,
+                    SpecialFolder.MusicGenre,
+                    SpecialFolder.MusicLatest,
+                    SpecialFolder.MusicSongs,
+                    SpecialFolder.MusicFavorites,
+                    SpecialFolder.MusicFavoriteArtists,
+                    SpecialFolder.MusicFavoriteAlbums,
+                    SpecialFolder.MusicFavoriteSongs
+                };
+
+                return supported.Contains(view.ViewType, StringComparer.OrdinalIgnoreCase) &&
+                    _userManager.GetUserById(view.UserId.Value) != null;
+            }
+
+            return false;
+        }
+    }
+}