From 89909f06af463aabc7988cb7459329fec2c80b8a Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Sun, 7 Jan 2024 21:11:32 +0100
Subject: [PATCH] feat: Improve search engines loading time info

---
 searx/templates/simple/results.html | 19 +++++++------------
 searx/webapp.py                     | 10 ++++++++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html
index 7f96370c4..85fb9af13 100644
--- a/searx/templates/simple/results.html
+++ b/searx/templates/simple/results.html
@@ -35,21 +35,16 @@
     <div id="sidebar">
 
         {%- if number_of_results != '0' -%}
-        <p id="result_count">
-            <small>{{ _('Number of results') }}: {{ number_of_results }}</small>
-        </p>
         <details>
             <summary>
-                <small>Longest loading time: {{ longest_loading_time.load }} from {{ longest_loading_time.engine }}</small>
+                <small id="result_count">{{ _('Number of results') }}: {{ number_of_results }}</small>
+                <small>{{ longest_load_time_formatted }}</small>
             </summary>
-            <div>
-                <ul>
-                    {% for timing in loading_times %}
-                        <li>
-                            <small>{{ timing.load }} from {{ timing.engine }}</small>
-                        </li>
-                    {% endfor %}
-                </ul>
+            <ul>
+                {% for engine, timing in loading_times %}
+                    <li>{{ engine }}: {{ timing }}</li>
+                {% endfor %}
+            </ul>
         </details>
         {%- endif -%}
 
diff --git a/searx/webapp.py b/searx/webapp.py
index 888195263..c1f371efc 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -794,8 +794,14 @@ def search():
             fallback=request.preferences.get_value("language")
         ),
         timeout_limit = request.form.get('timeout_limit', None),
-        longest_loading_time = longest_loading_time,
-        loading_times = timings,
+        longest_load_time_formatted = gettext("Took {seconds} second(s)")
+            .format(seconds="{:.2f}".format(longest_loading_time[1])),
+        # List of tuples of (engine, load time); Displayed in the sidebar
+        # Sorted by load time, descending
+        loading_times = sorted((
+            (timing.engine, "{:.2f}".format(timing.load))
+            for timing in timings
+        ), key=lambda x: x[1], reverse=True),
         # fmt: on
     )