Add ability to delete unused metapackages

2 files changed, 14 insertions, 1 deletions

diff --git a/app/blueprints/admin/admin.py b/app/blueprints/admin/admin.py
index d6f9965..50ea64f 100644
--- a/app/blueprints/admin/admin.py
+++ b/app/blueprints/admin/admin.py
@@ -150,6 +150,16 @@ def admin_page():
 			else:
 				flash("No downloads to create", "danger")
 
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "delmetapackages":
+			query = MetaPackage.query.filter(~MetaPackage.dependencies.any(), ~MetaPackage.packages.any())
+			count = query.count()
+			query.delete(synchronize_session=False)
+			db.session.commit()
+
+			flash("Deleted " + str(count) + " unused meta packages", "success")
+			return redirect(url_for("admin.admin_page"))
 		else:
 			flash("Unknown action: " + action, "danger")
 
diff --git a/app/blueprints/metapackages/__init__.py b/app/blueprints/metapackages/__init__.py
index ef9f803..6d32e65 100644
--- a/app/blueprints/metapackages/__init__.py
+++ b/app/blueprints/metapackages/__init__.py
@@ -24,7 +24,10 @@ from app.models import *
 
 @bp.route("/metapackages/")
 def list_all():
-	mpackages = MetaPackage.query.order_by(db.asc(MetaPackage.name)).all()
+	mpackages = db.session.query(MetaPackage, func.count(MetaPackage.id)) \
+			.select_from(MetaPackage).outerjoin(MetaPackage.packages) \
+			.order_by(db.asc(MetaPackage.name)) \
+			.group_by(MetaPackage.id).all()
 	return render_template("meta/list.html", mpackages=mpackages)
 
 @bp.route("/metapackages/<name>/")