v 2.1.0.4

Myster · Mar 24, 2013 · da1ff17 · da1ff17
1 parent f554a67
commit da1ff17
Show file tree

Hide file tree

Showing 13 changed files with 131 additions and 111 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ e.g.
 
 Using the HttpModule requires no code writing at all. Just reference the binaries and add the relevant sections to the web.config
 
-Image requests suffixed with querystring parameters will then be processed and **cached to the server - up to 360,000 images** allowing for easy and efficient parsing of following requests.
+Image requests suffixed with querystring parameters will then be processed and **cached to the server - up to 12,960,000 images** allowing for easy and efficient parsing of following requests.
 
 The parsing engine for the HttpModule is incredibly flexible and will **allow you to add querystring parameters in any order.**
 

diff --git a/src/ImageProcessor.Web/Config/ImageProcessorConfig.cs b/src/ImageProcessor.Web/Config/ImageProcessorConfig.cs
@@ -10,7 +10,11 @@ namespace ImageProcessor.Web.Config
     #region Using
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using System.Linq;
+    using System.Reflection;
+    using System.Text;
+
     using ImageProcessor.Processors;
     #endregion
 
@@ -234,20 +238,49 @@ private void LoadGraphicsProcessors()
         {
             if (this.GraphicsProcessors == null)
             {
-                // Build a list of native IGraphicsProcessor instances.
-                Type type = typeof(IGraphicsProcessor);
-                IEnumerable<Type> types =
-                    AppDomain.CurrentDomain.GetAssemblies().SelectMany(s => s.GetTypes()).Where(
-                        p => type.IsAssignableFrom(p) && p.IsClass && !p.IsAbstract).ToList();
+                try
+                {
+                    // Build a list of native IGraphicsProcessor instances.
+                    Type type = typeof(IGraphicsProcessor);
+                    IEnumerable<Type> types =
+                        AppDomain.CurrentDomain.GetAssemblies()
+                                 .SelectMany(s => s.GetTypes())
+                                 .Where(p => type.IsAssignableFrom(p) && p.IsClass && !p.IsAbstract)
+                                 .ToList();
 
-                // Create them and add.
-                this.GraphicsProcessors =
-                    types.Select(x => (Activator.CreateInstance(x) as IGraphicsProcessor)).ToList();
+                    // Create them and add.
+                    this.GraphicsProcessors =
+                        types.Select(x => (Activator.CreateInstance(x) as IGraphicsProcessor)).ToList();
 
-                // Add the available settings.
-                foreach (IGraphicsProcessor processor in this.GraphicsProcessors)
+                    // Add the available settings.
+                    foreach (IGraphicsProcessor processor in this.GraphicsProcessors)
+                    {
+                        processor.Settings = this.GetPluginSettings(processor.Name);
+                    }
+                }
+                catch (ReflectionTypeLoadException ex)
                 {
-                    processor.Settings = this.GetPluginSettings(processor.Name);
+                    StringBuilder sb = new StringBuilder();
+                    foreach (Exception exception in ex.LoaderExceptions)
+                    {
+                        sb.AppendLine(exception.Message);
+                        if (exception is FileNotFoundException)
+                        {
+                            FileNotFoundException fileNotFoundException = exception as FileNotFoundException;
+                            if (!string.IsNullOrEmpty(fileNotFoundException.FusionLog))
+                            {
+                                sb.AppendLine("Fusion Log:");
+                                sb.AppendLine(fileNotFoundException.FusionLog);
+                            }
+                        }
+
+                        sb.AppendLine();
+                    }
+
+                    string errorMessage = sb.ToString();
+
+                    // Display or log the error based on your application.
+                    throw new Exception(errorMessage);
                 }
             }
         }

diff --git a/src/ImageProcessor.Web/ImageProcessor.Web.csproj b/src/ImageProcessor.Web/ImageProcessor.Web.csproj
@@ -74,36 +74,23 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.14.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime">
-      <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Runtime.dll</HintPath>
+      <HintPath>bin\x86\Release\System.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks, Version=2.5.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Threading.Tasks.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="System.Threading.Tasks">
+      <HintPath>bin\x86\Release\System.Threading.Tasks.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Caching\CachedImage.cs" />

diff --git a/src/ImageProcessor.Web/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.0.4")]
+[assembly: AssemblyFileVersion("2.1.0.4")]
diff --git a/src/ImageProcessor.Web/app.config b/src/ImageProcessor.Web/app.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
-    <assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
+    <assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl">
       <dependentAssembly bcl:name="System.Runtime">
         <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />

