fix

immisterio · immisterio · commit 7adbfe7782ab · 2025-09-28T21:48:13.000+03:00
diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs
@@ -64,6 +64,10 @@ public ActionResult Jackett(string apikey, string query, string title, string ti
         {
             //Console.WriteLine(HttpContext.Request.Path + HttpContext.Request.QueryString.Value);
 
+            string cachekey = $"api:v2.0:indexers:{query}:{title}:{title_original}:{year}:{(category != null && category.Count > 0 ? string.Join(",", category.Select(i => $"{i.Key}={i.Value}")) : "null")}:{is_serial}";
+            if (memoryCache.TryGetValue(cachekey, out List<Result> _cacheResult))
+                return Json(new RootObject() { Results = _cacheResult });
+
             var fastdb = getFastdb();
             var torrents = new Dictionary<string, TorrentDetails>();
             bool rqnum = !HttpContext.Request.QueryString.Value.Contains("&is_serial=") && HttpContext.Request.Headers.UserAgent.ToString() == "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36";
@@ -646,6 +650,8 @@ List<ffStream> FFprobe(TorrentDetails t, out HashSet<string> langs)
                 });
             }
 
+            memoryCache.Set(cachekey, Results, DateTime.Now.AddMinutes(5));
+
             return Json(new RootObject() { Results = Results });
         }
         #endregion
@@ -930,7 +936,7 @@ public static Dictionary<string, List<string>> getFastdb(bool update = false)
             {
                 var fastdb = new Dictionary<string, List<string>>();
 
-                foreach (var item in FileDB.masterDb)
+                foreach (var item in FileDB.masterDb.ToArray())
                 {
                     foreach (string k in item.Key.Split(":"))
                     {
diff --git a/Controllers/CRON/AniLibriaController.cs b/Controllers/CRON/AniLibriaController.cs
@@ -81,8 +81,11 @@ async public Task<string> Parse(int limit)
                 }
             }
             catch { }
+            finally
+            {
+                workParse = false;
+            }
 
-            workParse = false;
             return "ok";
         }
     }
diff --git a/Controllers/CRON/AnimeLayerController.cs b/Controllers/CRON/AnimeLayerController.cs
@@ -114,8 +114,11 @@ async public Task<string> Parse(int maxpage = 1)
                 }
             }
             catch { }
+            finally
+            {
+                workParse = false;
+            }
 
-            workParse = false;
             return "ok";
         }
         #endregion
diff --git a/Controllers/CRON/BaibakoController.cs b/Controllers/CRON/BaibakoController.cs
@@ -113,8 +113,11 @@ async public Task<string> Parse(int maxpage)
                 }
             }
             catch { }
+            finally
+            {
+                workParse = false;
+            }
 
-            workParse = false;
             return "ok";
         }
         #endregion
diff --git a/Controllers/CRON/BitruController.cs b/Controllers/CRON/BitruController.cs
@@ -27,16 +27,30 @@ static BitruController()
 
 
         #region Parse
+        static bool _workParse = false;
+
         async public Task<string> Parse(int page = 1)
         {
+            if (_workParse)
+                return "work";
+
+            _workParse = true;
             string log = "";
 
-            // movie     - Фильмы    | Фильмы
-            // serial    - Сериалы   | Сериалы
-            foreach (string cat in new List<string>() { "movie", "serial" })
+            try
+            {
+                // movie     - Фильмы    | Фильмы
+                // serial    - Сериалы   | Сериалы
+                foreach (string cat in new List<string>() { "movie", "serial" })
+                {
+                    await parsePage(cat, page);
+                    log += $"{cat} - {page}\n";
+                }
+            }
+            catch { }
+            finally
             {
-                await parsePage(cat, page);
-                log += $"{cat} - {page}\n";
+                _workParse = false;
             }
 
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
diff --git a/Controllers/CRON/HDRezkaController.cs b/Controllers/CRON/HDRezkaController.cs
@@ -36,8 +36,11 @@ async public Task<string> Parse(int maxpage = 1)
                 }
             }
             catch { }
+            finally
+            {
+                workParse = false;
+            }
 
-            workParse = false;
             return "ok";
         }
         #endregion
diff --git a/Controllers/CRON/KinozalController.cs b/Controllers/CRON/KinozalController.cs
@@ -131,8 +131,11 @@ async public Task<string> Parse(int page)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
         }
         #endregion
diff --git a/Controllers/CRON/LostfilmController.cs b/Controllers/CRON/LostfilmController.cs
@@ -129,8 +129,11 @@ async public Task<string> Parse(int maxpage = 1)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return "ok";
         }
         #endregion
