Add a main() method to all Python scripts

Move the main program logic of all scripts to main() methods such that
they can be used as modules and easily be invoked by setuptools wrapper
scripts.

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

scripts/aurblup.py

@@ -18,43 +18,49 @@ db_path = config.get('aurblup', 'db-path')
 sync_dbs = config.get('aurblup', 'sync-dbs').split(' ')
 servers = config.get('aurblup', 'servers').split(' ')
 
-blacklist = set()
-providers = set()
-repomap = dict()
 
-h = pyalpm.Handle("/", db_path)
+def main():
-for sync_db in sync_dbs:
+    blacklist = set()
-    repo = h.register_syncdb(sync_db, pyalpm.SIG_DATABASE_OPTIONAL)
+    providers = set()
-    repo.servers = [server.replace("%s", sync_db) for server in servers]
+    repomap = dict()
-    t = h.init_transaction()
-    repo.update(False)
-    t.release()
 
-    for pkg in repo.pkgcache:
+    h = pyalpm.Handle("/", db_path)
-        blacklist.add(pkg.name)
+    for sync_db in sync_dbs:
-        [blacklist.add(x) for x in pkg.replaces]
+        repo = h.register_syncdb(sync_db, pyalpm.SIG_DATABASE_OPTIONAL)
-        providers.add((pkg.name, pkg.name))
+        repo.servers = [server.replace("%s", sync_db) for server in servers]
-        repomap[(pkg.name, pkg.name)] = repo.name
+        t = h.init_transaction()
-        for provision in pkg.provides:
+        repo.update(False)
-            provisionname = re.sub(r'(<|=|>).*', '', provision)
+        t.release()
-            providers.add((pkg.name, provisionname))
-            repomap[(pkg.name, provisionname)] = repo.name
 
-db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
+        for pkg in repo.pkgcache:
-                             passwd=aur_db_pass, db=aur_db_name,
+            blacklist.add(pkg.name)
-                             unix_socket=aur_db_socket, buffered=True)
+            [blacklist.add(x) for x in pkg.replaces]
-cur = db.cursor()
+            providers.add((pkg.name, pkg.name))
+            repomap[(pkg.name, pkg.name)] = repo.name
+            for provision in pkg.provides:
+                provisionname = re.sub(r'(<|=|>).*', '', provision)
+                providers.add((pkg.name, provisionname))
+                repomap[(pkg.name, provisionname)] = repo.name
 
-cur.execute("SELECT Name, Provides FROM OfficialProviders")
+    db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
-oldproviders = set(cur.fetchall())
+                                 passwd=aur_db_pass, db=aur_db_name,
+                                 unix_socket=aur_db_socket, buffered=True)
+    cur = db.cursor()
 
-for pkg, provides in providers.difference(oldproviders):
+    cur.execute("SELECT Name, Provides FROM OfficialProviders")
-    repo = repomap[(pkg, provides)]
+    oldproviders = set(cur.fetchall())
-    cur.execute("INSERT INTO OfficialProviders (Name, Repo, Provides) "
-                "VALUES (%s, %s, %s)", [pkg, repo, provides])
-for pkg, provides in oldproviders.difference(providers):
-    cur.execute("DELETE FROM OfficialProviders "
-                "WHERE Name = %s AND Provides = %s", [pkg, provides])
 
-db.commit()
+    for pkg, provides in providers.difference(oldproviders):
-db.close()
+        repo = repomap[(pkg, provides)]
+        cur.execute("INSERT INTO OfficialProviders (Name, Repo, Provides) "
+                    "VALUES (%s, %s, %s)", [pkg, repo, provides])
+    for pkg, provides in oldproviders.difference(providers):
+        cur.execute("DELETE FROM OfficialProviders "
+                    "WHERE Name = %s AND Provides = %s", [pkg, provides])
+
+    db.commit()
+    db.close()
+
+
+if __name__ == '__main__':
+    main()

scripts/mkpkglists.py

@@ -17,25 +17,33 @@ aur_db_user = config.get('database', 'user')
 aur_db_pass = config.get('database', 'password')
 aur_db_socket = config.get('database', 'socket')
 
-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()
 
-datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
+def main():
-pkglist_header = "# AUR package list, generated on " + datestr
+    db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
-pkgbaselist_header = "# AUR package base list, generated on " + datestr
+                                 passwd=aur_db_pass, db=aur_db_name,
+                                 unix_socket=aur_db_socket, buffered=True)
+    cur = db.cursor()
 
