diff options
| author | Sven Van den brande <sven.vandenbrande@outlook.com> | 2013-10-31 21:46:03 +0100 |
|---|---|---|
| committer | Sven Van den brande <sven.vandenbrande@outlook.com> | 2013-10-31 21:46:03 +0100 |
| commit | e8f8d6651c86b3fd3350a5afae1d759fbbad06bd (patch) | |
| tree | 6496b1525f0dfc448f0250f4fddaa634296ae94b /MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | |
| parent | 28ab28768a307d1cac60ebe79163b98291068cde (diff) | |
| parent | 882d0681e68c5e0ae663cca75752e4df765c8dd5 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index 1b3aba102..1e4fabc7c 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Entities; +using MediaBrowser.Common.IO; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using System; @@ -44,7 +45,8 @@ namespace MediaBrowser.Controller.Resolvers ".f4v", ".3gp", ".webm", - ".mts" + ".mts", + ".rec" }; private static readonly Dictionary<string, string> VideoFileExtensionsDictionary = VideoFileExtensions.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); @@ -125,10 +127,11 @@ namespace MediaBrowser.Controller.Resolvers /// <summary> /// Ensures DateCreated and DateModified have values /// </summary> + /// <param name="fileSystem">The file system.</param> /// <param name="item">The item.</param> /// <param name="args">The args.</param> /// <param name="includeCreationTime">if set to <c>true</c> [include creation time].</param> - public static void EnsureDates(BaseItem item, ItemResolveArgs args, bool includeCreationTime) + public static void EnsureDates(IFileSystem fileSystem, BaseItem item, ItemResolveArgs args, bool includeCreationTime) { if (!Path.IsPathRooted(item.Path)) { @@ -144,22 +147,22 @@ namespace MediaBrowser.Controller.Resolvers { if (includeCreationTime) { - item.DateCreated = childData.CreationTimeUtc; + item.DateCreated = fileSystem.GetCreationTimeUtc(childData); } - item.DateModified = childData.LastWriteTimeUtc; + item.DateModified = fileSystem.GetLastWriteTimeUtc(childData); } else { - var fileData = FileSystem.GetFileSystemInfo(item.Path); + var fileData = fileSystem.GetFileSystemInfo(item.Path); if (fileData.Exists) { if (includeCreationTime) { - item.DateCreated = fileData.CreationTimeUtc; + item.DateCreated = fileSystem.GetCreationTimeUtc(fileData); } - item.DateModified = fileData.LastWriteTimeUtc; + item.DateModified = fileSystem.GetLastWriteTimeUtc(fileData); } } } @@ -167,9 +170,9 @@ namespace MediaBrowser.Controller.Resolvers { if (includeCreationTime) { - item.DateCreated = args.FileInfo.CreationTimeUtc; + item.DateCreated = fileSystem.GetCreationTimeUtc(args.FileInfo); } - item.DateModified = args.FileInfo.LastWriteTimeUtc; + item.DateModified = fileSystem.GetLastWriteTimeUtc(args.FileInfo); } } } |