huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reacting to FIleSystemGlobbing changes

This commit is contained in:
Ajay Bhargav Baaskaran 2015-02-19 17:00:24 -08:00
parent d9e2581c9a
commit 6b3119e2c5
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Microsoft.AspNet.Mvc.TagHelpers/Internal/FileProviderGlobbingDirectory.cs
View File

@ -1,9 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.FileProviders;
using Microsoft.Framework.FileSystemGlobbing.Abstractions; using Microsoft.Framework.FileSystemGlobbing.Abstractions;
@ -76,32 +74,8 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal
} }
} }
public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos( public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos()
string searchPattern,
SearchOption searchOption)
{ {
if (!string.Equals(searchPattern, "*", StringComparison.OrdinalIgnoreCase))
{
// Only * based searches are ever performed against this API and we have an item to change this API
// such that the searchPattern doesn't even get passed in, so this is just a safe-guard until then.
// The searchPattern here has no relation to the globbing pattern.
throw new ArgumentException(
"Only full wildcard searches are supported, i.e. \"*\".",
nameof(searchPattern));
}
if (searchOption != SearchOption.TopDirectoryOnly)
{
// Only SearchOption.TopDirectoryOnly is actually used in the implementation of Matcher and will likely
// be removed from DirectoryInfoBase in the near future. This is just a safe-guard until then.
// The searchOption here has no relation to the globbing pattern.
throw new ArgumentException(
$"Only {nameof(SearchOption.TopDirectoryOnly)} is supported.",
nameof(searchOption));
}
foreach (var fileInfo in _fileProvider.GetDirectoryContents(RelativePath)) foreach (var fileInfo in _fileProvider.GetDirectoryContents(RelativePath))
{ {
yield return BuildFileResult(fileInfo); yield return BuildFileResult(fileInfo);