-with gzip.open(docroot + "packages.gz", "w") as f:
+    datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
-    f.write(bytes(pkglist_header + "\n", "UTF-8"))
+    pkglist_header = "# AUR package list, generated on " + datestr
-    cur.execute("SELECT Packages.Name FROM Packages INNER JOIN PackageBases " +
+    pkgbaselist_header = "# AUR package base list, generated on " + datestr
-                "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:
+    with gzip.open(docroot + "packages.gz", "w") as f:
-    f.write(bytes(pkgbaselist_header + "\n", "UTF-8"))
+        f.write(bytes(pkglist_header + "\n", "UTF-8"))
-    cur.execute("SELECT Name FROM PackageBases WHERE PackagerUID IS NOT NULL")
+        cur.execute("SELECT Packages.Name FROM Packages " +
-    f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+                    "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()])
 
-db.close()
+    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")
+        f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()])
+
+    db.close()
+
+
+if __name__ == '__main__':
+    main()

scripts/notify.py

@@ -427,7 +427,7 @@ def tu_vote_reminder(cur, vote_id):
     send_notification(to, subject, body, refs)
 
 
-if __name__ == '__main__':
+def main():
     action = sys.argv[1]
     action_map = {
         'send-resetkey': send_resetkey,
@@ -454,3 +454,7 @@ if __name__ == '__main__':
 
     db.commit()
     db.close()
+
+
+if __name__ == '__main__':
+    main()

scripts/pkgmaint.py

@@ -13,13 +13,20 @@ aur_db_user = config.get('database', 'user')
 aur_db_pass = config.get('database', 'password')
 aur_db_socket = config.get('database', 'socket')
 
-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("DELETE FROM PackageBases WHERE " +
+def main():
-            "UNIX_TIMESTAMP() - SubmittedTS > 86400 AND PackagerUID IS NULL")
+    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()
 
-db.commit()
+    cur.execute("DELETE FROM PackageBases WHERE " +
-db.close()
+                "UNIX_TIMESTAMP() - SubmittedTS > 86400 " +
+                "AND PackagerUID IS NULL")
+
+    db.commit()
+    db.close()
+
+
+if __name__ == '__main__':
+    main()

scripts/popupdate.py

@@ -13,18 +13,25 @@ aur_db_user = config.get('database', 'user')
 aur_db_pass = config.get('database', 'password')
 aur_db_socket = config.get('database', 'socket')
 
-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 " +
+def main():
-            "PackageVotes WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
+    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 Popularity = (" +
+    cur.execute("UPDATE PackageBases SET NumVotes = (" +
-            "SELECT COALESCE(SUM(POWER(0.98, (UNIX_TIMESTAMP() - VoteTS) / 86400)), 0.0) " +
+                "SELECT COUNT(*) FROM PackageVotes " +
-            "FROM PackageVotes WHERE PackageVotes.PackageBaseID = " +
+                "WHERE PackageVotes.PackageBaseID = PackageBases.ID)")
-            "PackageBases.ID AND NOT VoteTS IS NULL)")
 
-db.commit()
+    cur.execute("UPDATE PackageBases SET Popularity = (" +
-db.close()
+                "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()
+
+
+if __name__ == '__main__':
+    main()

scripts/tuvotereminder.py

@@ -16,17 +16,23 @@ aur_db_pass = config.get('database', 'password')
 aur_db_socket = config.get('database', 'socket')
 notify_cmd = config.get('notifications', 'notify-cmd')
 
-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()
 
-now = int(time.time())
+def main():
-filter_from = now + 500
+    db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
-filter_to = now + 172800
+                                 passwd=aur_db_pass, db=aur_db_name,
+                                 unix_socket=aur_db_socket, buffered=True)
+    cur = db.cursor()
 
-cur.execute("SELECT ID FROM TU_VoteInfo WHERE End >= %s AND End <= %s",
+    now = int(time.time())
-            [filter_from, filter_to])
+    filter_from = now + 500
+    filter_to = now + 172800
 
-for vote_id in [row[0] for row in cur.fetchall()]:
+    cur.execute("SELECT ID FROM TU_VoteInfo WHERE End >= %s AND End <= %s",
-    subprocess.Popen((notify_cmd, 'tu-vote-reminder', str(vote_id)))
+                [filter_from, filter_to])
+
+    for vote_id in [row[0] for row in cur.fetchall()]:
+        subprocess.Popen((notify_cmd, 'tu-vote-reminder', str(vote_id)))
+
+
+if __name__ == '__main__':
+    main()