From b9d17c9bc765a0c59d81db6277300a6860bf8421 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 1 Jan 2014 13:26:31 -0500 Subject: add more methods to file system interface --- .../Library/CoreResolutionIgnoreRule.cs | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs') diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs index 5268faa4f..98a87d03d 100644 --- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs +++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Entities; +using MediaBrowser.Common.IO; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Resolvers; using System; @@ -30,6 +31,13 @@ namespace MediaBrowser.Server.Implementations.Library }.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); + private readonly IFileSystem _fileSystem; + + public CoreResolutionIgnoreRule(IFileSystem fileSystem) + { + _fileSystem = fileSystem; + } + /// /// Shoulds the ignore. /// @@ -60,23 +68,12 @@ namespace MediaBrowser.Server.Implementations.Library return false; } - // Drives will sometimes be hidden - if (args.Path.EndsWith(Path.VolumeSeparatorChar + "\\", StringComparison.OrdinalIgnoreCase)) + // Sometimes these are marked hidden + if (_fileSystem.IsRootPath(args.Path)) { return false; } - // Shares will sometimes be hidden - if (args.Path.StartsWith("\\", StringComparison.OrdinalIgnoreCase)) - { - // Look for a share, e.g. \\server\movies - // Is there a better way to detect if a path is a share without using native code? - if (args.Path.Substring(2).Split(Path.DirectorySeparatorChar).Length == 2) - { - return false; - } - } - return true; } -- cgit v1.2.3