diff --git a/src/Nuget/ImageProcessor.1.4.1.0.nupkg b/src/Nuget/ImageProcessor.1.4.1.0.nupkg
diff --git a/src/Nuget/ImageProcessor.Web.2.1.0.0.nupkg b/src/Nuget/ImageProcessor.Web.2.1.0.0.nupkg
diff --git a/src/Nuget/ImageProcessor.Web.2.1.0.1.nupkg b/src/Nuget/ImageProcessor.Web.2.1.0.1.nupkg
diff --git a/src/Nuget/ImageProcessor.Web.2.1.0.2.nupkg b/src/Nuget/ImageProcessor.Web.2.1.0.2.nupkg
diff --git a/src/Nuget/ImageProcessor.Web.2.1.0.3.nupkg b/src/Nuget/ImageProcessor.Web.2.1.0.3.nupkg
diff --git a/src/Nuget/ImageProcessor.Web.2.1.0.4.nupkg b/src/Nuget/ImageProcessor.Web.2.1.0.4.nupkg
diff --git a/src/Test/Test/Images/Thumbs.db b/src/Test/Test/Images/Thumbs.db
diff --git a/src/Test/Test/Web.config b/src/Test/Test/Web.config
@@ -4,84 +4,84 @@
   http://go.microsoft.com/fwlink/?LinkId=152368
   -->
 <configuration>
-  <!-- Configuration section-handler declaration area. -->
-  <configSections>
-    <sectionGroup name="imageProcessor">
-      <section name="security" requirePermission="false" type="ImageProcessor.Web.Config.ImageSecuritySection, ImageProcessor.Web" />
-      <section name="processing" requirePermission="false" type="ImageProcessor.Web.Config.ImageProcessingSection, ImageProcessor.Web" />
-      <section name="cache" requirePermission="false" type="ImageProcessor.Web.Config.ImageCacheSection, ImageProcessor.Web" />
-    </sectionGroup>
-  </configSections>
-  <appSettings>
-    <add key="webpages:Version" value="1.0.0.0" />
-    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-  </appSettings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-    <authentication mode="Forms">
-      <forms loginUrl="~/Account/LogOn" timeout="2880" />
-    </authentication>
-    <pages>
-      <namespaces>
-        <add namespace="System.Web.Helpers" />
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.WebPages" />
-      </namespaces>
-    </pages>
-    <httpModules>
-      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
-    </httpModules>
-    <!--Set the trust level.-->
-    <!--<trust level="Medium"/>-->
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" />
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <imageProcessor>
-    <security allowRemoteDownloads="true" timeout="300000" maxBytes="524288" remotePrefix="/remote.axd">
-      <whiteList>
-        <add url="http://images.mymovies.net" />
-      </whiteList>
-    </security>
-    <cache virtualPath="~/cache" maxDays="56" />
-    <processing>
-      <plugins>
-        <plugin name="Resize">
-          <settings>
-            <setting key="MaxWidth" value="1024" />
-            <setting key="MaxHeight" value="768" />
-          </settings>
-        </plugin>
-      </plugins>
-    </processing>
-  </imageProcessor>
+    <!-- Configuration section-handler declaration area. -->
+    <configSections>
+        <sectionGroup name="imageProcessor">
+            <section name="security" requirePermission="false" type="ImageProcessor.Web.Config.ImageSecuritySection, ImageProcessor.Web" />
+            <section name="processing" requirePermission="false" type="ImageProcessor.Web.Config.ImageProcessingSection, ImageProcessor.Web" />
+            <section name="cache" requirePermission="false" type="ImageProcessor.Web.Config.ImageCacheSection, ImageProcessor.Web" />
+        </sectionGroup>
+    </configSections>
+    <appSettings>
+        <add key="webpages:Version" value="1.0.0.0" />
+        <add key="ClientValidationEnabled" value="true" />
+        <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+    </appSettings>
+    <system.web>
+        <compilation debug="true" targetFramework="4.0">
+            <assemblies>
+                <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            </assemblies>
+        </compilation>
+        <authentication mode="Forms">
+            <forms loginUrl="~/Account/LogOn" timeout="2880" />
+        </authentication>
+        <pages>
+            <namespaces>
+                <add namespace="System.Web.Helpers" />
+                <add namespace="System.Web.Mvc" />
+                <add namespace="System.Web.Mvc.Ajax" />
+                <add namespace="System.Web.Mvc.Html" />
+                <add namespace="System.Web.Routing" />
+                <add namespace="System.Web.WebPages" />
+            </namespaces>
+        </pages>
+        <httpModules>
+            <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
+        </httpModules>
+        <!--Set the trust level.-->
+        <!--<trust level="Medium"/>-->
+    </system.web>
+    <system.webServer>
+        <validation validateIntegratedModeConfiguration="false" />
+        <modules runAllManagedModulesForAllRequests="true" />
+    </system.webServer>
+    <runtime>
+        <assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+    <imageProcessor>
+        <security allowRemoteDownloads="true" timeout="300000" maxBytes="524288" remotePrefix="/remote.axd">
+            <whiteList>
+                <add url="http://images.mymovies.net" />
+            </whiteList>
+        </security>
+        <cache virtualPath="~/cache" maxDays="56" />
+        <processing>
+            <plugins>
+                <plugin name="Resize">
+                    <settings>
+                        <setting key="MaxWidth" value="1024" />
+                        <setting key="MaxHeight" value="768" />
+                    </settings>
+                </plugin>
+            </plugins>
+        </processing>
+    </imageProcessor>
 </configuration>