Merge pull request #1051 from MediaBrowser/dev

3.0.5557.20000 Beta

3 files changed, 27 insertions, 9 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index dd6189bc5..cdb52ec66 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1519,6 +1519,7 @@ namespace MediaBrowser.Controller.Entities
 
                 image.Path = file.FullName;
                 image.DateModified = imageInfo.DateModified;
+                image.Length = imageInfo.Length;
             }
         }
 
@@ -1623,11 +1624,14 @@ namespace MediaBrowser.Controller.Entities
                     return null;
                 }
 
+                var fileInfo = new FileInfo(path);
+
                 return new ItemImageInfo
                 {
                     Path = path,
-                    DateModified = FileSystem.GetLastWriteTimeUtc(path),
-                    Type = imageType
+                    DateModified = FileSystem.GetLastWriteTimeUtc(fileInfo),
+                    Type = imageType,
+                    Length = fileInfo.Length
                 };
             }
 
@@ -1686,6 +1690,7 @@ namespace MediaBrowser.Controller.Entities
                 else
                 {
                     existing.DateModified = FileSystem.GetLastWriteTimeUtc(newImage);
+                    existing.Length = ((FileInfo) newImage).Length;
                 }
             }
 
@@ -1700,7 +1705,8 @@ namespace MediaBrowser.Controller.Entities
             {
                 Path = file.FullName,
                 Type = type,
-                DateModified = FileSystem.GetLastWriteTimeUtc(file)
+                DateModified = FileSystem.GetLastWriteTimeUtc(file),
+                Length = ((FileInfo)file).Length
             };
         }
 
@@ -1739,9 +1745,15 @@ namespace MediaBrowser.Controller.Entities
 
             FileSystem.SwapFiles(path1, path2);
 
+            var file1 = new FileInfo(info1.Path);
+            var file2 = new FileInfo(info2.Path);
+
             // Refresh these values
-            info1.DateModified = FileSystem.GetLastWriteTimeUtc(info1.Path);
-            info2.DateModified = FileSystem.GetLastWriteTimeUtc(info2.Path);
+            info1.DateModified = FileSystem.GetLastWriteTimeUtc(file1);
+            info2.DateModified = FileSystem.GetLastWriteTimeUtc(file2);
+
+            info1.Length = file1.Length;
+            info2.Length = file2.Length;
 
             return UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
         }
diff --git a/MediaBrowser.Controller/Entities/ItemImageInfo.cs b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
index b36b818ff..1122de403 100644
--- a/MediaBrowser.Controller/Entities/ItemImageInfo.cs
+++ b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
@@ -12,6 +12,12 @@ namespace MediaBrowser.Controller.Entities
         public string Path { get; set; }
 
         /// <summary>
+        /// Gets or sets the length.
+        /// </summary>
+        /// <value>The length.</value>
+        public long Length { get; set; }
+
+        /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index b4e1d9d6e..91014ccda 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -232,7 +232,10 @@ namespace MediaBrowser.Controller.Entities.TV
             refreshOptions = new MetadataRefreshOptions(refreshOptions);
             refreshOptions.IsPostRecursiveRefresh = true;
 
-            // Refresh songs
+            // Refresh current item
+            await RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
+
+            // Refresh TV
             foreach (var item in seasons)
             {
                 cancellationToken.ThrowIfCancellationRequested();
@@ -245,9 +248,6 @@ namespace MediaBrowser.Controller.Entities.TV
                 progress.Report(percent * 100);
             }
 
-            // Refresh current item
-            await RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
-
             // Refresh all non-songs
             foreach (var item in otherItems)
             {