Merge pull request #1099 from MediaBrowser/dev

3.0.5607.1

4 files changed, 32 insertions, 15 deletions

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index 6514893477..18711c61e2 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -17,7 +17,6 @@ using MediaBrowser.Model.Querying;
 using MoreLinq;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 4fb0569965..e7372ce377 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -48,8 +48,9 @@
     <Reference Include="Interfaces.IO">
       <HintPath>..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll</HintPath>
     </Reference>
-    <Reference Include="MediaBrowser.Naming">
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.35\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
+    <Reference Include="MediaBrowser.Naming, Version=1.0.5607.1779, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.36\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Nat, Version=1.2.24.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
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<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/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 0b81c1866d..fa7511143d 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

   <package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />

-  <package id="MediaBrowser.Naming" version="1.0.0.35" targetFramework="net45" />

+  <package id="MediaBrowser.Naming" version="1.0.0.36" targetFramework="net45" />

   <package id="Mono.Nat" version="1.2.24.0" targetFramework="net45" />

   <package id="morelinq" version="1.1.0" targetFramework="net45" />

   <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />