From 5accf9350c47d0797b1657b759cb3c742fc72248 Mon Sep 17 00:00:00 2001
From: terorie <terorie@alphakevin.club>
Date: Fri, 7 Dec 2018 01:11:34 +0100
Subject: [PATCH] test

---
 database.py          | 17 ++++++++++-------
 templates/stats.html | 13 +++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/database.py b/database.py
index f3b7f2a..088bde0 100644
--- a/database.py
+++ b/database.py
@@ -334,18 +334,21 @@ class Database:
         return [tasks.TaskResult(r[1], r[2], r[3], r[4], r[0], str(r[5])) for r in cursor.fetchall()]
 
     def get_stats_by_crawler(self):
-        stats = dict()
+        stats = []
         task_results = self.get_crawl_logs()
 
         for crawler in self.get_tokens():
             task_count = sum(1 for result in task_results if result.server_name == crawler.name)
             if task_count > 0:
-                stats[crawler.name] = dict()
-                stats[crawler.name]["file_count"] = sum(result.file_count for result in task_results if result.server_name == crawler.name)
-                stats[crawler.name]["time"] = sum((result.end_time - result.start_time) for result in task_results if result.server_name == crawler.name)
-                stats[crawler.name]["task_count"] = task_count
-                stats[crawler.name]["time_avg"] = stats[crawler.name]["time"] / task_count
-                stats[crawler.name]["file_count_avg"] = stats[crawler.name]["file_count"] / task_count
+                info = dict()
+                info["file_count"] = sum(result.file_count for result in task_results if result.server_name == crawler.name)
+                info["time"] = sum((result.end_time - result.start_time) for result in task_results if result.server_name == crawler.name)
+                info["task_count"] = task_count
+                info["time_avg"] = stats[crawler.name]["time"] / task_count
+                info["file_count_avg"] = stats[crawler.name]["file_count"] / task_count
+                stats.append((crawler.name, info))
+
+        stats.sort(key=lambda t: t["task_count"])
 
         return stats
 
diff --git a/templates/stats.html b/templates/stats.html
index 07adafb..73139dd 100644
--- a/templates/stats.html
+++ b/templates/stats.html
@@ -83,14 +83,15 @@
                     </tr>
                     </thead>
                     <tbody>
-                    {% for server in crawl_server_stats %}
+                    {% for entry in crawl_server_stats %}
+                        {% set server, info = entry %}
                         <tr>
                             <td><b>{{ server }}</b></td>
-                            <td class="td-numeric">{{ crawl_server_stats[server].task_count }}</td>
-                            <td class="td-numeric">{{ crawl_server_stats[server].time | duration_format() }}</td>
-                            <td class="td-numeric">{{ crawl_server_stats[server].time_avg | duration_format() }}</td>
-                            <td class="td-numeric">{{ crawl_server_stats[server].file_count }}</td>
-                            <td class="td-numeric">{{ "%.2f" % crawl_server_stats[server].file_count_avg }}</td>
+                            <td class="td-numeric">{{ info.task_count }}</td>
+                            <td class="td-numeric">{{ info.time | duration_format() }}</td>
+                            <td class="td-numeric">{{ info.time_avg | duration_format() }}</td>
+                            <td class="td-numeric">{{ info.file_count }}</td>
+                            <td class="td-numeric">{{ "%.2f" % info.file_count_avg }}</td>
                         </tr>
                     {% endfor %}
                     </tbody>