fix

immisterio · immisterio · commit 530d5ad15686 · 2024-01-22T14:04:04.000+02:00
diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs
@@ -37,29 +37,43 @@ public JsonResult JacRedConf(string apikey)
         [Route("/api/v2.0/indexers/{status}/results")]
         public ActionResult Jackett(string apikey, string query, string title, string title_original, int year, Dictionary<string, string> category, int is_serial = -1)
         {
-            bool rqnum = false;
             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";
 
             #region Запрос с NUM
-            var mNum = Regex.Match(query ?? string.Empty, "^([^a-z-A-Z]+) ([^а-я-А-Я]+) ([0-9]{4})$");
-
-            if (string.IsNullOrWhiteSpace(title) && string.IsNullOrWhiteSpace(title_original) &&
-                mNum.Success)
+            if (rqnum && query != null)
             {
-                if (Regex.IsMatch(mNum.Groups[2].Value, "[a-zA-Z0-9]{2}"))
+                var mNum = Regex.Match(query, "^([^a-z-A-Z]+) ([^а-я-А-Я]+) ([0-9]{4})$");
+
+                if (mNum.Success)
                 {
-                    rqnum = true;
-                    var g = mNum.Groups;
+                    if (Regex.IsMatch(mNum.Groups[2].Value, "[a-zA-Z0-9]{2}"))
+                    {
+                        var g = mNum.Groups;
+                        title = g[1].Value;
+                        title_original = g[2].Value;
+                        year = int.Parse(g[3].Value);
+                    }
+                }
+                else
+                {
+                    if (Regex.IsMatch(query, "^([^a-z-A-Z]+) ((19|20)[0-9]{2})$"))
+                        return Json(new RootObject() { Results = new List<Result>() });
 
-                    title = g[1].Value;
-                    title_original = g[2].Value;
-                    year = int.Parse(g[3].Value);
+                    mNum = Regex.Match(query, "^([^a-z-A-Z]+) ([^а-я-А-Я]+)$");
+
+                    if (mNum.Success)
+                    {
+                        if (Regex.IsMatch(mNum.Groups[2].Value, "[a-zA-Z0-9]{2}"))
+                        {
+                            var g = mNum.Groups;
+                            title = g[1].Value;
+                            title_original = g[2].Value;
+                        }
+                    }
                 }
             }
-
-            if (!rqnum)
-                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";
             #endregion
 
             #region category
@@ -261,14 +275,14 @@ void updateKeys(string k)
                 string _s = StringConvert.SearchName(query);
 
                 #region torrentsSearch
-                void torrentsSearch(bool exact)
+                void torrentsSearch(bool exact, bool exactdb)
                 {
                     if (_s == null)
                         return;
 
                     HashSet<string> keys = null;
 
-                    if (exact)
+                    if (exactdb)
                     {
                         if (fastdb.TryGetValue(_s, out List<string> _keys) && _keys.Count > 0)
                         {
@@ -294,8 +308,7 @@ void torrentsSearch(bool exact)
                                     break;
                             }
 
-                            if (keys.Count > 0)
-                                memoryCache.Set(mkey, keys, DateTime.Now.AddHours(1));
+                            memoryCache.Set(mkey, keys, DateTime.Now.AddHours(1));
                         }
                     }
 
@@ -351,12 +364,16 @@ void torrentsSearch(bool exact)
                 #endregion
 
                 if (is_serial == -1)
-                    torrentsSearch(exact: false);
+                {
+                    torrentsSearch(exact: false, exactdb: true);
+                    if (torrents.Count == 0)
+                        torrentsSearch(exact: false, exactdb: false);
+                }
                 else
                 {
-                    torrentsSearch(exact: true);
+                    torrentsSearch(exact: true, exactdb: true);
                     if (torrents.Count == 0)
-                        torrentsSearch(exact: false);
+                        torrentsSearch(exact: false, exactdb: false);
                 }
                 #endregion
             }
