fix ffprobe

Author: immisterio

AppInit.cs

@@ -49,6 +49,12 @@ public static AppInit conf
 
         public bool tracks = false;
 
+        /// <summary>
+        /// 0 - все
+        /// 1 - день, месяц
+        /// </summary>
+        public int tracksmod = 0;
+
         public int tracksdelay = 5000;
 
         public string[] tsuri = new string[] { "http://127.0.0.1:8090" };

Controllers/ApiController.cs

@@ -498,7 +498,7 @@ List<ffStream> FFprobe(TorrentDetails t, out HashSet<string> langs)
 
             var result = tsort.OrderByDescending(i => i.createTime).Take(2_000);
             if (apikey == "rus")
-                result = result.Where(i => i.languages != null && i.languages.Contains("rus"));
+                result = result.Where(i => (i.languages != null && i.languages.Contains("rus")) || (i.types != null && (i.types.Contains("sport") || i.types.Contains("tvshow") || i.types.Contains("docuserial"))));
 
             jval = JsonConvert.SerializeObject(new
             {

Engine/FileDB/FileDB.cs

@@ -121,6 +121,12 @@ void upt(bool uptfull = false)
                     upt();
                 }
 
+                if (torrent.ffprobe != null && t.ffprobe == null)
+                {
+                    t.ffprobe = torrent.ffprobe;
+                    upt();
+                }
+
                 if (updateFull)
                     updateFullDetails(t);
 
@@ -149,7 +155,8 @@ void upt(bool uptfull = false)
                     sid = torrent.sid,
                     relased = torrent.relased,
                     sizeName = torrent.sizeName,
-                    magnet = torrent.magnet
+                    magnet = torrent.magnet,
+                    ffprobe = torrent.ffprobe
                 };
 
                 savechanges = true;

Engine/StatsCron.cs

@@ -50,10 +50,13 @@ async public static Task Run()
 
                                 if (AppInit.conf.tracks && !TracksDB.theBad(t.types))
                                 {
-                                    if (TracksDB.Get(t.magnet) != null)
-                                        s.trkconfirm = s.trkconfirm + 1;
-                                    else
-                                        s.trkwait = s.trkwait + 1;
+                                    if (!string.IsNullOrEmpty(t.magnet) && t.sid > 0 && t.updateTime > DateTime.Today.AddDays(-20))
+                                    {
+                                        if (TracksDB.Get(t.magnet) != null)
+                                            s.trkconfirm = s.trkconfirm + 1;
+                                        else
+                                            s.trkwait = s.trkwait + 1;
+                                    }
                                 }
 
                                 stats[t.trackerName] = s;

Engine/Tracks/TracksCron.cs

@@ -1,9 +1,7 @@
 using MonoTorrent;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using System.Web;
 
 namespace JacRed.Engine
 {
@@ -23,10 +21,13 @@ async public static Task Run(int typetask)
                 if (AppInit.conf.tracks == false)
                     continue;
 
+                if (AppInit.conf.tracksmod == 1 && (typetask == 3 || typetask == 4))
+                    continue;
+
                 try
                 {
                     var starttime = DateTime.Now;
-                    var torrents = new Dictionary<string, (int sid, string magnet)>();
+                    var torrents = new List<(string trackerName, string magnet)>();
 
                     foreach (var item in FileDB.masterDb.ToArray())
                     {
@@ -77,31 +78,31 @@ async public static Task Run(int typetask)
                                     if (TracksDB.theBad(t.types))
                                         continue;
 
-                                    var magnetLink = MagnetLink.Parse(t.magnet);
-                                    string hex = magnetLink.InfoHash.ToHex();
-                                    if (hex == null)
-                                        continue;
+                                    //var magnetLink = MagnetLink.Parse(t.magnet);
+                                    //string hex = magnetLink.InfoHash.ToHex();
+                                    //if (hex == null)
+                                    //    continue;
 
-                                    torrents.TryAdd(hex, (t.sid, t.magnet));
+                                    torrents.Add((t.trackerName, t.magnet));
                                 }
                                 catch { }
                             }
                         }
                     }
 
-                    foreach (var t in torrents.OrderByDescending(i => i.Value.sid))
+                    foreach (var t in torrents)
                     {
                         try
                         {
-                            if (typetask == 2 && DateTime.Now > starttime.AddDays(3))
+                            if (typetask == 2 && DateTime.Now > starttime.AddDays(10))
                                 break;
 
-                            if ((typetask == 3 || typetask == 4) && DateTime.Now > starttime.AddDays(10))
+                            if ((typetask == 3 || typetask == 4) && DateTime.Now > starttime.AddMonths(2))
                                 break;
 
-                            if (TracksDB.Get(t.Value.magnet) == null)
+                            if (TracksDB.Get(t.magnet) == null)
                             {
-                                _ = TracksDB.Add(t.Value.magnet);
+                                _ = TracksDB.Add(t.magnet);
                                 await Task.Delay(AppInit.conf.tracksdelay);
                             }
                         }