mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
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>
This commit is contained in:
parent
dc3fd60715
commit
8c99184f6d
6 changed files with 182 additions and 248 deletions
|
@ -1,22 +1,14 @@
|
|||
#!/usr/bin/python3
|
||||
|
||||
import configparser
|
||||
import mysql.connector
|
||||
import os
|
||||
import pyalpm
|
||||
import re
|
||||
|
||||
config = configparser.RawConfigParser()
|
||||
config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config")
|
||||
import aurweb.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')
|
||||
db_path = config.get('aurblup', 'db-path')
|
||||
sync_dbs = config.get('aurblup', 'sync-dbs').split(' ')
|
||||
servers = config.get('aurblup', 'servers').split(' ')
|
||||
db_path = aurweb.config.get('aurblup', 'db-path')
|
||||
sync_dbs = aurweb.config.get('aurblup', 'sync-dbs').split(' ')
|
||||
servers = aurweb.config.get('aurblup', 'servers').split(' ')
|
||||
|
||||
|
||||
def main():
|
||||
|
@ -42,24 +34,21 @@ def main():
|
|||
providers.add((pkg.name, provisionname))
|
||||
repomap[(pkg.name, provisionname)] = repo.name
|
||||
|
||||
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()
|
||||
|
||||
cur.execute("SELECT Name, Provides FROM OfficialProviders")
|
||||
cur = conn.execute("SELECT Name, Provides FROM OfficialProviders")
|
||||
oldproviders = set(cur.fetchall())
|
||||
|
||||
for pkg, provides in providers.difference(oldproviders):
|
||||
repo = repomap[(pkg, provides)]
|
||||
cur.execute("INSERT INTO OfficialProviders (Name, Repo, Provides) "
|
||||
"VALUES (%s, %s, %s)", [pkg, repo, provides])
|
||||
conn.execute("INSERT INTO OfficialProviders (Name, Repo, Provides) "
|
||||
"VALUES (?, ?, ?)", [pkg, repo, provides])
|
||||
for pkg, provides in oldproviders.difference(providers):
|
||||
cur.execute("DELETE FROM OfficialProviders "
|
||||
"WHERE Name = %s AND Provides = %s", [pkg, provides])
|
||||
conn.execute("DELETE FROM OfficialProviders "
|
||||
"WHERE Name = ? AND Provides = ?", [pkg, provides])
|
||||
|
||||
db.commit()
|
||||
db.close()
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue