dev

Author: immisterio

Controllers/SyncController.cs

@@ -126,7 +126,7 @@ public JsonResult Torrents(long time)
                 return Json(new List<string>());
 
             int take = 2_000;
-            var torrents = new Dictionary<string, TorrentDetails>();
+            var torrents = new List<Models.Sync.v1.Torrent>(take+1);
 
             if (!memoryCache.TryGetValue("sync:masterDb", out Dictionary<string, TorrentInfo> masterDb))
             {
@@ -139,6 +139,7 @@ public JsonResult Torrents(long time)
                 foreach (var torrent in FileDB.OpenRead(item.Key, cache: false))
                 {
                     var _t = (TorrentDetails)torrent.Value.Clone();
+                    _t.updateTime = item.Value.updateTime;
 
                     var streams = TracksDB.Get(_t.magnet, _t.types);
                     if (streams != null)
@@ -147,15 +148,7 @@ public JsonResult Torrents(long time)
                         _t.languages = TracksDB.Languages(_t, streams);
                     }
 
-                    if (torrents.TryGetValue(torrent.Key, out TorrentDetails val))
-                    {
-                        if (torrent.Value.updateTime > val.updateTime)
-                            torrents[torrent.Key] = _t;
-                    }
-                    else
-                    {
-                        torrents.TryAdd(torrent.Key, _t);
-                    }
+                    torrents.Add(new Models.Sync.v1.Torrent() { key = torrent.Key, value = _t });
                 }
 
                 if (torrents.Count > take)
@@ -165,7 +158,7 @@ public JsonResult Torrents(long time)
                 }
             }
 
-            return Json(new { take, torrents = torrents.OrderBy(i => i.Value.updateTime) });
+            return Json(new { take, torrents });
         }
     }
 }

Engine/SyncCron.cs

@@ -1,6 +1,5 @@
 using JacRed.Engine.CORE;
 using JacRed.Models.Details;
-using JacRed.Models.Sync;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -101,7 +100,7 @@ async public static Task Torrents()
                         else
                         {
                             #region Sync.v1
-                            next: var root = await HttpClient.Get<RootObject>($"{AppInit.conf.syncapi}/sync/torrents?time={lastsync}", timeoutSeconds: 300, MaxResponseContentBufferSize: 100_000_000);
+                            next: var root = await HttpClient.Get<Models.Sync.v1.RootObject>($"{AppInit.conf.syncapi}/sync/torrents?time={lastsync}", timeoutSeconds: 300, MaxResponseContentBufferSize: 100_000_000);
                             if (root?.torrents != null && root.torrents.Count > 0)
                             {
                                 FileDB.AddOrUpdate(root.torrents.Select(i => i.value).ToList());

Models/Sync/RootObject.cs renamed to Models/Sync/v1/RootObject.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace JacRed.Models.Sync
+namespace JacRed.Models.Sync.v1
 {
     public class RootObject
     {

Models/Sync/Torrent.cs renamed to Models/Sync/v1/Torrent.cs

@@ -1,11 +1,11 @@
 using JacRed.Models.Details;
 
-namespace JacRed.Models.Sync
+namespace JacRed.Models.Sync.v1
 {
     public class Torrent
     {
         public string key { get; set; }
 
-        public TorrentBaseDetails value { get; set; }
+        public TorrentDetails value { get; set; }
     }
 }