From 6e1921f68b9cdef739cb1bd91b972a47fc7cf7b0 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Thu, 19 Apr 2018 20:20:05 +0100
Subject: [PATCH] Add release ID to JSON download

---
 app/models.py         |  3 +--
 app/views/packages.py |  3 ++-
 setup.py              | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/models.py b/app/models.py
index 188377c..584cc83 100644
--- a/app/models.py
+++ b/app/models.py
@@ -218,6 +218,7 @@ class Package(db.Model):
 			"license": self.license.name,
 			"repo": self.repo,
 			"url": base_url + self.getDownloadURL(),
+			"release": self.getDownloadRelease().id if self.getDownloadRelease() is not None else None,
 			"screenshots": [base_url + ss.url for ss in self.screenshots]
 		}
 
@@ -236,8 +237,6 @@ class Package(db.Model):
 				type=self.type.toName(),
 				author=self.author.username, name=self.name)
 
-
-
 	def getNewScreenshotURL(self):
 		return url_for("create_screenshot_page",
 				type=self.type.toName(),
diff --git a/app/views/packages.py b/app/views/packages.py
index 6428339..1f9d570 100644
--- a/app/views/packages.py
+++ b/app/views/packages.py
@@ -33,7 +33,8 @@ def doPackageList(type):
 		return jsonify(pkgs)
 	else:
 		tags = Tag.query.all()
-		return render_template("packages/list.html", title=title, packages=query.all(), query=search, tags=tags, type=None if type is None else type.toName())
+		return render_template("packages/list.html", title=title, packages=query.all(), \
+				query=search, tags=tags, type=None if type is None else type.toName())
 
 
 @app.route("/packages/")
diff --git a/setup.py b/setup.py
index 0abbd52..2144190 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,29 @@ if not os.path.isfile("db.sqlite"):
 		licenses[row.name] = row
 		db.session.add(row)
 
+	mod = Package()
+	mod.approved = True
+	mod.name = "alpha"
+	mod.title = "Alpha Test"
+	mod.license = licenses["MIT"]
+	mod.type = PackageType.MOD
+	mod.author = ruben
+	mod.tags.append(tags["mapgen"])
+	mod.tags.append(tags["environment"])
+	mod.repo = "https://github.com/ezhh/other_worlds"
+	mod.issueTracker = "https://github.com/ezhh/other_worlds/issues"
+	mod.forums = 16015
+	mod.shortDesc = "The content library should not be used yet as it is still in alpha"
+	mod.desc = "This is the long desc"
+	db.session.add(mod)
+
+	rel = PackageRelease()
+	rel.package = mod
+	rel.title = "v1.0.0"
+	rel.url = "https://github.com/ezhh/handholds/archive/master.zip"
+	rel.approved = True
+	db.session.add(rel)
+
 	mod1 = Package()
 	mod1.approved = True
 	mod1.name = "awards"