From 286207ffa212cbe2cdc3c2e5abc511f3c7d6fcad Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sat, 28 Jul 2018 18:33:36 +0100
Subject: [PATCH] Add release specific download URL

---
 app/models.py                    |  7 +++++++
 app/templates/packages/view.html |  2 +-
 app/views/packages/releases.py   | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/models.py b/app/models.py
index 8f71146..2ce6647 100644
--- a/app/models.py
+++ b/app/models.py
@@ -608,6 +608,13 @@ class PackageRelease(db.Model):
 				name=self.package.name,
 				id=self.id)
 
+	def getDownloadURL(self):
+		return url_for("download_release_page",
+				author=self.package.author.username,
+				name=self.package.name,
+				id=self.id)
+
+
 	def __init__(self):
 		self.releaseDate = datetime.now()
 
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index eb9196d..f5ff628 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -196,7 +196,7 @@
 				<li>
 					{% if not rel.approved %}<i>{% endif %}
 
-					<a href="{{ rel.url }}">{{ rel.title }}</a>{% if rel.commit_hash %}
+					<a href="{{ rel.getDownloadURL() }}">{{ rel.title }}</a>{% if rel.commit_hash %}
 					[{{ rel.commit_hash | truncate(5, end='') }}]{% endif %},
 					created {{ rel.releaseDate | datetime }}.
 					{% if rel.task_id %}
diff --git a/app/views/packages/releases.py b/app/views/packages/releases.py
index b6f5b20..2aeca24 100644
--- a/app/views/packages/releases.py
+++ b/app/views/packages/releases.py
@@ -91,6 +91,23 @@ def create_release_page(package):
 
 	return render_template("packages/release_new.html", package=package, form=form)
 
+@app.route("/packages/<author>/<name>/releases/<id>/download/")
+@is_package_page
+def download_release_page(package, id):
+	release = PackageRelease.query.get(id)
+	if release is None or release.package != package:
+		abort(404)
+
+	if release is None:
+		if "application/zip" in request.accept_mimetypes and \
+				not "text/html" in request.accept_mimetypes:
+			return "", 204
+		else:
+			flash("No download available.", "error")
+			return redirect(package.getDetailsURL())
+	else:
+		return redirect(release.url, code=300)
+
 @app.route("/packages/<author>/<name>/releases/<id>/", methods=["GET", "POST"])
 @login_required
 @is_package_page