Http Cache incorrect response after edit file multiple times #175

Author: chronoxor

examples/HttpServer/Program.cs

@@ -171,7 +171,7 @@ static void Main(string[] args)
 
             // Create a new HTTP server
             var server = new HttpCacheServer(IPAddress.Any, port);
-            server.AddStaticContent(www, "/api");
+            server.AddStaticContent(www, "/");
 
             // Start the server
             Console.Write("Server starting...");

source/NetCoreServer/FileCache.cs

@@ -242,8 +242,8 @@ private static bool IsDirectory(string path)
 
             private static void OnCreated(object sender, FileSystemEventArgs e, FileCache cache, FileCacheEntry entry)
             {
-                var key = e.FullPath.Replace(entry._path, entry._prefix);
-                var file = e.FullPath;
+                var key = e.FullPath.Replace('\\', '/').Replace(entry._path + "/", entry._prefix);
+                var file = e.FullPath.Replace('\\', '/');
 
                 // Skip missing files
                 if (!File.Exists(file))
@@ -260,8 +260,8 @@ private static void OnChanged(object sender, FileSystemEventArgs e, FileCache ca
                 if (e.ChangeType != WatcherChangeTypes.Changed)
                     return;
 
-                var key = e.FullPath.Replace(entry._path, entry._prefix);
-                var file = e.FullPath;
+                var key = e.FullPath.Replace('\\', '/').Replace(entry._path + "/", entry._prefix);
+                var file = e.FullPath.Replace('\\', '/');
 
                 // Skip missing files
                 if (!File.Exists(file))
@@ -275,18 +275,18 @@ private static void OnChanged(object sender, FileSystemEventArgs e, FileCache ca
 
             private static void OnDeleted(object sender, FileSystemEventArgs e, FileCache cache, FileCacheEntry entry)
             {
-                var key = e.FullPath.Replace(entry._path, entry._prefix);
-                var file = e.FullPath;
+                var key = e.FullPath.Replace('\\', '/').Replace(entry._path + "/", entry._prefix);
+                var file = e.FullPath.Replace('\\', '/');
 
                 cache.RemoveFileInternal(entry._path, key);
             }
 
             private static void OnRenamed(object sender, RenamedEventArgs e, FileCache cache, FileCacheEntry entry)
             {
-                var oldKey = e.OldFullPath.Replace(entry._path, entry._prefix);
-                var oldFile = e.OldFullPath;
-                var newKey = e.FullPath.Replace(entry._path, entry._prefix);
-                var newFile = e.FullPath;
+                var oldKey = e.OldFullPath.Replace('\\', '/').Replace(entry._path + "/", entry._prefix);
+                var oldFile = e.OldFullPath.Replace('\\', '/');
+                var newKey = e.FullPath.Replace('\\', '/').Replace(entry._path + "/", entry._prefix);
+                var newFile = e.FullPath.Replace('\\', '/');
 
                 // Skip missing files
                 if (!File.Exists(newFile))
@@ -304,9 +304,6 @@ private bool InsertFileInternal(string path, string file, string key, TimeSpan t
         {
             try
             {
-                key = key.Replace('\\', '/');
-                file = file.Replace('\\', '/');
-
                 // Load the cache file content
                 var content = File.ReadAllBytes(file);
                 if (!handler(this, key, content, timeout))
@@ -327,8 +324,6 @@ private bool RemoveFileInternal(string path, string key)
         {
             try
             {
-                key = key.Replace('\\', '/');
-
                 using (new WriteLock(_lockEx))
                 {
                     // Update entries by path map

source/NetCoreServer/NetCoreServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>6.1.0.0</Version>
+    <Version>6.2.0.0</Version>
     <Authors>Ivan Shynkarenka</Authors>
     <Copyright>Copyright (c) 2019-2022 Ivan Shynkarenka</Copyright>
     <RepositoryUrl>https://github.com/chronoxor/NetCoreServer</RepositoryUrl>