Add download counter to home page

diff --git a/app/templates/index.html b/app/templates/index.html
index 210cc8420649465232357b2f05dd10dfa9ec7a8a..e11b3c873ee291c937219885c7b155d3cc61030e 100644 (file)
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -51,7 +51,7 @@ Welcome
 
        <div class="text-center">
                <small>
-                       CDB has {{ count }} packages available to download.
+                       CDB has {{ count }} packages, with a total of {{ downloads }} downloads.
                </small>
        </div>
 <!-- </main> -->

diff --git a/app/views/__init__.py b/app/views/__init__.py
index 303ed2a86557f5ad79d7d71749b91d6fd1ef2195..c99ca03fe7d8072d6f52b70998dc4683e032ce21 100644 (file)
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -22,6 +22,7 @@ from app.models import *
 import flask_menu as menu
 from werkzeug.contrib.cache import SimpleCache
 from urllib.parse import urlparse
+from sqlalchemy.sql.expression import func
 cache = SimpleCache()
 
 @app.template_filter()
@@ -53,7 +54,8 @@ def home_page():
        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()
-       return render_template("index.html", count=count, \
+       downloads = db.session.query(func.sum(PackageRelease.downloads)).first()[0]
+       return render_template("index.html", count=count, downloads=downloads, \
                        new=new, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam)
 
 from . import users, packages, meta, threads, api