cache embedded files (#35 and #42)

lformella · Apr 8, 2014 · 4de8e46 · 4de8e46
1 parent 5f1035d
commit 4de8e46
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/XG.Plugin.Webserver/Nancy/CustomBootstrapper.cs b/XG.Plugin.Webserver/Nancy/CustomBootstrapper.cs
@@ -27,6 +27,8 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using CacheAspect;
+using CacheAspect.Attributes;
 using Nancy;
 using Nancy.Conventions;
 using Nancy.Responses;
@@ -73,21 +75,24 @@ protected override void ConfigureConventions(NancyConventions nancyConventions)
 			nancyConventions.StaticContentsConventions.Add(StaticContentConventionBuilder.AddDirectory("Resources", "Resources"));
 			nancyConventions.StaticContentsConventions.Add(StaticContentConventionBuilder.AddDirectory("Scripts", "Scripts"));
 #else
-			nancyConventions.StaticContentsConventions.Add((ctx, rootPath) =>
+			nancyConventions.StaticContentsConventions.Add((ctx, rootPath) => GetResource (ctx.Request.Url.Path));
+#endif
+		}
+
+		[Cache.Cacheable]
+		private EmbeddedFileResponse GetResource(string aPath)
+		{
+			try
 			{
-				try
+				var directoryName = "XG.Plugin.Webserver" + Path.GetDirectoryName(aPath).Replace(Path.DirectorySeparatorChar, '.').Replace("-", "_");
+				var fileName = Path.GetFileName(aPath);
+				if (ResourceExists(directoryName + "." + fileName))
 				{
-					var directoryName = "XG.Plugin.Webserver" + Path.GetDirectoryName(ctx.Request.Url.Path).Replace(Path.DirectorySeparatorChar, '.').Replace("-", "_");
-					var fileName = Path.GetFileName(ctx.Request.Url.Path);
-					if (ResourceExists(directoryName + "." + fileName))
-					{
-						return new EmbeddedFileResponse(GetType().Assembly, directoryName, fileName);
-					}
+					return new EmbeddedFileResponse(GetType().Assembly, directoryName, fileName);
 				}
-				catch(Exception) {}
-				return null;
-			});
-#endif
+			}
+			catch(Exception) {}
+			return null;
 		}
 	}
 }

diff --git a/XG.Plugin.Webserver/XG.Plugin.Webserver.csproj b/XG.Plugin.Webserver/XG.Plugin.Webserver.csproj
@@ -79,6 +79,15 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.ApplicationServer.Caching.Client">
+      <HintPath>..\packages\Cache.1.2.1\Microsoft.ApplicationServer.Caching.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="CacheAspect">
+      <HintPath>..\packages\Cache.1.2.1\CacheAspect.dll</HintPath>
+    </Reference>
+    <Reference Include="PostSharp">
+      <HintPath>..\packages\Cache.1.2.1\PostSharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Nancy\ShutdownModule.cs" />

diff --git a/packages/Cache.1.2.1/BplusDotNet.dll b/packages/Cache.1.2.1/BplusDotNet.dll
diff --git a/packages/Cache.1.2.1/CacheAspect.dll b/packages/Cache.1.2.1/CacheAspect.dll
diff --git a/packages/Cache.1.2.1/CacheAspect.pdb b/packages/Cache.1.2.1/CacheAspect.pdb
diff --git a/packages/Cache.1.2.1/Microsoft.ApplicationServer.Caching.Client.dll b/packages/Cache.1.2.1/Microsoft.ApplicationServer.Caching.Client.dll
diff --git a/packages/Cache.1.2.1/PostSharp.Laos.dll b/packages/Cache.1.2.1/PostSharp.Laos.dll
diff --git a/packages/Cache.1.2.1/PostSharp.dll b/packages/Cache.1.2.1/PostSharp.dll