lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#19646: Fixing media processing cache

Browse Source 
* Adding logging to prove issue #19646
* Removing suspect not operator
* Refactoring complex if statement
* Temporary try/catch's to find exception
* Refactor GetImagePathType out of GetImage
* Properly checking for an images last update time

Work Item: 19646

--HG--
branch : 1.x
extra : rebase_source : b5444740cf57e936499af129d9b4306e782596ba
This commit is contained in:
StanleyGoldman
2013-04-25 10:53:39 -04:00
parent 6bfa77bb76
commit a49ccf4d76
1 changed files with 94 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/Orchard.Web/Modules/Orchard.MediaProcessing/Shapes/MediaShapes.cs
View File

@@ -5,6 +5,7 @@ using System.IO;
using System.Linq;
using System.Net;
using System.Web;
using System.Web.Hosting;
using Orchard.ContentManagement;
using Orchard.DisplayManagement;
using Orchard.Environment;
@@ -19,7 +20,7 @@ using Orchard.Tokens;
using Orchard.Utility.Extensions;
namespace Orchard.MediaProcessing.Shapes {
public class MediaShapes : IDependency {
private readonly Work<IStorageProvider> _storageProvider;
private readonly Work<IImageProcessingFileNameProvider> _fileNameProvider;
@@ -75,7 +76,7 @@ namespace Orchard.MediaProcessing.Shapes {
[Shape]
public void MediaUrl(dynamic Shape, dynamic Display, TextWriter Output, string Profile, string Path, ContentItem ContentItem, FilterRecord CustomFilter) {
try {
Shape.IgnoreShapeTracer = true;
Shape.IgnoreShapeTracer = true;
var services = new Lazy<IOrchardServices>(() => _services.Value);
var storageProvider = new Lazy<IStorageProvider>(() => _storageProvider.Value);
@@ -84,22 +85,38 @@ namespace Orchard.MediaProcessing.Shapes {
bool process = false;
// if the filename is not cached, process it
if (!string.IsNullOrEmpty(filePath)) {
if (string.IsNullOrEmpty(filePath)) {
Logger.Debug("FilePath is null, processing required, profile {0} for image {1}", Profile, Path);
process = true;
}
// the processd file doesn't exist anymore, process it
else if (!storageProvider.Value.FileExists(filePath)) {
Logger.Debug("Processed file no longer exists, processing required, profile {0} for image {1}", Profile, Path);
process = true;
}
// if the original file is more recent, process it
else if (storageProvider.Value.GetFile(Path).GetLastUpdated() > storageProvider.Value.GetFile(filePath).GetLastUpdated()) {
process = true;
// if the original file is more recent, process it
else {
DateTime pathLastUpdated;
if (TryGetImageLastUpdated(Path, out pathLastUpdated)) {
var filePathLastUpdated = storageProvider.Value.GetFile(filePath).GetLastUpdated();
if (pathLastUpdated > filePathLastUpdated)
{
Logger.Debug("Original file more recent, processing required, profile {0} for image {1}", Profile, Path);
process = true;
}
}
}
// todo: regenerate the file if the profile is newer, by deleting the associated filename cache entries.
if (process) {
Logger.Debug("Processing profile {0} for image {1}", Profile, Path);
ImageProfilePart profilePart;
if (CustomFilter == null) {
@@ -113,7 +130,8 @@ namespace Orchard.MediaProcessing.Shapes {
}
using (var image = GetImage(Path)) {
var filterContext = new FilterContext {Media = image, Format = new FileInfo(Path).Extension, FilePath = storageProvider.Value.Combine(Profile, CreateDefaultFileName(Path))};
var filterContext = new FilterContext { Media = image, Format = new FileInfo(Path).Extension, FilePath = storageProvider.Value.Combine(Profile, CreateDefaultFileName(Path)) };
var tokens = new Dictionary<string, object>();
// if a content item is provided, use it while tokenizing
@@ -167,34 +185,84 @@ namespace Orchard.MediaProcessing.Shapes {
}
}
// TODO: Update this method once the storage provider has been updated
private Stream GetImage(string path) {
var storageProvider = new Lazy<IStorageProvider>(() => _storageProvider.Value);
var services = new Lazy<IOrchardServices>(() => _services.Value);
var request = services.Value.WorkContext.HttpContext.Request;
private enum ImagePathType
{
StorageProvider,
AbsoluteUrl,
AppRelative,
Invalid
}
private ImagePathType GetImagePathType(string path) {
// /OrchardLocal/images/my-image.jpg
if (Uri.IsWellFormedUriString(path, UriKind.Relative)) {
path = storageProvider.Value.GetLocalPath(path);
// images/my-image.jpg
var file = storageProvider.Value.GetFile(path);
return file.OpenRead();
return ImagePathType.StorageProvider;
}
// http://blob.storage-provider.net/my-image.jpg
if (Uri.IsWellFormedUriString(path, UriKind.Absolute)) {
var webClient = new WebClient();
return webClient.OpenRead(new Uri(path));
}
// ~/Media/Default/images/my-image.jpg
if (VirtualPathUtility.IsAppRelative(path)) {
var webClient = new WebClient();
return webClient.OpenRead(new Uri(request.Url, VirtualPathUtility.ToAbsolute(path)));
return ImagePathType.AbsoluteUrl;
}
throw new ArgumentException("invalid path");
// ~/Media/Default/images/my-image.jpg
if (VirtualPathUtility.IsAppRelative(path)) {
return ImagePathType.AppRelative;
}
return ImagePathType.Invalid;
}
// TODO: Update this method once the storage provider has been updated
private Stream GetImage(string path) {
var storageProvider = new Lazy<IStorageProvider>(() => _storageProvider.Value);
var services = new Lazy<IOrchardServices>(() => _services.Value);
var webClient = new Lazy<WebClient>(() => new WebClient());
var request = services.Value.WorkContext.HttpContext.Request;
switch (GetImagePathType(path)) {
case ImagePathType.StorageProvider:
path = storageProvider.Value.GetLocalPath(path);
// images/my-image.jpg
var file = storageProvider.Value.GetFile(path);
return file.OpenRead();
case ImagePathType.AbsoluteUrl:
return webClient.Value.OpenRead(new Uri(path));
case ImagePathType.AppRelative:
return webClient.Value.OpenRead(new Uri(request.Url, VirtualPathUtility.ToAbsolute(path)));
default:
throw new ArgumentException("invalid path");
}
}
private bool TryGetImageLastUpdated(string path, out DateTime lastUpdated) {
var imagePathType = GetImagePathType(path);
switch (imagePathType)
{
case ImagePathType.StorageProvider:
path = _storageProvider.Value.GetLocalPath(path);
var file = _storageProvider.Value.GetFile(path);
lastUpdated = file.GetLastUpdated();
return true;
case ImagePathType.AppRelative:
var serverPath = HostingEnvironment.MapPath(path);
lastUpdated = File.GetLastWriteTime(serverPath);
return true;
default:
Logger.Warning("Cannot get last updated time for {0}, {1}", imagePathType, path);
lastUpdated = DateTime.MinValue;
return false;
}
}
private static string CreateDefaultFileName(string path) {