diff --git a/Controllers/CRON/MegapeerController.cs b/Controllers/CRON/MegapeerController.cs
@@ -53,8 +53,11 @@ async public Task<string> Parse(int page)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
         }
         #endregion
diff --git a/Controllers/CRON/NNMClubController.cs b/Controllers/CRON/NNMClubController.cs
@@ -56,8 +56,11 @@ async public Task<string> Parse(int page)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
         }
         #endregion
diff --git a/Controllers/CRON/RutorController.cs b/Controllers/CRON/RutorController.cs
@@ -56,8 +56,11 @@ async public Task<string> Parse(int page)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
         }
         #endregion
diff --git a/Controllers/CRON/RutrackerController.cs b/Controllers/CRON/RutrackerController.cs
@@ -111,8 +111,11 @@ async public Task<string> Parse(int page)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
         }
         #endregion
diff --git a/Controllers/CRON/SelezenController.cs b/Controllers/CRON/SelezenController.cs
@@ -99,9 +99,24 @@ async Task<bool> TakeLogin()
 
 
         #region Parse
+        static bool _workParse = false;
+
         async public Task<string> Parse(int page = 1)
         {
-            await parsePage(page);
+            if (_workParse)
+                return "work";
+
+            _workParse = true;
+
+            try
+            {
+                await parsePage(page);
+            }
+            catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
             return "ok";
         }
diff --git a/Controllers/CRON/TolokaController.cs b/Controllers/CRON/TolokaController.cs
@@ -117,8 +117,11 @@ async public Task<string> Parse(int page)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
         }
         #endregion
diff --git a/Controllers/CRON/TorrentByController.cs b/Controllers/CRON/TorrentByController.cs
@@ -55,8 +55,11 @@ async public Task<string> Parse(int page)
                 }
             }
             catch { }
+            finally
+            {
+                _workParse = false;
+            }
 
-            _workParse = false;
             return string.IsNullOrWhiteSpace(log) ? "ok" : log;
         }
         #endregion
diff --git a/Controllers/StatsController.cs b/Controllers/StatsController.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using JacRed.Engine;
-using Microsoft.AspNetCore.Mvc;
+﻿using Microsoft.AspNetCore.Mvc;
 
 namespace JacRed.Controllers
 {
diff --git a/Controllers/SyncController.cs b/Controllers/SyncController.cs
@@ -7,12 +7,15 @@
 using JacRed.Models.Details;
 using JacRed.Models.Sync.v2;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Memory;
 
 namespace JacRed.Controllers
 {
     public class SyncController : BaseController
     {
+        private static readonly object masterDbCacheLock = new object();
+        private static Dictionary<string, TorrentInfo> masterDbCache;
+        private static DateTime masterDbCacheUpdated = DateTime.MinValue;
+
         [Route("/sync/conf")]
         public JsonResult Configuration()
         {
@@ -37,7 +40,7 @@ public ActionResult FdbKey(string key)
                 i.Value.fileTime,
                 path = $"Data/fdb/{HashTo.md5(i.Key).Substring(0, 2)}/{HashTo.md5(i.Key).Substring(2)}",
                 value = FileDB.OpenRead(i.Key, cache: false)
-            }));
+            }).ToArray());
         }
 
         [Route("/sync/fdb/torrents")]
@@ -50,13 +53,20 @@ public ActionResult FdbTorrents(long time, long start = -1, bool spidr = false)
             int take = 2_000, countread = 0;
             var collections = new List<Collection>(take);
 
-            if (!memoryCache.TryGetValue("sync:masterDb", out Dictionary<string, TorrentInfo> masterDb))
+            // Use static cache updated every 10 minutes
+            if (masterDbCache == null || (DateTime.Now - masterDbCacheUpdated) > TimeSpan.FromMinutes(10))
             {
-                masterDb = FileDB.masterDb.OrderBy(i => i.Value.fileTime).ToDictionary(k => k.Key, v => v.Value);
-                memoryCache.Set("sync:masterDb", masterDb, DateTime.Now.AddMinutes(10));
+                lock (masterDbCacheLock)
+                {
+                    if (masterDbCache == null || (DateTime.Now - masterDbCacheUpdated) > TimeSpan.FromMinutes(10))
+                    {
+                        masterDbCache = FileDB.masterDb.OrderBy(i => i.Value.fileTime).ToDictionary(k => k.Key, v => v.Value);
+                        masterDbCacheUpdated = DateTime.Now;
+                    }
+                }
             }
