lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Create ToAppRelative wrapper in IVirtualPathProvider

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay 2010-07-18 15:09:10 -07:00
parent 27c945d498
commit 9198be72ed
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Tests/Stubs/StubVirtualPathProvider.cs
View File

@ -29,6 +29,10 @@ namespace Orchard.Tests.Stubs {
return Path.Combine(paths).Replace(Path.DirectorySeparatorChar, '/');
}
public string ToAppRelative(string virtualPath) {
return "~/" + ToFileSystemPath(virtualPath);
}
public string MapPath(string virtualPath) {
throw new NotImplementedException("Mapping to a physical file is not supported in Unit Test with this stub.");
}

5
src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs
View File

@ -48,10 +48,9 @@ namespace Orchard.Environment.Extensions.Loaders {
}
public override IEnumerable<string> GetFileDependencies(DependencyDescriptor dependency, string virtualPath){
var path1 = virtualPath.StartsWith("~") ? virtualPath : "~" + virtualPath;
var path2 = dependency.VirtualPath.StartsWith("~") ? dependency.VirtualPath : "~" + dependency.VirtualPath;
virtualPath = _virtualPathProvider.ToAppRelative(virtualPath);
if (StringComparer.OrdinalIgnoreCase.Equals(path1, path2)) {
if (StringComparer.OrdinalIgnoreCase.Equals(virtualPath, dependency.VirtualPath)) {
return GetSourceFiles(virtualPath);
}
return base.GetFileDependencies(dependency, virtualPath);

8
src/Orchard/FileSystems/VirtualPath/DefaultVirtualPathProvider.cs
View File

@ -17,7 +17,7 @@ namespace Orchard.FileSystems.VirtualPath {
.GetDirectory(path)
.Files
.OfType<VirtualFile>()
.Select(f => VirtualPathUtility.ToAppRelative(f.VirtualPath));
.Select(f => ToAppRelative(f.VirtualPath));
}
public IEnumerable<string> ListDirectories(string path) {
@ -26,13 +26,17 @@ namespace Orchard.FileSystems.VirtualPath {
.GetDirectory(path)
.Directories
.OfType<VirtualDirectory>()
.Select(d => VirtualPathUtility.ToAppRelative(d.VirtualPath));
.Select(d => ToAppRelative(d.VirtualPath));
}
public string Combine(params string[] paths) {
return Path.Combine(paths).Replace(Path.DirectorySeparatorChar, '/');
}
public string ToAppRelative(string virtualPath) {
return VirtualPathUtility.ToAppRelative(virtualPath);
}
public Stream OpenFile(string virtualPath) {
return HostingEnvironment.VirtualPathProvider.GetFile(virtualPath).Open();
}

1
src/Orchard/FileSystems/VirtualPath/IVirtualPathProvider.cs
View File

@ -6,6 +6,7 @@ using Orchard.Caching;
namespace Orchard.FileSystems.VirtualPath {
public interface IVirtualPathProvider : IVolatileProvider {
string Combine(params string[] paths);
string ToAppRelative(string virtualPath);
string MapPath(string virtualPath);
bool FileExists(string virtualPath);