diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Photos')
3 files changed, 117 insertions, 23 deletions
diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs index 4a347f130..9cae36283 100644 --- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs +++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs @@ -34,7 +34,7 @@ namespace MediaBrowser.Server.Implementations.Photos return item is T; } - public IEnumerable<ImageType> GetSupportedImages(IHasImages item) + public virtual IEnumerable<ImageType> GetSupportedImages(IHasImages item) { return new List<ImageType> { diff --git a/MediaBrowser.Server.Implementations/Photos/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/DynamicImageProvider.cs index 6f20631ac..1a02d413e 100644 --- a/MediaBrowser.Server.Implementations/Photos/DynamicImageProvider.cs +++ b/MediaBrowser.Server.Implementations/Photos/DynamicImageProvider.cs @@ -20,12 +20,29 @@ namespace MediaBrowser.Server.Implementations.Photos private readonly IUserManager _userManager; private readonly ILibraryManager _libraryManager; - public DynamicImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IUserManager userManager, ILibraryManager libraryManager, string[] collectionStripViewTypes) + public DynamicImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IUserManager userManager, ILibraryManager libraryManager) : base(fileSystem, providerManager, applicationPaths) { _userManager = userManager; _libraryManager = libraryManager; - _collectionStripViewTypes = collectionStripViewTypes; + } + + public override IEnumerable<ImageType> GetSupportedImages(IHasImages item) + { + var view = (UserView)item; + if (IsUsingCollectionStrip(view)) + { + return new List<ImageType> + { + ImageType.Primary + }; + } + + return new List<ImageType> + { + ImageType.Primary, + ImageType.Thumb + }; } protected override async Task<List<BaseItem>> GetItemsWithImages(IHasImages item) @@ -75,9 +92,15 @@ namespace MediaBrowser.Server.Implementations.Photos return list; } + var isUsingCollectionStrip = IsUsingCollectionStrip(view); + var recursive = isUsingCollectionStrip && !new[] {CollectionType.Playlists, CollectionType.Channels}.Contains(view.ViewType ?? string.Empty, StringComparer.OrdinalIgnoreCase); + var result = await view.GetItems(new InternalItemsQuery { - User = _userManager.GetUserById(view.UserId.Value) + User = _userManager.GetUserById(view.UserId.Value), + CollapseBoxSetItems = false, + Recursive = recursive, + ExcludeItemTypes = new[] { "UserView", "CollectionFolder"} }).ConfigureAwait(false); @@ -115,13 +138,10 @@ namespace MediaBrowser.Server.Implementations.Photos var audio = i as Audio; if (audio != null) { - if (!audio.HasImage(ImageType.Primary)) + var album = audio.FindParent<MusicAlbum>(); + if (album != null && album.HasImage(ImageType.Primary)) { - var album = audio.FindParent<MusicAlbum>(); - if (album != null) - { - return album; - } + return album; } } @@ -129,7 +149,7 @@ namespace MediaBrowser.Server.Implementations.Photos }).DistinctBy(i => i.Id); - if (IsUsingCollectionStrip(view)) + if (isUsingCollectionStrip) { return GetFinalItems(items.Where(i => i.HasImage(ImageType.Primary) || i.HasImage(ImageType.Thumb)).ToList(), 8); } @@ -137,8 +157,6 @@ namespace MediaBrowser.Server.Implementations.Photos return GetFinalItems(items.Where(i => i.HasImage(ImageType.Primary)).ToList()); } - private readonly string[] _collectionStripViewTypes = { CollectionType.Movies }; - public override bool Supports(IHasImages item) { var view = item as UserView; @@ -193,7 +211,18 @@ namespace MediaBrowser.Server.Implementations.Photos private bool IsUsingCollectionStrip(UserView view) { - return _collectionStripViewTypes.Contains(view.ViewType ?? string.Empty); + string[] collectionStripViewTypes = + { + CollectionType.Movies, + CollectionType.TvShows, + CollectionType.Games, + CollectionType.Music, + CollectionType.BoxSets, + CollectionType.Playlists, + CollectionType.Channels + }; + + return collectionStripViewTypes.Contains(view.ViewType ?? string.Empty); } protected override Task<Stream> CreateImageAsync(IHasImages item, List<BaseItem> itemsWithImages, ImageType imageType, int imageIndex) diff --git a/MediaBrowser.Server.Implementations/Photos/StripCollageBuilder.cs b/MediaBrowser.Server.Implementations/Photos/StripCollageBuilder.cs index c338e277d..6fd33f6e4 100644 --- a/MediaBrowser.Server.Implementations/Photos/StripCollageBuilder.cs +++ b/MediaBrowser.Server.Implementations/Photos/StripCollageBuilder.cs @@ -19,31 +19,40 @@ namespace MediaBrowser.Server.Implementations.Photos public Stream BuildThumbCollage(IEnumerable<string> paths, string text, int width, int height) { - using (var wand = BuildThumbCollageWand(paths, text, width, height)) + using (var wand = BuildThumbCollageWandWithText(paths, text, width, height)) { return DynamicImageHelpers.GetStream(wand, _appPaths); } } - private IEnumerable<string> ProjectPaths(IEnumerable<string> paths, int count) + private string[] ProjectPaths(IEnumerable<string> paths, int count) { var clone = paths.ToList(); var list = new List<string>(); while (list.Count < count) { - list.AddRange(clone); + foreach (var path in clone) + { + list.Add(path); + + if (list.Count >= count) + { + break; + } + } } - return list.Take(count); + return list.Take(count).ToArray(); } - private MagickWand BuildThumbCollageWand(IEnumerable<string> paths, string text, int width, int height) + private MagickWand BuildThumbCollageWandWithText(IEnumerable<string> paths, string text, int width, int height) { - using (var wandImages = new MagickWand(ProjectPaths(paths, 8).ToArray())) + var inputPaths = ProjectPaths(paths, 8); + using (var wandImages = new MagickWand(inputPaths)) { var wand = new MagickWand(width, height); - wand.OpenImage("gradient:#111111-#252525"); + wand.OpenImage("gradient:#111111-#111111"); using (var draw = new DrawingWand()) { using (var fcolor = new PixelWand(ColorName.White)) @@ -86,12 +95,12 @@ namespace MediaBrowser.Server.Implementations.Photos mwr.CurrentImage.FlipImage(); mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel; - mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey56); + mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey70); using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans)) { mwg.OpenImage("gradient:black-none"); - var verticalSpacing = Convert.ToInt32(height * 0.00555555555555555555555555555556); + var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111); mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.DstInCompositeOp, 0, verticalSpacing); wandList.AddImage(mwr); @@ -106,6 +115,62 @@ namespace MediaBrowser.Server.Implementations.Photos } } + private MagickWand BuildThumbCollageWand(IEnumerable<string> paths, int width, int height) + { + var inputPaths = ProjectPaths(paths, 8); + using (var wandImages = new MagickWand(inputPaths)) + { + var wand = new MagickWand(width, height); + wand.OpenImage("gradient:#111111-#111111"); + using (var draw = new DrawingWand()) + { + var iSlice = Convert.ToInt32(width * .1166666667); + int iTrans = Convert.ToInt32(height * .25); + int iHeight = Convert.ToInt32(height * .6); + var horizontalImagePadding = Convert.ToInt32(width * 0.0125); + + foreach (var element in wandImages.ImageList) + { + int iWidth = (int)Math.Abs(iHeight * element.Width / element.Height); + element.Gravity = GravityType.CenterGravity; + element.BackgroundColor = ColorName.Black; + element.ResizeImage(iWidth, iHeight, FilterTypes.LanczosFilter); + int ix = (int)Math.Abs((iWidth - iSlice) / 2); + element.CropImage(iSlice, iHeight, ix, 0); + + element.ExtentImage(iSlice, iHeight, 0 - horizontalImagePadding, 0); + } + + wandImages.SetFirstIterator(); + using (var wandList = wandImages.AppendImages()) + { + wandList.CurrentImage.TrimImage(1); + using (var mwr = wandList.CloneMagickWand()) + { + mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1); + mwr.CurrentImage.FlipImage(); + + mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel; + mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey60); + + using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans)) + { + mwg.OpenImage("gradient:black-none"); + var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111); + mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.CopyOpacityCompositeOp, 0, verticalSpacing); + + wandList.AddImage(mwr); + int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2; + wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * .1)); + } + } + } + } + + return wand; + } + } + private string MontserratLightFont { get { return PlayedIndicatorDrawer.ExtractFont("MontserratLight.otf", _appPaths); } |