From 3d574df6f0410036a417c66ff9df24e91e668aa3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 10 May 2015 09:06:12 -0400 Subject: [PATCH] 3.0.5607.1 --- .../Photos/PhotoAlbumImageProvider.cs | 39 +++++++++++++------ SharedVersion.cs | 4 +- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Photos/PhotoAlbumImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/PhotoAlbumImageProvider.cs index f04c0bf770..b5ecc94a29 100644 --- a/MediaBrowser.Server.Implementations/Photos/PhotoAlbumImageProvider.cs +++ b/MediaBrowser.Server.Implementations/Photos/PhotoAlbumImageProvider.cs @@ -1,27 +1,44 @@ -using MediaBrowser.Common.Configuration; -using MediaBrowser.Common.IO; -using MediaBrowser.Controller.Drawing; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; +using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; namespace MediaBrowser.Server.Implementations.Photos { - //public class PhotoAlbumImageProvider : BaseDynamicImageProvider + //public class PhotoAlbumImageProvider : IDynamicImageProvider //{ - // public PhotoAlbumImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor) - // : base(fileSystem, providerManager, applicationPaths, imageProcessor) + // public IEnumerable GetSupportedImages(IHasImages item) // { + // return new List { ImageType.Primary }; // } - // protected override Task> GetItemsWithImages(IHasImages item) + // public Task GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken) // { - // var photoAlbum = (PhotoAlbum)item; - // var items = GetFinalItems(photoAlbum.Children.ToList()); + // var album = (PhotoAlbum)item; - // return Task.FromResult(items); + // var image = album.Children + // .OfType() + // .Select(i => i.GetImagePath(type)) + // .FirstOrDefault(i => !string.IsNullOrEmpty(i)); + + // return Task.FromResult(new DynamicImageResponse + // { + // Path = image, + // HasImage = !string.IsNullOrEmpty(image) + // }); + // } + + // public string Name + // { + // get { return "Image Extractor"; } + // } + + // public bool Supports(IHasImages item) + // { + // return item is PhotoAlbum; // } //} } diff --git a/SharedVersion.cs b/SharedVersion.cs index ce554da96d..e4ebaa224e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5607.0")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5607.1")]