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

Remove uploader from monitor

Browse Source
This commit is contained in:
AnthorNet 2019-01-12 10:22:39 +01:00
parent 2e1881fdcc
commit 1150a72b47
1 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/eddn/Monitor.py
View File

@ -92,62 +92,6 @@ def getSoftwares():
return simplejson.dumps(softwares) return simplejson.dumps(softwares)
'''
@get('/getTotalUploaders/')
def getTotalUploaders():
response.set_header("Access-Control-Allow-Origin", "*")
db = mariadb.connect(user=Settings.MONITOR_DB['user'], password=Settings.MONITOR_DB['password'], database=Settings.MONITOR_DB['database'])
uploaders = collections.OrderedDict()
limit = request.GET.get('limit', '20').strip()
query = """SELECT `name`, SUM(`hits`) AS `total`
FROM `uploaders`
GROUP BY `name`
ORDER BY `total` DESC
LIMIT %s"""
results = db.cursor()
results.execute(query, (int(limit), ))
for row in results:
uploaders[row[0].encode('utf8')] = row[1]
db.close()
return simplejson.dumps(uploaders)
@get('/getUploaders/')
def getUploaders():
response.set_header("Access-Control-Allow-Origin", "*")
db = mariadb.connect(user=Settings.MONITOR_DB['user'], password=Settings.MONITOR_DB['password'], database=Settings.MONITOR_DB['database'])
uploaders = collections.OrderedDict()
dateStart = request.GET.get('dateStart', str(date('%Y-%m-%d'))).strip()
dateEnd = request.GET.get('dateEnd', str(date('%Y-%m-%d'))).strip()
query = """SELECT *
FROM `uploaders`
WHERE `dateStats` BETWEEN %s AND %s
ORDER BY `hits` DESC, `dateStats` ASC"""
results = db.cursor()
results.execute(query, (dateStart, dateEnd))
for row in results:
currentDate = row[2].strftime('%Y-%m-%d')
if not currentDate in uploaders.keys():
uploaders[currentDate] = collections.OrderedDict()
uploaders[currentDate][row[0].encode('utf8')] = row[1]
db.close()
return simplejson.dumps(uploaders)
'''
@get('/getTotalSchemas/') @get('/getTotalSchemas/')
def getTotalSchemas(): def getTotalSchemas():
response.set_header("Access-Control-Allow-Origin", "*") response.set_header("Access-Control-Allow-Origin", "*")
@ -258,13 +202,6 @@ class Monitor(Thread):
c.execute('INSERT IGNORE INTO `softwares` (`name`, `dateStats`) VALUES (%s, UTC_DATE())', (softwareID, )) c.execute('INSERT IGNORE INTO `softwares` (`name`, `dateStats`) VALUES (%s, UTC_DATE())', (softwareID, ))
db.commit() db.commit()
# Update uploader count
if uploaderID: # Don't get empty uploaderID
c = db.cursor()
c.execute('UPDATE `uploaders` SET `hits` = `hits` + 1 WHERE `name` = %s AND `dateStats` = UTC_DATE()', (uploaderID, ))
c.execute('INSERT IGNORE INTO `uploaders` (`name`, `dateStats`) VALUES (%s, UTC_DATE())', (uploaderID, ))
db.commit()
# Update schemas count # Update schemas count
c = db.cursor() c = db.cursor()
c.execute('UPDATE `schemas` SET `hits` = `hits` + 1 WHERE `name` = %s AND `dateStats` = UTC_DATE()', (schemaID, )) c.execute('UPDATE `schemas` SET `hits` = `hits` + 1 WHERE `name` = %s AND `dateStats` = UTC_DATE()', (schemaID, ))