diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 19 |
3 files changed, 17 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 8d52d73b48..87aa471ea8 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -354,7 +354,7 @@ namespace MediaBrowser.Controller.Entities } //update our dates - EntityResolutionHelper.EnsureDates(this, args); + EntityResolutionHelper.EnsureDates(this, args, false); IsOffline = false; diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index fdd24e76b0..3eda96d3d2 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -681,7 +681,7 @@ namespace MediaBrowser.Controller.Entities //existing item - check if it has changed if (currentChild.HasChanged(child)) { - EntityResolutionHelper.EnsureDates(currentChild, child.ResolveArgs); + EntityResolutionHelper.EnsureDates(currentChild, child.ResolveArgs, false); validChildren.Add(new Tuple<BaseItem, bool>(currentChild, true)); } diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index db57544de7..1b3aba1026 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -127,7 +127,8 @@ namespace MediaBrowser.Controller.Resolvers /// </summary> /// <param name="item">The item.</param> /// <param name="args">The args.</param> - public static void EnsureDates(BaseItem item, ItemResolveArgs args) + /// <param name="includeCreationTime">if set to <c>true</c> [include creation time].</param> + public static void EnsureDates(BaseItem item, ItemResolveArgs args, bool includeCreationTime) { if (!Path.IsPathRooted(item.Path)) { @@ -141,7 +142,11 @@ namespace MediaBrowser.Controller.Resolvers if (childData != null) { - item.DateCreated = childData.CreationTimeUtc; + if (includeCreationTime) + { + item.DateCreated = childData.CreationTimeUtc; + } + item.DateModified = childData.LastWriteTimeUtc; } else @@ -150,14 +155,20 @@ namespace MediaBrowser.Controller.Resolvers if (fileData.Exists) { - item.DateCreated = fileData.CreationTimeUtc; + if (includeCreationTime) + { + item.DateCreated = fileData.CreationTimeUtc; + } item.DateModified = fileData.LastWriteTimeUtc; } } } else { - item.DateCreated = args.FileInfo.CreationTimeUtc; + if (includeCreationTime) + { + item.DateCreated = args.FileInfo.CreationTimeUtc; + } item.DateModified = args.FileInfo.LastWriteTimeUtc; } } |