Add JS download card

Fixes #655

Author: rubenwardy

app/blueprints/packages/packages.py

@@ -12,8 +12,8 @@
 from flask_login import login_required, current_user
 from flask_wtf import FlaskForm
 from jinja2.utils import markupsafe
-from sqlalchemy import func, or_, and_
-from sqlalchemy.orm import joinedload, subqueryload
+from sqlalchemy import func, or_, and_, select
+from sqlalchemy.orm import joinedload, subqueryload, Session
 from wtforms import SelectField, StringField, TextAreaField, IntegerField, SubmitField, BooleanField
 from wtforms.validators import InputRequired, Length, Regexp, DataRequired, Optional, URL, NumberRange, ValidationError
 from wtforms_sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
@@ -31,7 +31,7 @@
 from app.models import Package, Tag, db, User, Tags, PackageState, Permission, PackageType, MetaPackage, ForumTopic, \
 	Dependency, Thread, UserRank, PackageReview, PackageDevState, ContentWarning, License, AuditSeverity, \
 	PackageScreenshot, NotificationType, AuditLogEntry, PackageAlias, PackageProvides, PackageGameSupport, \
-	PackageDailyStats, Collection, ReleaseState, PackageAIDisclosure
+	PackageDailyStats, Collection, ReleaseState, PackageAIDisclosure, LuantiRelease, PackageRelease
 from app.utils.models import is_package_page, add_audit_log, get_package_by_info, \
 	add_notification, get_system_user, get_games_from_csv, \
 	post_to_approval_thread
@@ -115,6 +115,41 @@ def user_redirect(author):
 	return redirect(url_for("users.profile", username=author))
 
 
+def get_latest_releases_per_version(session: Session, package_id: int):
+	ranked = (
+		select(
+			LuantiRelease.id,
+			PackageRelease.id,
+			PackageRelease.name,
+			PackageRelease.file_size_bytes,
+			PackageRelease.created_at,
+			func.row_number()
+				.over(
+					partition_by=LuantiRelease.id,
+					order_by=PackageRelease.id.desc()
+				)
+				.label("rn"),
+		)
+		.join(
+			PackageRelease,
+			and_(
+				PackageRelease.package_id == package_id,
+				or_(PackageRelease.min_rel_id == None, PackageRelease.min_rel_id <= LuantiRelease.id),
+				or_(PackageRelease.max_rel_id == None, PackageRelease.max_rel_id >= LuantiRelease.id),
+				PackageRelease.state == ReleaseState.APPROVED,
+			)
+		)
+		.subquery()
+	)
+
+	stmt = select(ranked).where(ranked.c.rn == 1)
+	rows = session.execute(stmt).all()
+	return {
+		luanti_release_id: release
+		for luanti_release_id, *release in rows
+	}
+
+
 @bp.route("/packages/<author>/<name>/")
 @is_package_page
 def view(package):
@@ -169,11 +204,19 @@ def view(package):
 			Collection.packages.contains(package),
 			Collection.name == "favorites").count() > 0
 
+	luanti_versions = LuantiRelease.query.filter(LuantiRelease.protocol > 0).order_by(db.asc(LuantiRelease.id)).all()
+	import time
+	start = time.perf_counter()
+	latest_by_version = get_latest_releases_per_version(db.session, package.id)
+	end = time.perf_counter()
+	elapsed = f'Time taken: {(end - start):.6f} seconds'
+
 	return render_template("packages/view.html",
 			package=package, releases=releases.all(), packages_uses=packages_uses,
 			review_thread=review_thread, threads=threads.all(), reviews=reviews, validation=validation,
 			has_review=has_review, favorites_count=favorites_count, is_favorited=is_favorited,
-			public_collection_count=public_collection_count)
+			public_collection_count=public_collection_count, luanti_versions=luanti_versions,
+			latest_by_version=latest_by_version, elapsed=elapsed)
 
 
 @bp.route("/packages/<author>/<name>/shields/<type>/")

