9 files changed, 18 insertions, 32 deletions

diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index f74c01994..54faa1443 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -32,14 +32,6 @@ namespace MediaBrowser.Controller.Channels
             return base.IsVisible(user);
         }
 
-        public override double? GetDefaultPrimaryImageAspectRatio()
-        {
-            double value = 16;
-            value /= 9;
-
-            return value;
-        }
-
         [IgnoreDataMember]
         public override bool SupportsInheritedParentImages
         {
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index 542fa5e08..40ab71be8 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -31,16 +31,9 @@ namespace MediaBrowser.Controller.Drawing
         /// </summary>
         /// <param name="info">The information.</param>
         /// <returns>ImageSize.</returns>
-        ImageSize GetImageSize(ItemImageInfo info);
+        ImageSize GetImageSize(BaseItem item, ItemImageInfo info);
 
-        ImageSize GetImageSize(ItemImageInfo info, bool allowSlowMethods);
-
-        /// <summary>
-        /// Gets the size of the image.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>ImageSize.</returns>
-        ImageSize GetImageSize(string path);
+        ImageSize GetImageSize(BaseItem item, ItemImageInfo info, bool allowSlowMethods, bool updateItem);
 
         /// <summary>
         /// Adds the parts.
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index c0217330d..5ba6e036e 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -23,14 +23,14 @@ namespace MediaBrowser.Controller.Dto
         /// </summary>
         /// <param name="dto">The dto.</param>
         /// <param name="item">The item.</param>
-        void AttachPrimaryImageAspectRatio(IItemDto dto, IHasMetadata item);
+        void AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item);
 
         /// <summary>
         /// Gets the primary image aspect ratio.
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>System.Nullable&lt;System.Double&gt;.</returns>
-        double? GetPrimaryImageAspectRatio(IHasMetadata item);
+        double? GetPrimaryImageAspectRatio(BaseItem item);
 
         /// <summary>
         /// Gets the base item dto.
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 051a2cbca..6898c0178 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1952,6 +1952,8 @@ namespace MediaBrowser.Controller.Entities
             {
                 existingImage.Path = image.Path;
                 existingImage.DateModified = image.DateModified;
+                existingImage.Width = image.Width;
+                existingImage.Height = image.Height;
             }
 
             else
@@ -2268,6 +2270,11 @@ namespace MediaBrowser.Controller.Entities
             info1.DateModified = FileSystem.GetLastWriteTimeUtc(info1.Path);
             info2.DateModified = FileSystem.GetLastWriteTimeUtc(info2.Path);
 
+            info1.Width = 0;
+            info1.Height = 0;
+            info2.Width = 0;
+            info2.Height = 0;
+
             UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
         }
 
diff --git a/MediaBrowser.Controller/Entities/ItemImageInfo.cs b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
index 6b2d2392d..bd0011c4b 100644
--- a/MediaBrowser.Controller/Entities/ItemImageInfo.cs
+++ b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
@@ -24,6 +24,9 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The date modified.</value>
         public DateTime DateModified { get; set; }
 
+        public int Width { get; set; }
+        public int Height { get; set; }
+
         [IgnoreDataMember]
         public bool IsLocalFile
         {
diff --git a/MediaBrowser.Controller/Entities/PhotoAlbum.cs b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
index 52d743e36..af9d8c801 100644
--- a/MediaBrowser.Controller/Entities/PhotoAlbum.cs
+++ b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
@@ -30,10 +30,5 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }
         }
-
-        public override double? GetDefaultPrimaryImageAspectRatio()
-        {
-            return 1;
-        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 8203e5304..265e35341 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -78,14 +78,6 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        public override double? GetDefaultPrimaryImageAspectRatio()
-        {
-            double value = 16;
-            value /= 9;
-
-            return value;
-        }
-
         public override string CreatePresentationUniqueKey()
         {
             if (!string.IsNullOrWhiteSpace(PrimaryVersionId))
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 7fceeb780..37e0d5661 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -128,6 +128,8 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         void QueueLibraryScan();
 
+        void UpdateImages(BaseItem item);
+
         /// <summary>
         /// Gets the default view.
         /// </summary>
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index 3d05d2fca..4cb3e2bb6 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -48,6 +48,8 @@ namespace MediaBrowser.Controller.Persistence
         /// <param name="cancellationToken">The cancellation token.</param>
         void SaveItems(List<BaseItem> items, CancellationToken cancellationToken);
 
+        void SaveImages(BaseItem item);
+
         /// <summary>
         /// Retrieves the item.
         /// </summary>