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 --- .../Providers/BaseMetadataProvider.cs | 88 ++++++++++++++++++++-- 1 file changed, 83 insertions(+), 5 deletions(-) (limited to 'MediaBrowser.Controller/Providers/BaseMetadataProvider.cs') diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs index 8a73e7ea96..625910c0bc 100644 --- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs +++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs @@ -1,6 +1,10 @@ -using MediaBrowser.Common.Extensions; +using System.IO; +using System.Linq; +using System.Text; +using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using System; @@ -39,7 +43,7 @@ namespace MediaBrowser.Controller.Providers protected static readonly Task FalseTaskResult = Task.FromResult(false); protected static readonly SemaphoreSlim XmlParsingResourcePool = new SemaphoreSlim(5, 5); - + /// /// Supportses the specified item. /// @@ -228,7 +232,7 @@ namespace MediaBrowser.Controller.Providers { return true; } - + return false; } @@ -282,6 +286,11 @@ namespace MediaBrowser.Controller.Providers } } + protected virtual string[] FilestampExtensions + { + get { return new string[] { }; } + } + /// /// Determines if the parent's file system stamp should be used for comparison /// @@ -302,10 +311,79 @@ namespace MediaBrowser.Controller.Providers { if (UseParentFileSystemStamp(item) && item.Parent != null) { - return item.Parent.FileSystemStamp; + return GetFileSystemStamp(item.Parent); + } + + return GetFileSystemStamp(item); + } + + /// + /// Gets the file system stamp. + /// + /// The item. + /// Guid. + private Guid GetFileSystemStamp(BaseItem item) + { + // If there's no path or the item is a file, there's nothing to do + if (item.LocationType != LocationType.FileSystem) + { + return Guid.Empty; + } + + ItemResolveArgs resolveArgs; + + try + { + resolveArgs = item.ResolveArgs; + } + catch (IOException ex) + { + Logger.ErrorException("Error determining if path is directory: {0}", ex, item.Path); + throw; + } + + if (!resolveArgs.IsDirectory) + { + return Guid.Empty; + } + + var sb = new StringBuilder(); + + var extensions = FilestampExtensions; + + // 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 + .Where(i => IncludeInFileStamp(i, extensions)) + .OrderBy(f => f.Name)) + { + sb.Append(file.Name); + } + + foreach (var file in resolveArgs.MetadataFiles + .Where(i => IncludeInFileStamp(i, extensions)) + .OrderBy(f => f.Name)) + { + sb.Append(file.Name); + } + + return sb.ToString().GetMD5(); + } + + /// + /// Includes the in file stamp. + /// + /// The file. + /// The extensions. + /// true if XXXX, false otherwise + private bool IncludeInFileStamp(FileSystemInfo file, string[] extensions) + { + if ((file.Attributes & FileAttributes.Directory) == FileAttributes.Directory) + { + return false; } - return item.FileSystemStamp; + return extensions.Length == 0 || extensions.Contains(file.Extension, StringComparer.OrdinalIgnoreCase); } } } -- cgit v1.2.3