tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixing file dependencies and mime/type 

Former-commit-id: 1d2dadabad90334cd6425ac7f0256e3f00a897b2
pull/17/head
James South 12 years ago
parent
f6fb09cd6e
commit
e59b4b09be
2 changed files with 56 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      src/ImageProcessor.Web/Helpers/ImageHelpers.cs
  2. 51
      src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs

34
src/ImageProcessor.Web/Helpers/ImageHelpers.cs
View File

@ -10,6 +10,9 @@
namespace ImageProcessor.Web.Helpers
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using ImageProcessor.Configuration;
@ -23,17 +26,17 @@ namespace ImageProcessor.Web.Helpers
/// <summary>
/// The regex pattern.
/// </summary>
private static readonly string RegexPattern = BuildRegexPattern();
private static readonly string ExtensionRegexPattern = BuildExtensionRegexPattern();
/// <summary>
/// The image format regex.
/// </summary>
private static readonly Regex FormatRegex = new Regex(@"(\.?)(png8|" + RegexPattern + ")", RegexOptions.IgnoreCase | RegexOptions.RightToLeft);
private static readonly Regex FormatRegex = new Regex(@"(\.?)(png8|" + ExtensionRegexPattern + ")", RegexOptions.IgnoreCase | RegexOptions.RightToLeft);
/// <summary>
/// The image format regex for matching the file format at the end of a string.
/// </summary>
private static readonly Regex EndFormatRegex = new Regex(@"(\.)" + RegexPattern + "$", RegexOptions.IgnoreCase | RegexOptions.RightToLeft);
private static readonly Regex EndFormatRegex = new Regex(@"(\.)" + ExtensionRegexPattern + "$", RegexOptions.IgnoreCase | RegexOptions.RightToLeft);
/// <summary>
/// Checks a given string to check whether the value contains a valid image extension.
@ -72,13 +75,36 @@ namespace ImageProcessor.Web.Helpers
return string.Empty;
}
/// <summary>
/// Get the correct mime-type for the given string input.
/// </summary>
/// <param name="identifier">
/// The identifier.
/// </param>
/// <returns>
/// The <see cref="string"/> matching the correct mime-type.
/// </returns>
public static string GetMimeType(string identifier)
{
identifier = GetExtension(identifier).Replace(".", string.Empty);
List<ISupportedImageFormat> formats = ImageProcessorBootstrapper.Instance.SupportedImageFormats.ToList();
ISupportedImageFormat format = formats.FirstOrDefault(f => f.FileExtensions.Any(e => e.Equals(identifier, StringComparison.InvariantCultureIgnoreCase)));
if (format != null)
{
return format.MimeType;
}
return string.Empty;
}
/// <summary>
/// Builds a regular expression from the <see cref="T:ImageProcessor.Imaging.Formats.ISupportedImageFormat"/> type, this allows extensibility.
/// </summary>
/// <returns>
/// The <see cref="Regex"/> to match matrix filters.
/// </returns>
private static string BuildRegexPattern()
private static string BuildExtensionRegexPattern()
{
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.Append("(");

51
src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs
View File

@ -12,6 +12,7 @@ namespace ImageProcessor.Web.HttpModules
{
#region Using
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
@ -208,10 +209,10 @@ namespace ImageProcessor.Web.HttpModules
if (responseTypeObject != null && dependencyFileObject != null)
{
string responseType = (string)responseTypeObject;
string dependencyFile = (string)dependencyFileObject;
List<string> dependencyFiles = (List<string>)dependencyFileObject;
// Set the headers
this.SetHeaders(context, responseType, dependencyFile);
this.SetHeaders(context, responseType, dependencyFiles);
context.Items[CachedResponseTypeKey] = null;
context.Items[CachedResponseFileDependency] = null;
@ -352,11 +353,7 @@ namespace ImageProcessor.Web.HttpModules
{
if (isRemote)
{
#if NET45 && !__MonoCS__
using (await Locker.LockAsync(cachedPath))
#else
using (Locker.Lock(cachedPath))
#endif
{
Uri uri = new Uri(requestPath + "?" + urlParameters);
RemoteFile remoteFile = new RemoteFile(uri, false);
@ -382,14 +379,15 @@ namespace ImageProcessor.Web.HttpModules
.AutoProcess(queryString)
.Save(cachedPath);
// Store the response type in the context for later retrieval.
context.Items[CachedResponseTypeKey] = imageFactory.CurrentImageFormat.MimeType;
// Add to the cache.
cache.AddImageToCache(cachedPath);
// Trim the cache.
await cache.TrimCachedFolderAsync(cachedPath);
// Store the response type and cache dependency in the context for later retrieval.
context.Items[CachedResponseTypeKey] = imageFactory.CurrentImageFormat.MimeType;
context.Items[CachedResponseFileDependency] = new List<string> { cachedPath };
}
}
}
@ -398,11 +396,7 @@ namespace ImageProcessor.Web.HttpModules
}
else
{
#if NET45 && !__MonoCS__
using (await Locker.LockAsync(cachedPath))
#else
using (Locker.Lock(cachedPath))
#endif
{
// Check to see if the file exists.
// ReSharper disable once AssignNullToNotNullAttribute
@ -418,14 +412,15 @@ namespace ImageProcessor.Web.HttpModules
.AutoProcess(queryString)
.Save(cachedPath);
// Store the response type in the context for later retrieval.
context.Items[CachedResponseTypeKey] = imageFactory.CurrentImageFormat.MimeType;
// Add to the cache.
cache.AddImageToCache(cachedPath);
// Trim the cache.
await cache.TrimCachedFolderAsync(cachedPath);
// Store the response type and cache dependencies in the context for later retrieval.
context.Items[CachedResponseTypeKey] = imageFactory.CurrentImageFormat.MimeType;
context.Items[CachedResponseFileDependency] = new List<string> { requestPath, cachedPath };
}
}
}
@ -434,26 +429,32 @@ namespace ImageProcessor.Web.HttpModules
// Image is from the cache so the mime-type will need to be set.
if (context.Items[CachedResponseTypeKey] == null)
{
context.Items[CachedResponseTypeKey] = ImageHelpers.GetExtension(cachedPath).Replace(".", "image/");
}
string mimetype = ImageHelpers.GetMimeType(cachedPath);
context.Items[CachedResponseFileDependency] = cachedPath;
if (!string.IsNullOrEmpty(mimetype))
{
context.Items[CachedResponseTypeKey] = mimetype;
}
}
string incomingEtag = context.Request.Headers["If" + "-None-Match"];
if (incomingEtag != null && !isNewOrUpdated)
{
// Explicitly set the Content-Length header so the client doesn't wait for
// content but keeps the connection open for other requests
// Set the Content-Length header so the client doesn't wait for
// content but keeps the connection open for other requests.
context.Response.AddHeader("Content-Length", "0");
context.Response.StatusCode = (int)HttpStatusCode.NotModified;
context.Response.SuppressContent = true;
this.SetHeaders(context, (string)context.Items[CachedResponseTypeKey], cachedPath);
if (!isRemote)
{
// Set the headers and quit.
this.SetHeaders(context, (string)context.Items[CachedResponseTypeKey], new List<string> { requestPath, cachedPath });
return;
}
this.SetHeaders(context, (string)context.Items[CachedResponseTypeKey], new List<string> { cachedPath });
}
// The cached file is valid so just rewrite the path.
@ -483,10 +484,10 @@ namespace ImageProcessor.Web.HttpModules
/// <param name="responseType">
/// The HTTP MIME type to to send.
/// </param>
/// <param name="dependencyPath">
/// <param name="dependencyPaths">
/// The dependency path for the cache dependency.
/// </param>
private void SetHeaders(HttpContext context, string responseType, string dependencyPath)
private void SetHeaders(HttpContext context, string responseType, IEnumerable<string> dependencyPaths)
{
HttpResponse response = context.Response;
@ -501,7 +502,7 @@ namespace ImageProcessor.Web.HttpModules
cache.SetCacheability(HttpCacheability.Public);
cache.VaryByHeaders["Accept-Encoding"] = true;
context.Response.AddFileDependency(dependencyPath);
context.Response.AddFileDependencies(dependencyPaths.ToArray());
cache.SetLastModifiedFromFileDependencies();
int maxDays = DiskCache.MaxFileCachedDuration;

Write Preview
Loading…
Cancel
Save