third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-06-16 07:12:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Little refactoring on monitor

Browse Source
This commit is contained in:
AnthorNet 2015-05-07 14:16:26 +02:00
parent 1bedc16f32
commit d3f5fadc68
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/eddn/Monitor.py
View File

@ -36,7 +36,14 @@ def getTotalSoftwares():
db = sqlite3.connect(Settings.MONITOR_DB) db = sqlite3.connect(Settings.MONITOR_DB)
softwares = collections.OrderedDict() softwares = collections.OrderedDict()
query = 'SELECT name, SUM(hits) AS total FROM softwares GROUP BY name ORDER BY total DESC' maxDays = request.GET.get('maxDays', '31').strip()
maxDays = int(maxDays) -1;
query = """SELECT name, SUM(hits) AS total, MAX(dateStats) AS maxDate
FROM softwares
GROUP BY name
HAVING maxDate >= DATE('now', '""" + '-' + str(maxDays) + """ day')
ORDER BY total DESC"""
results = db.execute(query) results = db.execute(query)
for row in results: for row in results:
@ -55,7 +62,10 @@ def getSoftwares():
dateStart = request.GET.get('dateStart', str(date('%Y-%m-%d'))).strip() dateStart = request.GET.get('dateStart', str(date('%Y-%m-%d'))).strip()
dateEnd = request.GET.get('dateEnd', str(date('%Y-%m-%d'))).strip() dateEnd = request.GET.get('dateEnd', str(date('%Y-%m-%d'))).strip()
query = 'SELECT * FROM softwares WHERE dateStats BETWEEN ? AND ? ORDER BY hits DESC, dateStats ASC' query = """SELECT *
FROM softwares
WHERE dateStats BETWEEN ? AND ?
ORDER BY hits DESC, dateStats ASC"""
results = db.execute(query, (dateStart, dateEnd)) results = db.execute(query, (dateStart, dateEnd))
for row in results: for row in results:
@ -74,7 +84,13 @@ def getTotalUploaders():
db = sqlite3.connect(Settings.MONITOR_DB) db = sqlite3.connect(Settings.MONITOR_DB)
uploaders = collections.OrderedDict() uploaders = collections.OrderedDict()
query = 'SELECT name, SUM(hits) AS total FROM uploaders GROUP BY name ORDER BY total DESC' limit = request.GET.get('limit', '20').strip()
query = """SELECT name, SUM(hits) AS total
FROM uploaders
GROUP BY name
ORDER BY total DESC
LIMIT """ + limit
results = db.execute(query) results = db.execute(query)
for row in results: for row in results:
@ -93,7 +109,10 @@ def getUploaders():
dateStart = request.GET.get('dateStart', str(date('%Y-%m-%d'))).strip() dateStart = request.GET.get('dateStart', str(date('%Y-%m-%d'))).strip()
dateEnd = request.GET.get('dateEnd', str(date('%Y-%m-%d'))).strip() dateEnd = request.GET.get('dateEnd', str(date('%Y-%m-%d'))).strip()
query = 'SELECT * FROM uploaders WHERE dateStats BETWEEN ? AND ? ORDER BY hits DESC, dateStats ASC' query = """SELECT *
FROM uploaders
WHERE dateStats BETWEEN ? AND ?
ORDER BY hits DESC, dateStats ASC"""
results = db.execute(query, (dateStart, dateEnd)) results = db.execute(query, (dateStart, dateEnd))
for row in results: for row in results:
@ -112,7 +131,10 @@ def getTotalSchemas():
db = sqlite3.connect(Settings.MONITOR_DB) db = sqlite3.connect(Settings.MONITOR_DB)
schemas = collections.OrderedDict() schemas = collections.OrderedDict()
query = 'SELECT name, SUM(hits) AS total FROM schemas GROUP BY name ORDER BY total DESC' query = """SELECT name, SUM(hits) AS total
FROM schemas
GROUP BY name
ORDER BY total DESC"""
results = db.execute(query) results = db.execute(query)
for row in results: for row in results:
@ -131,7 +153,10 @@ def getSchemas():
dateStart = request.GET.get('dateStart', str(date('%Y-%m-%d'))).strip() dateStart = request.GET.get('dateStart', str(date('%Y-%m-%d'))).strip()
dateEnd = request.GET.get('dateEnd', str(date('%Y-%m-%d'))).strip() dateEnd = request.GET.get('dateEnd', str(date('%Y-%m-%d'))).strip()
query = 'SELECT * FROM schemas WHERE dateStats BETWEEN ? AND ? ORDER BY hits DESC, dateStats ASC' query = """SELECT *
FROM schemas
WHERE dateStats BETWEEN ? AND ?
ORDER BY hits DESC, dateStats ASC"""
results = db.execute(query, (dateStart, dateEnd)) results = db.execute(query, (dateStart, dateEnd))
for row in results: for row in results: