From d32c71ca39147d5a46b54e429ccc62ac74df0e1d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 21 Jun 2013 14:50:44 -0400 Subject: limit the extensions that are factored into the file stamp check --- MediaBrowser.Controller/Entities/BaseItem.cs | 69 ---------------------------- MediaBrowser.Controller/Entities/Folder.cs | 4 +- 2 files changed, 2 insertions(+), 71 deletions(-) (limited to 'MediaBrowser.Controller/Entities') diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 384db5ed2f..00ab867b2d 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -219,29 +219,6 @@ namespace MediaBrowser.Controller.Entities } } - /// - /// The _file system stamp - /// - private Guid? _fileSystemStamp; - /// - /// Gets a directory stamp, in the form of a string, that can be used for - /// comparison purposes to determine if the file system entries for this item have changed. - /// - /// The file system stamp. - [IgnoreDataMember] - public Guid FileSystemStamp - { - get - { - if (!_fileSystemStamp.HasValue) - { - _fileSystemStamp = GetFileSystemStamp(); - } - - return _fileSystemStamp.Value; - } - } - /// /// Gets the type of the media. /// @@ -255,49 +232,6 @@ namespace MediaBrowser.Controller.Entities } } - /// - /// Gets a directory stamp, in the form of a string, that can be used for - /// comparison purposes to determine if the file system entries for this item have changed. - /// - /// Guid. - private Guid GetFileSystemStamp() - { - // If there's no path or the item is a file, there's nothing to do - if (LocationType != LocationType.FileSystem) - { - return Guid.Empty; - } - - try - { - if (!ResolveArgs.IsDirectory) - { - return Guid.Empty; - } - } - catch (IOException ex) - { - Logger.ErrorException("Error determining if path is directory: {0}", ex, ResolveArgs.Path); - throw; - } - - var sb = new StringBuilder(); - - // Record the name of each file - // Need to sort these because accoring to msdn docs, our i/o methods are not guaranteed in any order - foreach (var file in ResolveArgs.FileSystemChildren - .OrderBy(f => f.Name)) - { - sb.Append(file.Name); - } - foreach (var file in ResolveArgs.MetadataFiles.OrderBy(f => f.Name)) - { - sb.Append(file.Name); - } - - return sb.ToString().GetMD5(); - } - /// /// The _resolve args /// @@ -338,9 +272,6 @@ namespace MediaBrowser.Controller.Entities { _resolveArgs = value; _resolveArgsInitialized = value != null; - - // Null this out so that it can be lazy loaded again - _fileSystemStamp = null; } } diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 8dc41661e8..e7c4a293bf 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.Entities /// public class Folder : BaseItem { - private static readonly TypeMapper _typeMapper = new TypeMapper(); + private static readonly TypeMapper TypeMapper = new TypeMapper(); /// /// Gets a value indicating whether this instance is folder. @@ -883,7 +883,7 @@ namespace MediaBrowser.Controller.Entities { var type = child.Type; - var itemType = _typeMapper.GetType(type); + var itemType = TypeMapper.GetType(type); if (itemType == null) { -- cgit v1.2.3