-
-            foreach (var item in masterDb.Where(i => i.Value.fileTime > time))
+            
+            foreach (var item in masterDbCache.Where(i => i.Value.fileTime > time))
             {
                 var torrent = new Dictionary<string, TorrentDetails>();
 
@@ -128,13 +138,20 @@ public JsonResult Torrents(long time)
             int take = 2_000;
             var torrents = new List<Models.Sync.v1.Torrent>(take+1);
 
-            if (!memoryCache.TryGetValue("sync:masterDb", out Dictionary<string, TorrentInfo> masterDb))
+            // Use static cache updated every 10 minutes
+            if (masterDbCache == null || (DateTime.Now - masterDbCacheUpdated) > TimeSpan.FromMinutes(10))
             {
-                masterDb = FileDB.masterDb.OrderBy(i => i.Value.fileTime).ToDictionary(k => k.Key, v => v.Value);
-                memoryCache.Set("sync:masterDb", masterDb, DateTime.Now.AddMinutes(10));
+                lock (masterDbCacheLock)
+                {
+                    if (masterDbCache == null || (DateTime.Now - masterDbCacheUpdated) > TimeSpan.FromMinutes(10))
+                    {
+                        masterDbCache = FileDB.masterDb.OrderBy(i => i.Value.fileTime).ToDictionary(k => k.Key, v => v.Value);
+                        masterDbCacheUpdated = DateTime.Now;
+                    }
+                }
             }
-
-            foreach (var item in masterDb.Where(i => i.Value.fileTime > time))
+            
+            foreach (var item in masterDbCache.Where(i => i.Value.fileTime > time))
             {
                 foreach (var torrent in FileDB.OpenRead(item.Key, cache: false))
                 {
diff --git a/Engine/TrackersCron.cs b/Engine/TrackersCron.cs
@@ -66,7 +66,7 @@ async public static Task Run()
         }
 
 
-        async static ValueTask<bool> ckeck(string tracker)
+        async static Task<bool> ckeck(string tracker)
         {
             if (string.IsNullOrWhiteSpace(tracker) || tracker.Contains("["))
                 return false;
@@ -75,14 +75,16 @@ async static ValueTask<bool> ckeck(string tracker)
             {
                 try
                 {
-                    var handler = new System.Net.Http.HttpClientHandler();
-                    handler.ServerCertificateCustomValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
-
-                    using (var client = new System.Net.Http.HttpClient(handler))
+                    using (var handler = new System.Net.Http.HttpClientHandler())
                     {
-                        client.Timeout = TimeSpan.FromSeconds(7);
-                        await client.GetAsync(tracker, System.Net.Http.HttpCompletionOption.ResponseHeadersRead);
-                        return true;
+                        handler.ServerCertificateCustomValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
+
+                        using (var client = new System.Net.Http.HttpClient(handler))
+                        {
+                            client.Timeout = TimeSpan.FromSeconds(7);
+                            await client.GetAsync(tracker, System.Net.Http.HttpCompletionOption.ResponseHeadersRead);
+                            return true;
+                        }
                     }
                 }
                 catch { }
diff --git a/Engine/Tracks/TracksCron.cs b/Engine/Tracks/TracksCron.cs
@@ -116,8 +116,7 @@ async public static Task Run(int typetask)
                             if (TracksDB.Get(t.magnet) == null)
                             {
                                 t.ffprobe_tryingdata++;
-                                _ = TracksDB.Add(t.magnet);
-                                await Task.Delay(AppInit.conf.tracksdelay);
+                                await TracksDB.Add(t.magnet);
                             }
                         }
                         catch { }
diff --git a/Engine/Tracks/TracksDB.cs b/Engine/Tracks/TracksDB.cs
@@ -109,7 +109,7 @@ async public static Task Add(string magnet, string[] types = null)
             }
             catch { }
 
-            _ = HttpClient.Post($"{tsuri}/torrents", "{\"action\":\"rem\",\"hash\":\"" + infohash + "\"}");
+            await HttpClient.Post($"{tsuri}/torrents", "{\"action\":\"rem\",\"hash\":\"" + infohash + "\"}");
 
             if (res?.streams == null || res.streams.Count == 0)
                 return;

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ public ActionResult Jackett(string apikey, string query, string title, string ti`
`64`	`64`	`{`
`65`	`65`	`//Console.WriteLine(HttpContext.Request.Path + HttpContext.Request.QueryString.Value);`
`66`	`66`
	`67`	`+ string cachekey = $"api:v2.0:indexers:{query}:{title}:{title_original}:{year}:{(category != null && category.Count > 0 ? string.Join(",", category.Select(i => $"{i.Key}={i.Value}")) : "null")}:{is_serial}";`
	`68`	`+ if (memoryCache.TryGetValue(cachekey, out List<Result> _cacheResult))`
	`69`	`+ return Json(new RootObject() { Results = _cacheResult });`
	`70`	`+`
`67`	`71`	`var fastdb = getFastdb();`
`68`	`72`	`var torrents = new Dictionary<string, TorrentDetails>();`
`69`	`73`	`bool rqnum = !HttpContext.Request.QueryString.Value.Contains("&is_serial=") && HttpContext.Request.Headers.UserAgent.ToString() == "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36";`
`@@ -646,6 +650,8 @@ List<ffStream> FFprobe(TorrentDetails t, out HashSet<string> langs)`
`646`	`650`	`});`
`647`	`651`	`}`
`648`	`652`
	`653`	`+ memoryCache.Set(cachekey, Results, DateTime.Now.AddMinutes(5));`
	`654`	`+`
`649`	`655`	`return Json(new RootObject() { Results = Results });`
`650`	`656`	`}`
`651`	`657`	`#endregion`
`@@ -930,7 +936,7 @@ public static Dictionary<string, List<string>> getFastdb(bool update = false)`
`930`	`936`	`{`
`931`	`937`	`var fastdb = new Dictionary<string, List<string>>();`
`932`	`938`
`933`		`- foreach (var item in FileDB.masterDb)`
	`939`	`+ foreach (var item in FileDB.masterDb.ToArray())`
`934`	`940`	`{`
`935`	`941`	`foreach (string k in item.Key.Split(":"))`
`936`	`942`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,11 @@ async public Task<string> Parse(int limit)`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`catch { }`
	`84`	`+ finally`
	`85`	`+ {`
	`86`	`+ workParse = false;`
	`87`	`+ }`
`84`	`88`
`85`		`- workParse = false;`
`86`	`89`	`return "ok";`
`87`	`90`	`}`
`88`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,11 @@ async public Task<string> Parse(int maxpage = 1)`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`catch { }`
	`117`	`+ finally`
	`118`	`+ {`
	`119`	`+ workParse = false;`
	`120`	`+ }`
`117`	`121`
`118`		`- workParse = false;`
`119`	`122`	`return "ok";`
`120`	`123`	`}`
`121`	`124`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,11 @@ async public Task<string> Parse(int maxpage)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`catch { }`
	`116`	`+ finally`
	`117`	`+ {`
	`118`	`+ workParse = false;`
	`119`	`+ }`
`116`	`120`
`117`		`- workParse = false;`
`118`	`121`	`return "ok";`
`119`	`122`	`}`
`120`	`123`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,11 @@ async public Task<string> Parse(int maxpage = 1)`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`catch { }`
	`39`	`+ finally`
	`40`	`+ {`
	`41`	`+ workParse = false;`
	`42`	`+ }`
`39`	`43`
`40`		`- workParse = false;`
`41`	`44`	`return "ok";`
`42`	`45`	`}`
`43`	`46`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,11 @@ async public Task<string> Parse(int page)`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`catch { }`
	`134`	`+ finally`
	`135`	`+ {`
	`136`	`+ _workParse = false;`
	`137`	`+ }`
`134`	`138`
`135`		`- _workParse = false;`
`136`	`139`	`return string.IsNullOrWhiteSpace(log) ? "ok" : log;`
`137`	`140`	`}`
`138`	`141`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,11 @@ async public Task<string> Parse(int maxpage = 1)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`catch { }`
	`132`	`+ finally`
	`133`	`+ {`
	`134`	`+ _workParse = false;`
	`135`	`+ }`
`132`	`136`
`133`		`- _workParse = false;`
`134`	`137`	`return "ok";`
`135`	`138`	`}`
`136`	`139`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,11 @@ async public Task<string> Parse(int page)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`catch { }`
	`56`	`+ finally`
	`57`	`+ {`
	`58`	`+ _workParse = false;`
	`59`	`+ }`
`56`	`60`
`57`		`- _workParse = false;`
`58`	`61`	`return string.IsNullOrWhiteSpace(log) ? "ok" : log;`
`59`	`62`	`}`
`60`	`63`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,11 @@ async public Task<string> Parse(int page)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`catch { }`
	`59`	`+ finally`
	`60`	`+ {`
	`61`	`+ _workParse = false;`
	`62`	`+ }`
`59`	`63`
`60`		`- _workParse = false;`
`61`	`64`	`return string.IsNullOrWhiteSpace(log) ? "ok" : log;`
`62`	`65`	`}`
`63`	`66`	`#endregion`