From 6aabc1be19de45c42ca9e01801e05325901c5c96 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 16 Aug 2019 20:21:57 +0800
Subject: [PATCH] 1

---
 tools/rankserver/app.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/tools/rankserver/app.py b/tools/rankserver/app.py
index b2502c9..a05dc33 100644
--- a/tools/rankserver/app.py
+++ b/tools/rankserver/app.py
@@ -63,30 +63,25 @@ def getDaySeconds(time_val, incdays):
 
 #数据去重
 def delRepeatData(row, data_list):
-    i = 0
+    temp_list = []
     for data in data_list:
-        if (data[0] == row[0]):
-            del data_list[i]
-        i = i + 1
+        if data[0] == row[0]:
+            temp_list.append(data)
+    for temp_data in temp_list:
+        data_list.remove(temp_data)
+    #print(data_list)
 
 #刷新数据
 def refreshData(row, data_list, data_info):
     key_info = data_info
-    list_info = data_list
-    i = 0
-    for data in data_list:
-        if (data[0] == row[0]):
-            del data_list[i]
-            break
-        i = i + 1
     kill = safeDiv(row[3], row[7])
     alive_time = safeDiv(row[4], row[7])
     harm = safeDiv(row[5], row[7])
     win_times = safeDiv(row[6], row[7])
-    list_info.append((row[0], row[1].decode('utf-8'), row[2], kill, alive_time, harm, win_times, row[6]))
-    list_info.sort(key=key_info, reverse=True)
-    if (len(list_info) > 50):
-        del list_info[50:]
+    data_list.append((row[0], row[1].decode('utf-8'), row[2], kill, alive_time, harm, win_times, row[6]))
+    data_list.sort(key=key_info, reverse=True)
+    if (len(data_list) > 50):
+        del data_list[50:]
 
 #更新排行榜
 def updateRank(r, kill_list, alive_list, harm_list, rate_list, win_list):
@@ -145,6 +140,7 @@ def dayReadMysqlData(rushtime):
 
             has_data = False
             for row in cursor:
+                has_data = True
                 #更新击杀榜
                 refreshData(row, kill_list, take_kills)
                 #更新生存榜
@@ -225,6 +221,7 @@ def readMysqlData(rushtime):
                            ' WHERE modify_time > %s AND idx > %s LIMIT 0, 1000' % (time.time() - 300, last_idx))
             has_data = False
             for row in cursor:
+                has_data = True
                 #更新击杀榜
                 delRepeatData(row, kill_list)
                 refreshData(row, kill_list, take_kills)
@@ -272,7 +269,7 @@ if __name__ == "__main__":
 
     app = make_app()
     app.listen(conf['listen_port'])
-    conf['rushtime'] = 5
+    conf['rushtime'] = 300
     tornado.ioloop.IOLoop.current().call_later(conf['rushtime'],
                                                lambda : readMysqlData(conf['rushtime'])
     )