lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-18 19:51:45 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Ignore invalid manifest files, and cache available extensions

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-07-16 15:05:16 -07:00
parent c6e025895e
commit c0dc7becf3
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using Orchard.Caching;
using Orchard.Environment.Extensions.Models;
using Orchard.FileSystems.WebSite;
using Orchard.Logging;
using Yaml.Grammar;
namespace Orchard.Environment.Extensions.Folders {
@@ -34,23 +35,38 @@ namespace Orchard.Environment.Extensions.Folders {
_manifestIsOptional = manifestIsOptional;
_cacheManager = cacheManager;
_webSiteFolder = webSiteFolder;
Logger = NullLogger.Instance;
}
ILogger Logger { get; set; }
public IEnumerable<ExtensionDescriptor> AvailableExtensions() {
var list = new List<ExtensionDescriptor>();
foreach (var locationPath in _paths) {
var subfolderPaths = _cacheManager.Get(locationPath, ctx => {
var path = locationPath;
var subList = _cacheManager.Get(locationPath, ctx => {
ctx.Monitor(_webSiteFolder.WhenPathChanges(ctx.Key));
return _webSiteFolder.ListDirectories(ctx.Key);
var subfolderPaths = _webSiteFolder.ListDirectories(ctx.Key);
var localList = new List<ExtensionDescriptor>();
foreach ( var subfolderPath in subfolderPaths ) {
var extensionName = Path.GetFileName(subfolderPath.TrimEnd('/', '\\'));
var manifestPath = Path.Combine(subfolderPath, _manifestName);
ctx.Monitor(_webSiteFolder.WhenPathChanges(manifestPath));
try {
var descriptor = GetExtensionDescriptor(path, extensionName, manifestPath);
if ( descriptor != null )
localList.Add(descriptor);
}
catch ( Exception ex ) {
// Ignore invalid module manifests
Logger.Error(ex, "A module could not be loaded. It was ignored.");
}
}
return localList;
});
foreach (var subfolderPath in subfolderPaths) {
var extensionName = Path.GetFileName(subfolderPath.TrimEnd('/', '\\'));
var manifestPath = Path.Combine(subfolderPath, _manifestName);
var descriptor = GetExtensionDescriptor(locationPath, extensionName, manifestPath);
if (descriptor != null)
list.Add(descriptor);
}
list.AddRange(subList);
}
return list;
}