Changeset 505 for TFP-WebServer/WebServer/src/UrlHandlers/ItemIconHandler.cs

Timestamp:

Apr 10, 2025, 3:30:00 PM (4 days ago)

Author:

alloc

Message:

Changed: Load item icons in a coroutine to reduce time needed to get server in a connectable state
Fixed: WebAPI "Player" returns player levels again

File:

• TFP-WebServer/WebServer/src/UrlHandlers/ItemIconHandler.cs (modified) (5 diffs)

TFP-WebServer/WebServer/src/UrlHandlers/ItemIconHandler.cs

@@ -1 +1 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -68 +69 @@
                 }
 
-                public bool LoadIcons () {
+                private const int LoadingMaxMsPerFrame = 100;
+                private bool loading;
+                public IEnumerator LoadIcons () {
                         
                         lock (icons) {
-                                if (loaded) {
-                                        return true;
-                                }
+                                if (loading || loaded) {
+                                        yield break;
+                                }
+
+                                loading = true;
+
+                                MicroStopwatch mswPerFrame = new MicroStopwatch (true);
 
                                 LoadingStats stats = new LoadingStats ();
@@ -99 +106 @@
                                 }
 
-                                try {
-                                        loadIconsFromFolder (GameIO.GetGameDir ("Data/ItemIcons"), tintedIcons, stats);
-                                } catch (Exception e) {
-                                        Log.Error ("[Web] Failed loading icons from base game");
-                                        Log.Exception (e);
-                                }
+                                yield return loadIconsFromFolder (GameIO.GetGameDir ("Data/ItemIcons"), tintedIcons, stats, mswPerFrame);
 
                                 // Load icons from mods
                                 foreach (Mod mod in ModManager.GetLoadedMods ()) {
-                                        try {
-                                                string modIconsPath = $"{mod.Path}/ItemIcons";
-                                                loadIconsFromFolder (modIconsPath, tintedIcons, stats);
-                                        } catch (Exception e) {
-                                                Log.Error ($"[Web] Failed loading icons from mod {mod.Name}");
-                                                Log.Exception (e);
-                                        }
+                                        string modIconsPath = $"{mod.Path}/ItemIcons";
+                                        yield return loadIconsFromFolder (modIconsPath, tintedIcons, stats, mswPerFrame);
                                 }
                                 
@@ -133 +130 @@
                                         Log.Out ($"[Web] IconHandler: Cached {totalSize / 1024} KiB");
                                 }
-
-                                return true;
-                        }
-                }
-
-                private void loadIconsFromFolder (string _path, Dictionary<string, List<Color>> _tintedIcons, LoadingStats _stats) {
+                        }
+                }
+
+                private IEnumerator loadIconsFromFolder (string _path, Dictionary<string, List<Color>> _tintedIcons, LoadingStats _stats,
+                        MicroStopwatch _mswPerFrame) {
                         if (!Directory.Exists (_path)) {
-                                return;
-                        }
+                                yield break;
+                        }
+
+                        _mswPerFrame.ResetAndRestart ();
 
                         foreach (string file in Directory.GetFiles (_path)) {
@@ -164 +162 @@
                                         Object.Destroy (tex);
                                 } catch (Exception e) {
+                                        Log.Error ($"[Web] Failed loading icon from {_path}");
                                         Log.Exception (e);
+                                }
+
+                                if (_mswPerFrame.ElapsedMilliseconds >= LoadingMaxMsPerFrame) {
+                                        yield return null;
+                                        _mswPerFrame.ResetAndRestart ();
                                 }
                         }