fix cache

Author: immisterio

Controllers/SyncController.cs

@@ -36,7 +36,7 @@ public ActionResult FdbKey(string key)
                 i.Value.updateTime,
                 i.Value.fileTime,
                 path = $"Data/fdb/{HashTo.md5(i.Key).Substring(0, 2)}/{HashTo.md5(i.Key).Substring(2)}",
-                value = FileDB.OpenRead(i.Key)
+                value = FileDB.OpenRead(i.Key, cache: false)
             }));
         }
 
@@ -60,7 +60,7 @@ public ActionResult FdbTorrents(long time, long start = -1, bool spidr = false)
             {
                 var torrent = new Dictionary<string, TorrentDetails>();
 
-                foreach (var t in FileDB.OpenRead(item.Key))
+                foreach (var t in FileDB.OpenRead(item.Key, cache: false))
                 {
                     if (spidr || (start != -1 && start > t.Value.updateTime.ToFileTimeUtc()))
                     {
@@ -136,7 +136,7 @@ public JsonResult Torrents(long time)
 
             foreach (var item in masterDb.Where(i => i.Value.fileTime > time))
             {
-                foreach (var torrent in FileDB.OpenRead(item.Key))
+                foreach (var torrent in FileDB.OpenRead(item.Key, cache: false))
                 {
                     var _t = (TorrentDetails)torrent.Value.Clone();
 

Engine/FileDB/FileDB.cs

@@ -182,15 +182,10 @@ public void Dispose()
             if (openWriteTask.TryGetValue(fdbkey, out WriteTaskModel val))
             {
                 val.openconnection -= 1;
-                if (val.openconnection <= 0)
+                if (0 >= val.openconnection)
                 {
-                    if (!AppInit.conf.evercache.enable)
+                    if (!AppInit.conf.evercache.enable || (AppInit.conf.evercache.enable && AppInit.conf.evercache.validHour > 0))
                         openWriteTask.TryRemove(fdbkey, out _);
-                    else if (AppInit.conf.evercache.enable && AppInit.conf.evercache.validHour > 0)
-                    {
-                        if (DateTime.UtcNow > val.lastread.AddHours(AppInit.conf.evercache.validHour))
-                            openWriteTask.TryRemove(fdbkey, out _);
-                    }
                 }
             }
         }

Engine/FileDB/staticDB.cs

@@ -111,7 +111,7 @@ static void AddOrUpdateMasterDb(TorrentDetails torrent)
         #endregion
 
         #region OpenRead / OpenWrite
-        public static IReadOnlyDictionary<string, TorrentDetails> OpenRead(string key, bool update_lastread = false)
+        public static IReadOnlyDictionary<string, TorrentDetails> OpenRead(string key, bool update_lastread = false, bool cache = true)
         {
             if (openWriteTask.TryGetValue(key, out WriteTaskModel val))
             {
@@ -126,7 +126,7 @@ public static IReadOnlyDictionary<string, TorrentDetails> OpenRead(string key, b
 
             var fdb = new FileDB(key);
 
-            if (AppInit.conf.evercache.enable)
+            if (cache && AppInit.conf.evercache.enable)
             {
                 var wtm = new WriteTaskModel() { db = fdb, openconnection = 1 };
                 if (update_lastread)
@@ -141,7 +141,7 @@ public static IReadOnlyDictionary<string, TorrentDetails> OpenRead(string key, b
             return fdb.Database;
         }
 
-        public static FileDB OpenWrite(string key, bool cache = true)
+        public static FileDB OpenWrite(string key)
         {
             if (openWriteTask.TryGetValue(key, out WriteTaskModel val))
             {
@@ -151,22 +151,19 @@ public static FileDB OpenWrite(string key, bool cache = true)
             else
             {
                 var fdb = new FileDB(key);
-
-                if (cache)
-                    openWriteTask.TryAdd(key, new WriteTaskModel() { db = fdb, openconnection = 1 });
-
+                openWriteTask.TryAdd(key, new WriteTaskModel() { db = fdb, openconnection = 1 });
                 return fdb;
             }
         }
         #endregion
 
         #region AddOrUpdate
-        public static void AddOrUpdate(IReadOnlyCollection<TorrentBaseDetails> torrents, bool cache = true)
+        public static void AddOrUpdate(IReadOnlyCollection<TorrentBaseDetails> torrents)
         {
-            _ = AddOrUpdate(torrents, null, cache);
+            _ = AddOrUpdate(torrents, null);
         }
 
-        async public static ValueTask AddOrUpdate<T>(IReadOnlyCollection<T> torrents, Func<T, IReadOnlyDictionary<string, TorrentDetails>, Task<bool>> predicate, bool cache = true) where T : TorrentBaseDetails
+        async public static ValueTask AddOrUpdate<T>(IReadOnlyCollection<T> torrents, Func<T, IReadOnlyDictionary<string, TorrentDetails>, Task<bool>> predicate) where T : TorrentBaseDetails
         {
             var temp = new Dictionary<string, List<T>>();
 
@@ -181,7 +178,7 @@ async public static ValueTask AddOrUpdate<T>(IReadOnlyCollection<T> torrents, Fu
 
             foreach (var t in temp)
             {
-                using (var fdb = OpenWrite(t.Key, cache))
+                using (var fdb = OpenWrite(t.Key))
                 {
                     foreach (var torrent in t.Value)
                     {

Engine/StatsCron.cs

@@ -30,7 +30,7 @@ async public static Task Run()
 
                     foreach (var item in FileDB.masterDb.ToArray())
                     {
-                        foreach (var t in FileDB.OpenRead(item.Key).Values)
+                        foreach (var t in FileDB.OpenRead(item.Key, cache: false).Values)
                         {
                             if (string.IsNullOrEmpty(t.trackerName))
                                 continue;

Engine/Tracks/TracksCron.cs

@@ -34,7 +34,7 @@ async public static Task Run(int typetask)
 
                     foreach (var item in FileDB.masterDb.ToArray())
                     {
-                        foreach (var t in FileDB.OpenRead(item.Key).Values)
+                        foreach (var t in FileDB.OpenRead(item.Key, cache: false).Values)
                         {
                             if (string.IsNullOrEmpty(t.magnet))
                                 continue;