@@ -772,11 +789,13 @@ void AddTorrents(TorrentDetails t)
 
 
         #region getFastdb
-        Dictionary<string, List<string>> getFastdb()
+        static Dictionary<string, List<string>> _fastdb = null;
+
+        public static Dictionary<string, List<string>> getFastdb(bool update = false)
         {
-            if (!memoryCache.TryGetValue("api:fastdb", out Dictionary<string, List<string>> fastdb))
+            if (_fastdb == null || update)
             {
-                fastdb = new Dictionary<string, List<string>>();
+                var fastdb = new Dictionary<string, List<string>>();
 
                 foreach (var item in FileDB.masterDb)
                 {
@@ -787,9 +806,6 @@ Dictionary<string, List<string>> getFastdb()
 
                         if (fastdb.TryGetValue(k, out List<string> keys))
                         {
-                            if (keys == null)
-                                keys = new List<string>();
-
                             keys.Add(item.Key);
                         }
                         else
@@ -799,10 +815,10 @@ Dictionary<string, List<string>> getFastdb()
                     }
                 }
 
-                memoryCache.Set("api:fastdb", fastdb, DateTime.Now.AddMinutes(10));
+                _fastdb = fastdb;
             }
 
-            return fastdb;
+            return _fastdb;
         }
         #endregion
     }
diff --git a/Engine/FileDB/staticDB.cs b/Engine/FileDB/staticDB.cs
@@ -248,7 +248,10 @@ async public static Task CronFast()
                 {
                     if (openWriteTask.Count > AppInit.conf.evercache.maxOpenWriteTask)
                     {
-                        foreach (var i in openWriteTask.OrderBy(i => i.Value.countread).Take(AppInit.conf.evercache.dropCacheTake))
+                        var query = openWriteTask.Where(i => DateTime.Now > i.Value.create.AddMinutes(10));
+                        query = query.OrderBy(i => i.Value.countread).ThenBy(i => i.Value.lastread);
+
+                        foreach (var i in query.Take(AppInit.conf.evercache.dropCacheTake))
                             openWriteTask.TryRemove(i.Key, out _);
                     }
                 }
diff --git a/Models/WriteTaskModel.cs b/Models/WriteTaskModel.cs
@@ -9,6 +9,8 @@ public class WriteTaskModel
 
         public DateTime lastread { get; set; }
 
+        public DateTime create { get; set; } = DateTime.Now;
+
         public int countread { get; set; }
 
         public int openconnection { get; set; }
diff --git a/Program.cs b/Program.cs
@@ -5,13 +5,22 @@
 using System.Text;
 using System.Threading;
 using JacRed.Engine;
