Implement package states for easier reviews

[cheatdb.git] / app / blueprints / homepage / __init__.py

diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py
index f029fdeccac4051f0f3be4cf18c141fc72696b74..dfb3bd0388670c3c3b1d7dde343f2c057df4727c 100644 (file)
--- a/app/blueprints/homepage/__init__.py
+++ b/app/blueprints/homepage/__init__.py
@@ -15,7 +15,7 @@ def home():
                        joinedload(Package.license), \
                        joinedload(Package.media_license))
 
-       query   = Package.query.filter_by(approved=True, soft_deleted=False)
+       query   = Package.query.filter_by(state=PackageState.APPROVED)
        count   = query.count()
 
        new     = join(query.order_by(db.desc(Package.approved_at))).limit(8).all()
@@ -24,7 +24,7 @@ def home():
        pop_txp = join(query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score))).limit(4).all()
 
        updated = db.session.query(Package).select_from(PackageRelease).join(Package) \
-                       .filter_by(soft_deleted=False, approved=True) \
+                       .filter_by(state=PackageState.APPROVED) \
                        .order_by(db.desc(PackageRelease.releaseDate)) \
                        .limit(20).all()
        updated = updated[:8]
@@ -34,5 +34,8 @@ def home():
        downloads_result = db.session.query(func.sum(Package.downloads)).one_or_none()
        downloads = 0 if not downloads_result or not downloads_result[0] else downloads_result[0]
 
-       return render_template("index.html", count=count, downloads=downloads, \
+       tags = db.session.query(func.count(Tags.c.tag_id), Tag) \
+               .select_from(Tag).outerjoin(Tags).group_by(Tag.id).order_by(db.asc(Tag.title)).all()
+
+       return render_template("index.html", count=count, downloads=downloads, tags=tags, \
                        new=new, updated=updated, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam, reviews=reviews)