Sort "recently added" by approved_at

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

diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py
index 0d50bbd1e0141a67ab591de3254d0957d4c65e9d..f029fdeccac4051f0f3be4cf18c141fc72696b74 100644 (file)
--- a/app/blueprints/homepage/__init__.py
+++ b/app/blueprints/homepage/__init__.py
@@ -4,17 +4,35 @@ bp = Blueprint("homepage", __name__)
 
 from app.models import *
 import flask_menu as menu
+from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import func
 
 @bp.route("/")
 @menu.register_menu(bp, ".", "Home")
-def home_page():
+def home():
+       def join(query):
+               return query.options( \
+                       joinedload(Package.license), \
+                       joinedload(Package.media_license))
+
        query   = Package.query.filter_by(approved=True, soft_deleted=False)
        count   = query.count()
-       new     = query.order_by(db.desc(Package.created_at)).limit(8).all()
-       pop_mod = query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score)).limit(8).all()
-       pop_gam = query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score)).limit(4).all()
-       pop_txp = query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score)).limit(4).all()
-       downloads = db.session.query(func.sum(PackageRelease.downloads)).first()[0]
+
+       new     = join(query.order_by(db.desc(Package.approved_at))).limit(8).all()
+       pop_mod = join(query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score))).limit(8).all()
+       pop_gam = join(query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score))).limit(4).all()
+       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) \
+                       .order_by(db.desc(PackageRelease.releaseDate)) \
+                       .limit(20).all()
+       updated = updated[:8]
+
+       reviews = PackageReview.query.filter_by(recommends=True).order_by(db.desc(PackageReview.created_at)).limit(5).all()
+
+       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, \
-                       new=new, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam)
+                       new=new, updated=updated, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam, reviews=reviews)