aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-05-10 09:06:12 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-05-10 09:06:12 -0400
commit3d574df6f0410036a417c66ff9df24e91e668aa3 (patch)
treedb2eeeba6b112b101c54391ad7a4a8c13f319fd2
parent1e7b3af9c2087ac7854aa33d7f4f5aca299aba53 (diff)
3.0.5607.1
-rw-r--r--MediaBrowser.Server.Implementations/Photos/PhotoAlbumImageProvider.cs39
-rw-r--r--SharedVersion.cs4
2 files changed, 30 insertions, 13 deletions
diff --git a/MediaBrowser.Server.Implementations/Photos/PhotoAlbumImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/PhotoAlbumImageProvider.cs
index f04c0bf77..b5ecc94a2 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<PhotoAlbum>
+ //public class PhotoAlbumImageProvider : IDynamicImageProvider
//{
- // public PhotoAlbumImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor)
- // : base(fileSystem, providerManager, applicationPaths, imageProcessor)
+ // public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
// {
+ // return new List<ImageType> { ImageType.Primary };
// }
- // protected override Task<List<BaseItem>> GetItemsWithImages(IHasImages item)
+ // public Task<DynamicImageResponse> 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<Photo>()
+ // .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 ce554da96..e4ebaa224 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")]