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, 10 insertions, 22 deletions

diff --git a/scripts/mkpkglists.py b/scripts/mkpkglists.py
index 8cab0a9..70cbd13 100755
--- a/scripts/mkpkglists.py
+++ b/scripts/mkpkglists.py
@@ -1,28 +1,16 @@
 #!/usr/bin/python3
 
-import configparser
 import datetime
 import gzip
-import mysql.connector
 import os
 
-docroot = os.path.dirname(os.path.realpath(__file__)) + "/../web/html/"
-
-config = configparser.RawConfigParser()
-config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config")
+import aurweb.db
 
-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')
+docroot = os.path.dirname(os.path.realpath(__file__)) + "/../web/html/"
 
 
 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()
+    conn = aurweb.db.Connection()
 
     datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
     pkglist_header = "# AUR package list, generated on " + datestr
@@ -30,19 +18,19 @@ def main():
 
     with gzip.open(docroot + "packages.gz", "w") as f:
         f.write(bytes(pkglist_header + "\n", "UTF-8"))
-        cur.execute("SELECT Packages.Name FROM Packages " +
-                    "INNER JOIN PackageBases " +
-                    "ON PackageBases.ID = Packages.PackageBaseID " +
-                    "WHERE PackageBases.PackagerUID IS NOT NULL")
+        cur = conn.execute("SELECT Packages.Name FROM Packages " +
+                           "INNER JOIN PackageBases " +
+                           "ON PackageBases.ID = Packages.PackageBaseID " +
+                           "WHERE PackageBases.PackagerUID IS NOT NULL")
         f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
     with gzip.open(docroot + "pkgbase.gz", "w") as f:
         f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
-        cur.execute("SELECT Name FROM PackageBases " +
-                    "WHERE PackagerUID IS NOT NULL")
+        cur = conn.execute("SELECT Name FROM PackageBases " +
+                           "WHERE PackagerUID IS NOT NULL")
         f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
 
-    db.close()
+    conn.close()
 
 
 if __name__ == '__main__':