From e33244d7971f0299cd21297597da6181d01631e9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 29 Oct 2014 18:01:02 -0400 Subject: improve user view images --- .../Playlists/PlaylistImageProvider.cs | 291 +-------------------- 1 file changed, 6 insertions(+), 285 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Playlists') diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistImageProvider.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistImageProvider.cs index 54c100120d..aa10e66355 100644 --- a/MediaBrowser.Server.Implementations/Playlists/PlaylistImageProvider.cs +++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistImageProvider.cs @@ -1,123 +1,26 @@ -using MediaBrowser.Common.Extensions; -using MediaBrowser.Common.IO; +using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.TV; -using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Playlists; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; +using MediaBrowser.Server.Implementations.Photos; using MoreLinq; -using System; using System.Collections.Generic; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Drawing.Imaging; -using System.IO; using System.Linq; -using System.Threading; using System.Threading.Tasks; namespace MediaBrowser.Server.Implementations.Playlists { - public class PlaylistImageProvider : ICustomMetadataProvider, IHasChangeMonitor + public class PlaylistImageProvider : BaseDynamicImageProvider, ICustomMetadataProvider { - private readonly IFileSystem _fileSystem; - private readonly IProviderManager _provider; - - public PlaylistImageProvider(IFileSystem fileSystem, IProviderManager provider) - { - _fileSystem = fileSystem; - _provider = provider; - } - - public async Task FetchAsync(Playlist item, MetadataRefreshOptions options, CancellationToken cancellationToken) - { - var primaryResult = await FetchAsync(item, ImageType.Primary, options, cancellationToken).ConfigureAwait(false); - var thumbResult = await FetchAsync(item, ImageType.Thumb, options, cancellationToken).ConfigureAwait(false); - - return primaryResult | thumbResult; - } - - public async Task FetchAsync(PhotoAlbum item, MetadataRefreshOptions options, CancellationToken cancellationToken) - { - var primaryResult = await FetchAsync(item, ImageType.Primary, options, cancellationToken).ConfigureAwait(false); - var thumbResult = await FetchAsync(item, ImageType.Thumb, options, cancellationToken).ConfigureAwait(false); - - return primaryResult | thumbResult; - } - - private Task FetchAsync(IHasImages item, ImageType imageType, MetadataRefreshOptions options, CancellationToken cancellationToken) - { - var items = GetItemsWithImages(item); - var cacheKey = GetConfigurationCacheKey(items); - - if (!HasChanged(item, imageType, cacheKey)) - { - return Task.FromResult(ItemUpdateType.None); - } - - return FetchAsyncInternal(item, imageType, cacheKey, options, cancellationToken); - } - - private async Task FetchAsyncInternal(IHasImages item, ImageType imageType, string cacheKey, MetadataRefreshOptions options, CancellationToken cancellationToken) - { - var img = await CreateImageAsync(item, imageType, 0).ConfigureAwait(false); - - if (img == null) - { - return ItemUpdateType.None; - } - - using (var ms = new MemoryStream()) - { - img.Save(ms, ImageFormat.Png); - - ms.Position = 0; - - await _provider.SaveImage(item, ms, "image/png", imageType, null, cacheKey, cancellationToken).ConfigureAwait(false); - } - - return ItemUpdateType.ImageUpdate; - } - - private bool HasChanged(IHasImages item, ImageType type, string cacheKey) - { - var image = item.GetImageInfo(type, 0); - - if (image != null) - { - if (!_fileSystem.ContainsSubPath(item.GetInternalMetadataPath(), image.Path)) - { - return false; - } - - var currentPathCacheKey = (Path.GetFileNameWithoutExtension(image.Path) ?? string.Empty).Split('_').LastOrDefault(); - - if (string.Equals(cacheKey, currentPathCacheKey, StringComparison.OrdinalIgnoreCase)) - { - return false; - } - } - - return true; - } - - private const string Version = "3"; - - public string GetConfigurationCacheKey(List items) + public PlaylistImageProvider(IFileSystem fileSystem, IProviderManager providerManager) : base(fileSystem, providerManager) { - return (Version + "_" + string.Join(",", items.Select(i => i.Id.ToString("N")).ToArray())).GetMD5().ToString("N"); } - private List GetItemsWithImages(IHasImages item) + protected override Task> GetItemsWithImages(IHasImages item) { - var photoAlbum = item as PhotoAlbum; - if (photoAlbum != null) - { - return GetFinalItems(photoAlbum.RecursiveChildren.Where(i => i is Photo).ToList()); - } - var playlist = (Playlist)item; var items = playlist.GetManageableItems() @@ -157,189 +60,7 @@ namespace MediaBrowser.Server.Implementations.Playlists .DistinctBy(i => i.Id) .ToList(); - return GetFinalItems(items); - } - - private List GetFinalItems(List items) - { - // Rotate the images no more than once per day - var random = new Random(DateTime.Now.DayOfYear).Next(); - - return items - .OrderBy(i => random - items.IndexOf(i)) - .Take(4) - .OrderBy(i => i.Name) - .ToList(); - } - - public async Task CreateImageAsync(IHasImages item, ImageType imageType, int imageIndex) - { - var items = GetItemsWithImages(item); - - if (items.Count == 0) - { - return null; - } - - return imageType == ImageType.Thumb ? - await GetThumbCollage(items).ConfigureAwait(false) : - await GetSquareCollage(items).ConfigureAwait(false); - } - - private Task GetThumbCollage(List items) - { - return GetThumbCollage(items.Select(i => i.GetImagePath(ImageType.Primary)).ToList()); - } - - private Task GetSquareCollage(List items) - { - return GetSquareCollage(items.Select(i => i.GetImagePath(ImageType.Primary)).ToList()); - } - - private async Task GetThumbCollage(List files) - { - if (files.Count < 3) - { - return await GetSingleImage(files).ConfigureAwait(false); - } - - const int rows = 1; - const int cols = 3; - - const int cellWidth = 2 * (ThumbImageWidth / 3); - const int cellHeight = ThumbImageHeight; - var index = 0; - - var img = new Bitmap(ThumbImageWidth, ThumbImageHeight, PixelFormat.Format32bppPArgb); - - using (var graphics = Graphics.FromImage(img)) - { - graphics.CompositingQuality = CompositingQuality.HighQuality; - graphics.SmoothingMode = SmoothingMode.HighQuality; - graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; - graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; - graphics.CompositingMode = CompositingMode.SourceCopy; - - for (var row = 0; row < rows; row++) - { - for (var col = 0; col < cols; col++) - { - var x = col * (cellWidth / 2); - var y = row * cellHeight; - - if (files.Count > index) - { - using (var fileStream = _fileSystem.GetFileStream(files[index], FileMode.Open, FileAccess.Read, FileShare.Read, true)) - { - using (var memoryStream = new MemoryStream()) - { - await fileStream.CopyToAsync(memoryStream).ConfigureAwait(false); - - memoryStream.Position = 0; - - using (var imgtemp = Image.FromStream(memoryStream, true, false)) - { - graphics.DrawImage(imgtemp, x, y, cellWidth, cellHeight); - } - } - } - } - - index++; - } - } - } - - return img; - } - - private const int SquareImageSize = 800; - private const int ThumbImageWidth = 1600; - private const int ThumbImageHeight = 900; - - private async Task GetSquareCollage(List files) - { - if (files.Count < 4) - { - return await GetSingleImage(files).ConfigureAwait(false); - } - - const int rows = 2; - const int cols = 2; - - const int singleSize = SquareImageSize / 2; - var index = 0; - - var img = new Bitmap(SquareImageSize, SquareImageSize, PixelFormat.Format32bppPArgb); - - using (var graphics = Graphics.FromImage(img)) - { - graphics.CompositingQuality = CompositingQuality.HighQuality; - graphics.SmoothingMode = SmoothingMode.HighQuality; - graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; - graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; - graphics.CompositingMode = CompositingMode.SourceCopy; - - for (var row = 0; row < rows; row++) - { - for (var col = 0; col < cols; col++) - { - var x = col * singleSize; - var y = row * singleSize; - - using (var fileStream = _fileSystem.GetFileStream(files[index], FileMode.Open, FileAccess.Read, FileShare.Read, true)) - { - using (var memoryStream = new MemoryStream()) - { - await fileStream.CopyToAsync(memoryStream).ConfigureAwait(false); - - memoryStream.Position = 0; - - using (var imgtemp = Image.FromStream(memoryStream, true, false)) - { - graphics.DrawImage(imgtemp, x, y, singleSize, singleSize); - } - } - } - - index++; - } - } - } - - return img; - } - - private Task GetSingleImage(List files) - { - return GetImage(files[0]); - } - - private async Task GetImage(string file) - { - using (var fileStream = _fileSystem.GetFileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, true)) - { - var memoryStream = new MemoryStream(); - - await fileStream.CopyToAsync(memoryStream).ConfigureAwait(false); - - memoryStream.Position = 0; - - return Image.FromStream(memoryStream, true, false); - } - } - - public string Name - { - get { return "Dynamic Image Provider"; } - } - - public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date) - { - var items = GetItemsWithImages(item); - var cacheKey = GetConfigurationCacheKey(items); - - return HasChanged(item, ImageType.Primary, cacheKey) || HasChanged(item, ImageType.Thumb, cacheKey); + return Task.FromResult(GetFinalItems(items)); } } } -- cgit v1.2.3