From e3188c733176e6903f4aae2afd8c7aa4d52b3aa3 Mon Sep 17 00:00:00 2001 From: Sunpy Date: Tue, 29 May 2018 13:41:21 +0200 Subject: [PATCH] Fixed and tweaked getupdate --- handlers/getupdate.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/handlers/getupdate.py b/handlers/getupdate.py index 5520e24..165a40a 100644 --- a/handlers/getupdate.py +++ b/handlers/getupdate.py @@ -21,14 +21,15 @@ def handle(request): def callback(method, data): cur = glob.sql.cursor() - if method is "file_hash": - cur.execute("SELECT * FROM updates WHERE file_hash = '{}'".format( - data - )) - else: - cur.execute("SELECT a.* FROM updates a INNER JOIN ( SELECT MAX(file_version) file_version, filename FROM updates WHERE {} < {} GROUP BY filename) b ON a.file_version = b.file_version;".format( - method, - data - )) + query = "SELECT a.* FROM updates a INNER JOIN ( SELECT MAX(file_version) file_version, filename FROM updates WHERE {} < {} GROUP BY filename) b ON a.file_version = b.file_version" + if method is "timestamp": + query += " ORDER BY a.timestamp DESC" + elif method is "file_hash": + query = "SELECT * FROM updates WHERE {} = '{}'" + + cur.execute("SELECT a.* FROM updates a INNER JOIN ( SELECT MAX(file_version) file_version, filename FROM updates WHERE {} < {} GROUP BY filename) b ON a.file_version = b.file_version;".format( + method, + data + )) return cur.fetchall() \ No newline at end of file