Purge cache hashes on external deletion

KSP-CKAN · Sep 2, 2024 · 3111815 · 3111815
1 parent 9cda6a5
commit 3111815
Show file tree

Hide file tree

Showing 9 changed files with 509 additions and 273 deletions.
diff --git a/Core/Net/NetFileCache.cs b/Core/Net/NetFileCache.cs
@@ -134,8 +134,15 @@ public string GetInProgressFileName(Uri url, string description)
         /// </summary>
         private void OnCacheChanged(object source, FileSystemEventArgs e)
         {
-            log.Debug("File system watcher event fired");
+            log.DebugFormat("File system watcher event {0} fired for {1}",
+                            e.ChangeType.ToString(),
+                            e.FullPath);
             OnCacheChanged();
+            if (e.ChangeType == WatcherChangeTypes.Deleted)
+            {
+                log.DebugFormat("Purging hashes reactively: {0}", e.FullPath);
+                PurgeHashes(null, e.FullPath);
+            }
         }
 
         /// <summary>
@@ -231,10 +238,7 @@ public bool IsMaybeCachedZip(Uri url, DateTime? remoteTimestamp = null)
                     // Local file too old, delete it
                     log.Debug("Found stale file, deleting it");
                     File.Delete(file);
-                    File.Delete($"{file}.sha1");
-                    File.Delete($"{file}.sha256");
-                    sha1Cache.Remove(file);
-                    sha256Cache.Remove(file);
+                    PurgeHashes(null, file);
                 }
             }
             else
@@ -411,7 +415,7 @@ public string Store(Uri     url,
 
             TxFileManager tx_file = new TxFileManager();
 
-            // Make sure we clear our cache entry first.
+            // Clear our cache entry first
             Remove(url);
 
             string hash = CreateURLHash(url);
@@ -420,7 +424,7 @@ public string Store(Uri     url,
 
             Debug.Assert(
                 Regex.IsMatch(description, "^[A-Za-z0-9_.-]*$"),
-                "description isn't as filesystem safe as we thought... (#1266)");
+                $"description {description} isn't as filesystem safe as we thought... (#1266)");
 
             string fullName = string.Format("{0}-{1}", hash, Path.GetFileName(description));
             string targetPath = Path.Combine(cachePath, fullName);
@@ -467,13 +471,20 @@ public bool Remove(Uri url)
             return false;
         }
 
-        private void PurgeHashes(TxFileManager tx_file, string file)
+        private void PurgeHashes(TxFileManager? tx_file, string file)
         {
-            tx_file.Delete($"{file}.sha1");
-            tx_file.Delete($"{file}.sha256");
+            try
+            {
+                sha1Cache.Remove(file);
+                sha256Cache.Remove(file);
 
-            sha1Cache.Remove(file);
-            sha256Cache.Remove(file);
+                tx_file ??= new TxFileManager();
+                tx_file.Delete($"{file}.sha1");
+                tx_file.Delete($"{file}.sha256");
+            }
+            catch
+            {
+            }
         }
 
         /// <summary>

diff --git a/Netkan/Services/CachingHttpService.cs b/Netkan/Services/CachingHttpService.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
 using log4net;
+
 using CKAN.NetKAN.Model;
 
 namespace CKAN.NetKAN.Services

diff --git a/Tests/Core/Cache.cs b/Tests/Core/Cache.cs