app/models/packages.py

@@ -19,6 +19,8 @@
 from . import db
 from .users import Permission, UserRank, User
 from app.utils.flask import abs_url_for, abs_url
+from app.utils.misc import format_file_size
+
 
 class License(db.Model):
 	id      = db.Column(db.Integer, primary_key=True)
@@ -1426,11 +1428,7 @@ def calculate_file_size_bytes(self):
 
 	@property
 	def file_size(self):
-		size = self.file_size_bytes / 1024
-		if size > 1024:
-			return f"{round(size / 1024, 1)} MB"
-		else:
-			return f"{round(size)} KB"
+		return format_file_size(self.file_size_bytes)
 
 	def get_edit_url(self):
 		return url_for("packages.edit_screenshot",

app/public/static/js/download_card.js

@@ -0,0 +1,71 @@
+// @author rubenwardy
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+
+"use strict";
+
+addEventListener("load", () => {
+	const downloadCard = document.getElementById("download-card");
+	downloadCard.classList.remove("d-none");
+
+	const downloadNoJS = document.getElementById("download-nojs");
+	downloadNoJS.classList.add("d-none");
+
+	const luantiVersion = document.getElementById("luanti-version");
+	luantiVersion.addEventListener("change", () => {
+		setLuantiVersion(luantiVersion.selectedOptions[0]);
+	});
+
+	const luantiVersionId = localStorage.getItem("luanti-version");
+	if (luantiVersionId && document.querySelector(`#luanti-version option[value='${luantiVersionId}']`)) {
+		luantiVersion.value = luantiVersionId;
+	}
+	setLuantiVersion(luantiVersion.selectedOptions[0]);
+});
+
+function setLuantiVersion(version) {
+	if (!version) {
+		return;
+	}
+
+	localStorage.setItem("luanti-version", version.value);
+
+	const {
+		releaseName,
+		releaseUrl,
+		releaseSize,
+		releaseCreatedAt,
+		latest,
+	} = version.dataset;
+
+	const success = document.getElementById("download-success");
+	const noRelease = document.getElementById("download-no-release");
+	const newerLuanti = document.getElementById("download-newer-luanti");
+	if (latest) {
+		newerLuanti.classList.add("d-none");
+	} else {
+		newerLuanti.classList.remove("d-none");
+	}
+
+	if (releaseName) {
+		success.classList.remove("d-none");
+		noRelease.classList.add("d-none");
+
+		const btn = document.querySelector("#download-card .btn-download");
+		btn.setAttribute("href", releaseUrl);
+
+		const size = document.getElementById("download-file-size");
+		if (releaseSize > 1024*1024) {
+			size.textContent = `[${(releaseSize / 1024 / 1024).toFixed(1)} MB]`;
+		} else {
+			size.textContent = `[${(releaseSize / 1024).toFixed(0)} KB]`;
+		}
+
+		const info = document.getElementById("download-release-info");
+		info.textContent = info.dataset.releaseText
+			.replace("@1", releaseName)
+			.replace("@2", releaseCreatedAt);
+	} else {
+		success.classList.add("d-none");
+		noRelease.classList.remove("d-none");
+	}
+}

app/template_filters.py

@@ -15,6 +15,7 @@
 from .models import Permission, Package, PackageState, PackageRelease, ReleaseState
 from app.utils.flask import abs_url_for, url_set_query, url_set_anchor, url_current, abs_url as do_abs_url
 from app.utils.luanti_hypertext import normalize_whitespace as do_normalize_whitespace
+from app.utils.misc import format_file_size as format_file_size_impl
 
 
 @app.context_processor
@@ -121,3 +122,8 @@ def flatten(list):
 	for x in list:
 		ret.extend(x)
 	return ret
+
+
+@app.template_filter()
+def format_file_size(bytes: int):
+	return format_file_size_impl(bytes)