Fixed #70

kipusoep · May 1, 2015 · 32145f9 · 32145f9
1 parent af237f2
commit 32145f9
Showing 1 changed file with 46 additions and 44 deletions.
diff --git a/Providers/EmbeddedResourcesVirtualPathProvider.cs b/Providers/EmbeddedResourcesVirtualPathProvider.cs
@@ -10,55 +10,57 @@
 
 namespace InfoCaster.Umbraco.UrlTracker.Providers
 {
-	public class EmbeddedResourcesVirtualPathProvider : VirtualPathProvider
-	{
-		public EmbeddedResourcesVirtualPathProvider()
-		{
-		}
+    public class EmbeddedResourcesVirtualPathProvider : VirtualPathProvider
+    {
+        public EmbeddedResourcesVirtualPathProvider()
+        {
+        }
 
-		private bool IsEmbeddedResourcePath(string virtualPath)
-		{
-			var checkPath = VirtualPathUtility.ToAppRelative(virtualPath);
-			return checkPath.StartsWith("~/Umbraco/UrlTracker/", StringComparison.InvariantCultureIgnoreCase);
-		}
+        private bool IsEmbeddedResourcePath(string virtualPath)
+        {
+            var checkPath = VirtualPathUtility.ToAppRelative(virtualPath);
+            return checkPath.StartsWith("~/Umbraco/UrlTracker/", StringComparison.InvariantCultureIgnoreCase);
+        }
 
-		public override bool FileExists(string virtualPath)
-		{
-			return IsEmbeddedResourcePath(virtualPath) || base.FileExists(virtualPath);
-		}
+        public override bool FileExists(string virtualPath)
+        {
+            return IsEmbeddedResourcePath(virtualPath) || base.FileExists(virtualPath);
+        }
 
-		public override VirtualFile GetFile(string virtualPath)
-		{
-			if (IsEmbeddedResourcePath(virtualPath))
-				return new EmbeddedResourceVirtualFile(virtualPath);
-			return base.GetFile(virtualPath);
-		}
+        public override VirtualFile GetFile(string virtualPath)
+        {
+            if (IsEmbeddedResourcePath(virtualPath))
+                return new EmbeddedResourceVirtualFile(virtualPath);
+            return base.GetFile(virtualPath);
+        }
 
-		public override CacheDependency GetCacheDependency(string virtualPath, IEnumerable virtualPathDependencies, DateTime utcStart)
-		{
-			if (IsEmbeddedResourcePath(virtualPath))
-				return null;
-			return base.GetCacheDependency(virtualPath, virtualPathDependencies, utcStart);
-		}
-	}
+        public override CacheDependency GetCacheDependency(string virtualPath, IEnumerable virtualPathDependencies, DateTime utcStart)
+        {
+            if (IsEmbeddedResourcePath(virtualPath))
+                return null;
+            return base.GetCacheDependency(virtualPath, virtualPathDependencies, utcStart);
+        }
+    }
 
-	public class EmbeddedResourceVirtualFile : VirtualFile
-	{
-		string _path;
+    public class EmbeddedResourceVirtualFile : VirtualFile
+    {
+        readonly string _path;
 
-		public EmbeddedResourceVirtualFile(string virtualPath)
-			: base(virtualPath)
-		{
-			_path = VirtualPathUtility.ToAppRelative(virtualPath);
-		}
+        public EmbeddedResourceVirtualFile(string virtualPath)
+            : base(virtualPath)
+        {
+            _path = VirtualPathUtility.ToAppRelative(virtualPath);
+        }
 
-		public override Stream Open()
-		{
-			var resourceName = _path.Split('/').Last();
-			var assembly = GetType().Assembly;
-			if (assembly != null)
-				return assembly.GetManifestResourceStream(resourceName);
-			return null;
-		}
-	}
+        public override Stream Open()
+        {
+            var resourceName = _path.Split('/').Last();
+            var assembly = GetType().Assembly;
+            resourceName = assembly.GetManifestResourceNames()
+                .SingleOrDefault(x => x.Equals(resourceName, StringComparison.OrdinalIgnoreCase));
+            if (string.IsNullOrEmpty(resourceName))
+                return null;
+            return assembly.GetManifestResourceStream(resourceName);
+        }
+    }
 }