Enhancing DiskCache to handle 24,000 files

Former-commit-id: bb3d1ded41e10fff13d46fa9009a838c2bd958f0

src/ImageProcessor.Web/Caching/DiskCache.cs

@@ -84,22 +84,28 @@ namespace ImageProcessor.Web.Caching
 
             if (absoluteCachePath != null)
             {
-                DirectoryInfo di = new DirectoryInfo(absoluteCachePath);
-
-                if (!di.Exists)
-                {
-                    // Create the directory.
-                    Directory.CreateDirectory(absoluteCachePath);
-                }
-
                 string parsedExtension = ParseExtension(imagePath);
-                string fallbackExtension = imageName.Substring(imageName.LastIndexOf(".", StringComparison.Ordinal));
+                string fallbackExtension = imageName.Substring(imageName.LastIndexOf(".", StringComparison.Ordinal) + 1);
+                string subpath = !string.IsNullOrWhiteSpace(parsedExtension) ? parsedExtension : fallbackExtension;
 
                 string cachedFileName = string.Format(
-                    "{0}{1}",
+                    "{0}.{1}",
                     imagePath.ToMD5Fingerprint(),
                     !string.IsNullOrWhiteSpace(parsedExtension) ? parsedExtension : fallbackExtension);
-                cachedPath = Path.Combine(absoluteCachePath, cachedFileName);
+                cachedPath = Path.Combine(absoluteCachePath, subpath, cachedFileName);
+
+                string cachedDirectory = Path.GetDirectoryName(cachedPath);
+
+                if (cachedDirectory != null)
+                {
+                    DirectoryInfo directoryInfo = new DirectoryInfo(cachedDirectory);
+
+                    if (!directoryInfo.Exists)
+                    {
+                        // Create the directory.
+                        Directory.CreateDirectory(cachedDirectory);
+                    }
+                }
             }
 
             return cachedPath;
@@ -189,9 +195,17 @@ namespace ImageProcessor.Web.Caching
                 DirectoryInfo directoryInfo = new DirectoryInfo(folder);
 
                 if (directoryInfo.Exists)
+                {
+                    List<DirectoryInfo> directoryInfos = directoryInfo
+                        .EnumerateDirectories("*", SearchOption.AllDirectories)
+                        .ToList();
+
+                    Parallel.ForEach(
+                        directoryInfos,
+                        dir =>
                         {
                             // Get all the files in the cache ordered by LastAccessTime - oldest first.
-                    List<FileInfo> fileInfos = directoryInfo.EnumerateFiles("*", SearchOption.AllDirectories)
+                            List<FileInfo> fileInfos = dir.EnumerateFiles("*", SearchOption.AllDirectories)
                                 .OrderBy(x => x.LastAccessTime).ToList();
 
                             int counter = fileInfos.Count;
@@ -205,19 +219,20 @@ namespace ImageProcessor.Web.Caching
                                         try
                                         {
                                             // Delete the file if we are nearing our limit buffer.
-                                    if (counter >= MaxFilesCount || fileInfo.LastAccessTime < DateTime.Now.AddDays(-MaxFileCachedDuration))
+                                            if (counter >= MaxFilesCount && fileInfo.LastAccessTime.ToUniversalTime() < DateTime.UtcNow.AddHours(1)
+                                                || fileInfo.LastAccessTime.ToUniversalTime() < DateTime.UtcNow.AddDays(-MaxFileCachedDuration))
                                             {
                                                 fileInfo.Delete();
                                                 counter -= 1;
                                             }
                                         }
-                                catch
+                                        catch (IOException)
                                         {
-                                    // TODO: Sort out the try/catch.
+                                            // Do Nothing, skip to the next.
-                                    throw;
                                         }
                                     }
                                 });
+                        });
                 }
             }
         }
@@ -237,7 +252,7 @@ namespace ImageProcessor.Web.Caching
             {
                 if (match.Success)
                 {
-                    return "." + match.Value.Split('=')[1];
+                    return match.Value.Split('=')[1];
                 }
             }
 

src/ImageProcessor.Web/Config/ImageProcessorConfig.cs