+using System.Threading.Tasks;
+using System;
+using JacRed.Controllers;
 
 namespace JacRed
 {
     public class Program
     {
         public static void Main(string[] args)
         {
+            ThreadPool.QueueUserWorkItem(async _ => 
+            {
+                await Task.Delay(TimeSpan.FromMinutes(10));
+                ApiController.getFastdb(update: true);
+            });
+
             ThreadPool.QueueUserWorkItem(async _ => await SyncCron.Torrents());
             ThreadPool.QueueUserWorkItem(async _ => await SyncCron.Spidr());
 

Original file line number	Diff line number	Diff line change
`@@ -37,29 +37,43 @@ public JsonResult JacRedConf(string apikey)`
`37`	`37`	`[Route("/api/v2.0/indexers/{status}/results")]`
`38`	`38`	`public ActionResult Jackett(string apikey, string query, string title, string title_original, int year, Dictionary<string, string> category, int is_serial = -1)`
`39`	`39`	`{`
`40`		`- bool rqnum = false;`
`41`	`40`	`var fastdb = getFastdb();`
`42`	`41`	`var torrents = new Dictionary<string, TorrentDetails>();`
	`42`	`+ 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";`
`43`	`43`
`44`	`44`	`#region Запрос с NUM`
`45`		`- var mNum = Regex.Match(query ?? string.Empty, "^([^a-z-A-Z]+) ([^а-я-А-Я]+) ([0-9]{4})$");`
`46`		`-`
`47`		`- if (string.IsNullOrWhiteSpace(title) && string.IsNullOrWhiteSpace(title_original) &&`
`48`		`- mNum.Success)`
	`45`	`+ if (rqnum && query != null)`
`49`	`46`	`{`
`50`		`- if (Regex.IsMatch(mNum.Groups[2].Value, "[a-zA-Z0-9]{2}"))`
	`47`	`+ var mNum = Regex.Match(query, "^([^a-z-A-Z]+) ([^а-я-А-Я]+) ([0-9]{4})$");`
	`48`	`+`
	`49`	`+ if (mNum.Success)`
`51`	`50`	`{`
`52`		`- rqnum = true;`
`53`		`- var g = mNum.Groups;`
	`51`	`+ if (Regex.IsMatch(mNum.Groups[2].Value, "[a-zA-Z0-9]{2}"))`
	`52`	`+ {`
	`53`	`+ var g = mNum.Groups;`
	`54`	`+ title = g[1].Value;`
	`55`	`+ title_original = g[2].Value;`
	`56`	`+ year = int.Parse(g[3].Value);`
	`57`	`+ }`
	`58`	`+ }`
	`59`	`+ else`
	`60`	`+ {`
	`61`	`+ if (Regex.IsMatch(query, "^([^a-z-A-Z]+) ((19\|20)[0-9]{2})$"))`
	`62`	`+ return Json(new RootObject() { Results = new List<Result>() });`
`54`	`63`
`55`		`- title = g[1].Value;`
`56`		`- title_original = g[2].Value;`
`57`		`- year = int.Parse(g[3].Value);`
	`64`	`+ mNum = Regex.Match(query, "^([^a-z-A-Z]+) ([^а-я-А-Я]+)$");`
	`65`	`+`
	`66`	`+ if (mNum.Success)`
	`67`	`+ {`
	`68`	`+ if (Regex.IsMatch(mNum.Groups[2].Value, "[a-zA-Z0-9]{2}"))`
	`69`	`+ {`
	`70`	`+ var g = mNum.Groups;`
	`71`	`+ title = g[1].Value;`
	`72`	`+ title_original = g[2].Value;`
	`73`	`+ }`
	`74`	`+ }`
`58`	`75`	`}`
`59`	`76`	`}`
`60`		`-`
`61`		`- if (!rqnum)`
`62`		`- 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";`
`63`	`77`	`#endregion`
`64`	`78`
`65`	`79`	`#region category`
`@@ -261,14 +275,14 @@ void updateKeys(string k)`
`261`	`275`	`string _s = StringConvert.SearchName(query);`
`262`	`276`
`263`	`277`	`#region torrentsSearch`
`264`		`- void torrentsSearch(bool exact)`
	`278`	`+ void torrentsSearch(bool exact, bool exactdb)`
`265`	`279`	`{`
`266`	`280`	`if (_s == null)`
`267`	`281`	`return;`
`268`	`282`
`269`	`283`	`HashSet<string> keys = null;`
`270`	`284`
`271`		`- if (exact)`
	`285`	`+ if (exactdb)`
`272`	`286`	`{`
`273`	`287`	`if (fastdb.TryGetValue(_s, out List<string> _keys) && _keys.Count > 0)`
`274`	`288`	`{`
`@@ -294,8 +308,7 @@ void torrentsSearch(bool exact)`
`294`	`308`	`break;`
`295`	`309`	`}`
`296`	`310`
`297`		`- if (keys.Count > 0)`
`298`		`- memoryCache.Set(mkey, keys, DateTime.Now.AddHours(1));`
	`311`	`+ memoryCache.Set(mkey, keys, DateTime.Now.AddHours(1));`
`299`	`312`	`}`
`300`	`313`	`}`
`301`	`314`
`@@ -351,12 +364,16 @@ void torrentsSearch(bool exact)`
`351`	`364`	`#endregion`
`352`	`365`
`353`	`366`	`if (is_serial == -1)`
`354`		`- torrentsSearch(exact: false);`
	`367`	`+ {`
	`368`	`+ torrentsSearch(exact: false, exactdb: true);`
	`369`	`+ if (torrents.Count == 0)`
	`370`	`+ torrentsSearch(exact: false, exactdb: false);`
	`371`	`+ }`
`355`	`372`	`else`
`356`	`373`	`{`
`357`		`- torrentsSearch(exact: true);`
	`374`	`+ torrentsSearch(exact: true, exactdb: true);`
`358`	`375`	`if (torrents.Count == 0)`
`359`		`- torrentsSearch(exact: false);`
	`376`	`+ torrentsSearch(exact: false, exactdb: false);`
`360`	`377`	`}`
`361`	`378`	`#endregion`
`362`	`379`	`}`
`@@ -772,11 +789,13 @@ void AddTorrents(TorrentDetails t)`
`772`	`789`
`773`	`790`
`774`	`791`	`#region getFastdb`
`775`		`- Dictionary<string, List<string>> getFastdb()`
	`792`	`+ static Dictionary<string, List<string>> _fastdb = null;`
	`793`	`+`
	`794`	`+ public static Dictionary<string, List<string>> getFastdb(bool update = false)`
`776`	`795`	`{`
`777`		`- if (!memoryCache.TryGetValue("api:fastdb", out Dictionary<string, List<string>> fastdb))`
	`796`	`+ if (_fastdb == null \|\| update)`
`778`	`797`	`{`
`779`		`- fastdb = new Dictionary<string, List<string>>();`
	`798`	`+ var fastdb = new Dictionary<string, List<string>>();`
`780`	`799`
`781`	`800`	`foreach (var item in FileDB.masterDb)`
`782`	`801`	`{`
`@@ -787,9 +806,6 @@ Dictionary<string, List<string>> getFastdb()`
`787`	`806`
`788`	`807`	`if (fastdb.TryGetValue(k, out List<string> keys))`
`789`	`808`	`{`
`790`		`- if (keys == null)`
`791`		`- keys = new List<string>();`
`792`		`-`
`793`	`809`	`keys.Add(item.Key);`
`794`	`810`	`}`
`795`	`811`	`else`
`@@ -799,10 +815,10 @@ Dictionary<string, List<string>> getFastdb()`
`799`	`815`	`}`
`800`	`816`	`}`
`801`	`817`
`802`		`- memoryCache.Set("api:fastdb", fastdb, DateTime.Now.AddMinutes(10));`
	`818`	`+ _fastdb = fastdb;`
`803`	`819`	`}`
`804`	`820`
`805`		`- return fastdb;`
	`821`	`+ return _fastdb;`
`806`	`822`	`}`
`807`	`823`	`#endregion`
`808`	`824`	`}`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,10 @@ async public static Task CronFast()`
`248`	`248`	`{`
`249`	`249`	`if (openWriteTask.Count > AppInit.conf.evercache.maxOpenWriteTask)`
`250`	`250`	`{`
`251`		`- foreach (var i in openWriteTask.OrderBy(i => i.Value.countread).Take(AppInit.conf.evercache.dropCacheTake))`
	`251`	`+ var query = openWriteTask.Where(i => DateTime.Now > i.Value.create.AddMinutes(10));`
	`252`	`+ query = query.OrderBy(i => i.Value.countread).ThenBy(i => i.Value.lastread);`
	`253`	`+`
	`254`	`+ foreach (var i in query.Take(AppInit.conf.evercache.dropCacheTake))`
`252`	`255`	`openWriteTask.TryRemove(i.Key, out _);`
`253`	`256`	`}`
`254`	`257`	`}`