Przeglądaj źródła

[enh] stat updates

asciimoo 11 lat temu
rodzic
commit
4f4ec44bb3
2 zmienionych plików z 29 dodań i 11 usunięć
  1. 17
    5
      searx/engines/__init__.py
  2. 12
    6
      searx/templates/stats.html

+ 17
- 5
searx/engines/__init__.py Wyświetl plik

159
     return sorted(results, key=itemgetter('score'), reverse=True)
159
     return sorted(results, key=itemgetter('score'), reverse=True)
160
 
160
 
161
 def get_engines_stats():
161
 def get_engines_stats():
162
-    stats = {}
162
+    pageloads = []
163
+    results = []
163
 
164
 
165
+    max_pageload = max_results = 0
164
     for engine in engines.values():
166
     for engine in engines.values():
165
         if engine.stats['search_count'] == 0:
167
         if engine.stats['search_count'] == 0:
166
             continue
168
             continue
167
         results_num = engine.stats['result_count']/float(engine.stats['search_count'])
169
         results_num = engine.stats['result_count']/float(engine.stats['search_count'])
168
         load_times  = engine.stats['page_load_time']/float(engine.stats['search_count'])
170
         load_times  = engine.stats['page_load_time']/float(engine.stats['search_count'])
169
-        stats[engine.name] = {'Average number of results': results_num
170
-                             ,'Average page load time': load_times
171
-                             }
171
+        max_results = max(results_num, max_results)
172
+        max_pageload = max(load_times, max_pageload)
173
+        pageloads.append({'avg': load_times, 'name': engine.name})
174
+        results.append({'avg': results_num, 'name': engine.name})
175
+
176
+    for engine in pageloads:
177
+        engine['percentage'] = int(engine['avg']/max_pageload*100)
178
+
179
+    for engine in results:
180
+        engine['percentage'] = int(engine['avg']/max_results*100)
181
+
172
 
182
 
173
-    return stats
183
+    return [('Page loads', sorted(pageloads, key=itemgetter('avg'), reverse=True))
184
+           ,('Number of results', sorted(results, key=itemgetter('avg'), reverse=True))
185
+           ]

+ 12
- 6
searx/templates/stats.html Wyświetl plik

3
 {% block content %}
3
 {% block content %}
4
 <h2>Engine stats</h2>
4
 <h2>Engine stats</h2>
5
 
5
 
6
-{% for engine,engine_stats in stats.items() %}
6
+{% for stat_name,stat_category in stats %}
7
 <div>
7
 <div>
8
-    <h3>{{ engine }}</h3>
9
-    <ul>
10
-        {% for statname,value in engine_stats.items() %}
11
-        <li>{{ statname }}: {{ value }}</li>
8
+    <table>
9
+        <tr colspan="3">
10
+            <th>{{ stat_name }}</th>
11
+        </tr>
12
+        {% for engine in stat_category %}
13
+        <tr>
14
+            <td>{{ engine.name }}</td>
15
+            <td>{{ engine.percentage }}</td>
16
+            <td>{{ engine.avg }}</td>
17
+        </tr>
12
         {% endfor %}
18
         {% endfor %}
13
-    </ul>
19
+    </table>
14
 </div>
20
 </div>
15
 {% endfor %}
21
 {% endfor %}
16
 {% endblock %}
22
 {% endblock %}