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

Media gallery not working with Azure Blob Storage

Browse Source 
Fixes #6642
This commit is contained in:
Hannan Azam Khan
2016-04-13 03:17:00 +05:00
committed by Sébastien Ros
parent 06422f9e63
commit 4e5f6af28d
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/IMediaLibraryService.cs
View File

@@ -133,6 +133,14 @@ namespace Orchard.MediaLibrary.Services {
/// <param name="inputStream">The stream with the file's contents.</param>
/// <returns>The path to the uploaded file.</returns>
string UploadMediaFile(string folderPath, string fileName, Stream inputStream);
/// <summary>
/// Combines two paths.
/// </summary>
/// <param name="path1">The parent path.</param>
/// <param name="path2">The child path.</param>
/// <returns>The combined path.</returns>
string Combine(string path1, string path2);
}
public static class MediaLibrayServiceExtensions {
@@ -145,8 +153,8 @@ namespace Orchard.MediaLibrary.Services {
return true;
}
var mediaPath = folderPath + "\\";
var rootPath = rootMediaFolder.MediaPath + "\\";
var mediaPath = service.Combine(folderPath, " ").Trim();
var rootPath = service.Combine(rootMediaFolder.MediaPath, " ").Trim();
return mediaPath.StartsWith(rootPath, StringComparison.OrdinalIgnoreCase);
}
@@ -154,7 +162,7 @@ namespace Orchard.MediaLibrary.Services {
public static string GetRootedFolderPath(this IMediaLibraryService service, string folderPath) {
var rootMediaFolder = service.GetRootMediaFolder();
if (rootMediaFolder != null) {
return Path.Combine(rootMediaFolder.MediaPath, folderPath ?? "");
return service.Combine(rootMediaFolder.MediaPath, folderPath ?? "");
}
return folderPath;

10
src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
View File

@@ -441,5 +441,15 @@ namespace Orchard.MediaLibrary.Services {
return _storageProvider.GetPublicUrl(filePath);
}
/// <summary>
/// Combines two paths.
/// </summary>
/// <param name="path1">The parent path.</param>
/// <param name="path2">The child path.</param>
/// <returns>The combined path.</returns>
public string Combine(string path1, string path2) {
return _storageProvider.Combine(path1, path2);
}
}
}