1 files changed, 74 insertions, 9 deletions
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); }