Use config and db in scripts

Instead of using configparser and mysql.connector directly, change all
Python scripts to use the config and db Python modules which are now
accessible from a common location.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>

1 files changed, 13 insertions, 27 deletions

diff --git a/scripts/popupdate.py b/scripts/popupdate.py
index 26d8379..f5e09d9 100755
--- a/scripts/popupdate.py
+++ b/scripts/popupdate.py
@@ -1,36 +1,22 @@
 #!/usr/bin/python3
 
-import configparser
-import mysql.connector
-import os
+import aurweb.db
 
-config = configparser.RawConfigParser()
-config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config")
 
-aur_db_host = config.get('database', 'host')
-aur_db_name = config.get('database', 'name')
-aur_db_user = config.get('database', 'user')
-aur_db_pass = config.get('database', 'password')
-aur_db_socket = config.get('database', 'socket')
+def main():
+    conn = aurweb.db.Connection()
 
+    conn.execute("UPDATE PackageBases SET NumVotes = (" +
+                 "SELECT COUNT(*) FROM PackageVotes " +
+                 "WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
 
-def main():
-    db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
-                                 passwd=aur_db_pass, db=aur_db_name,
-                                 unix_socket=aur_db_socket, buffered=True)
-    cur = db.cursor()
-
-    cur.execute("UPDATE PackageBases SET NumVotes = (" +
-                "SELECT COUNT(*) FROM PackageVotes " +
-                "WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
-
-    cur.execute("UPDATE PackageBases SET Popularity = (" +
-                "SELECT COALESCE(SUM(POWER(0.98, (UNIX_TIMESTAMP() - VoteTS) / 86400)), 0.0) " +
-                "FROM PackageVotes WHERE PackageVotes.PackageBaseID = " +
-                "PackageBases.ID AND NOT VoteTS IS NULL)")
-
-    db.commit()
-    db.close()
+    conn.execute("UPDATE PackageBases SET Popularity = (" +
+                 "SELECT COALESCE(SUM(POWER(0.98, (UNIX_TIMESTAMP() - VoteTS) / 86400)), 0.0) " +
+                 "FROM PackageVotes WHERE PackageVotes.PackageBaseID = " +
+                 "PackageBases.ID AND NOT VoteTS IS NULL)")
+
+    conn.commit()
+    conn.close()
 
 
 if __name__ == '__main__':