@@ -76,7 +76,7 @@ namespace ImageProcessor.Web.Config
         /// <summary>
         /// Gets the list of available GraphicsProcessors.
         /// </summary>
-        public List<IGraphicsProcessor> GraphicsProcessors { get; private set; }
+        public IList<IGraphicsProcessor> GraphicsProcessors { get; private set; }
 
         #region Caching
         /// <summary>

src/ImageProcessor.Web/Helpers/FileCompareLastwritetime.cs

@@ -28,7 +28,7 @@ namespace ImageProcessor.Web.Helpers
         /// </returns>
         public static DateTime ToMinute(DateTime value)
         {
-            return new DateTime(value.Year, value.Month, value.Day, value.Hour, value.Minute, 0, value.Kind);
+            return new DateTime(value.Year, value.Month, value.Day, value.Hour, value.Minute, 0, value.Kind).ToUniversalTime();
         }
 
         /// <summary>
@@ -43,7 +43,7 @@ namespace ImageProcessor.Web.Helpers
         /// <returns>true if the specified objects are equal; otherwise, false.</returns>
         public bool Equals(System.IO.FileInfo f1, System.IO.FileInfo f2)
         {
-            return ToMinute(f1.LastWriteTime) == ToMinute(f2.LastWriteTime);
+            return ToMinute(f1.LastWriteTime.ToUniversalTime()) == ToMinute(f2.LastWriteTime.ToUniversalTime());
         }
 
         /// <summary>
@@ -53,7 +53,7 @@ namespace ImageProcessor.Web.Helpers
         /// <returns>A hash code for the specified <see cref="T:System.IO.FileInfo"/>.</returns>
         public int GetHashCode(System.IO.FileInfo fi)
         {
-            return ToMinute(fi.LastWriteTime).GetHashCode();
+            return ToMinute(fi.LastWriteTime.ToUniversalTime()).GetHashCode();
         }
     }
 }

src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs

@@ -78,13 +78,17 @@ namespace ImageProcessor.Web.HttpModules
 
             // Is this a remote file.
             bool isRemote = context.Request.Path.Equals(RemotePrefix, StringComparison.OrdinalIgnoreCase);
-            string path;
+            string path = string.Empty;
             string queryString = string.Empty;
 
             if (isRemote)
             {
                 // We need to split the querystring to get the actual values we want.
-                string[] paths = HttpUtility.UrlDecode(context.Request.QueryString.ToString()).Split('?');
+                string urlDecode = HttpUtility.UrlDecode(context.Request.QueryString.ToString());
+
+                if (urlDecode != null)
+                {
+                    string[] paths = urlDecode.Split('?');
 
                     path = paths[0];
 
@@ -93,6 +97,7 @@ namespace ImageProcessor.Web.HttpModules
                         queryString = paths[1];
                     }
                 }
+            }
             else
             {
                 path = HostingEnvironment.MapPath(context.Request.Path);
@@ -147,9 +152,18 @@ namespace ImageProcessor.Web.HttpModules
                                 }
                             }
                             else
+                            {
+                                try
                                 {
                                     imageFactory.Load(fullPath).AutoProcess().Save(cachedPath);
                                 }
+                                catch (Exception ex)
+                                {
+
+                                    throw ex;
+                                }
+
+                            }
                         }
 
                         // Add 1 to the counter

src/ImageProcessor.Web/ImageFactoryExtensions.cs

@@ -8,15 +8,10 @@
 namespace ImageProcessor.Web
 {
     #region Using
-
-    using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Reflection;
-
     using ImageProcessor.Processors;
     using ImageProcessor.Web.Config;
-    using ImageProcessor.Web.Helpers;
     #endregion
 
     /// <summary>

src/Test/Test/Web.config

@@ -72,7 +72,7 @@
         <add url="http://images.mymovies.net"/>
       </whiteList>
     </security>
-    <cache virtualPath="~/cache" maxDays="365" />
+    <cache virtualPath="~/cache" maxDays="28" />
     <processing>
       <plugins>
         <plugin name ="Resize">