Add release ID to JSON download

This commit is contained in:
rubenwardy 2018-04-19 20:20:05 +01:00
parent 060d60ba46
commit 6e1921f68b
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
3 changed files with 26 additions and 3 deletions

@ -218,6 +218,7 @@ class Package(db.Model):
"license": self.license.name, "license": self.license.name,
"repo": self.repo, "repo": self.repo,
"url": base_url + self.getDownloadURL(), "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] "screenshots": [base_url + ss.url for ss in self.screenshots]
} }
@ -236,8 +237,6 @@ class Package(db.Model):
type=self.type.toName(), type=self.type.toName(),
author=self.author.username, name=self.name) author=self.author.username, name=self.name)
def getNewScreenshotURL(self): def getNewScreenshotURL(self):
return url_for("create_screenshot_page", return url_for("create_screenshot_page",
type=self.type.toName(), type=self.type.toName(),

@ -33,7 +33,8 @@ def doPackageList(type):
return jsonify(pkgs) return jsonify(pkgs)
else: else:
tags = Tag.query.all() 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/") @app.route("/packages/")

@ -52,6 +52,29 @@ if not os.path.isfile("db.sqlite"):
licenses[row.name] = row licenses[row.name] = row
db.session.add(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 = Package()
mod1.approved = True mod1.approved = True
mod1.name = "awards" mod1.name = "awards"