diff options
| author | rubenwardy <rw@rubenwardy.com> | 2018-05-25 17:28:32 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2018-05-25 17:28:32 +0100 |
| commit | 9d91d337d5fc099195a756d331c27bc0780f5ce7 (patch) | |
| tree | e3784865993635532a1557c5ba9b3644fa227279 /app/views/packages | |
| parent | 71308d25d593223037c4d8b1e0b150a8b06f9311 (diff) | |
| download | cheatdb-9d91d337d5fc099195a756d331c27bc0780f5ce7.tar.xz | |
Move package endpoints to submodule
Diffstat (limited to 'app/views/packages')
| -rw-r--r-- | app/views/packages/__init__.py | 201 | ||||
| -rw-r--r-- | app/views/packages/editrequests.py | 170 | ||||
| -rw-r--r-- | app/views/packages/releases.py | 132 | ||||
| -rw-r--r-- | app/views/packages/screenshots.py | 60 | ||||
| -rw-r--r-- | app/views/packages/todo.py | 40 |
5 files changed, 603 insertions, 0 deletions
diff --git a/app/views/packages/__init__.py b/app/views/packages/__init__.py new file mode 100644 index 0000000..c280666 --- /dev/null +++ b/app/views/packages/__init__.py @@ -0,0 +1,201 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + + +from flask import * +from flask_user import * +from flask.ext import menu +from app import app +from app.models import * +from app.tasks.importtasks import importRepoScreenshot, makeVCSRelease + +from app.utils import * + +from celery import uuid +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField + +# TODO: the following could be made into one route, except I"m not sure how +# to do the menu + +@menu.register_menu(app, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' }) +@menu.register_menu(app, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' }) +@menu.register_menu(app, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' }) +@app.route("/packages/") +def packages_page(): + type = request.args.get("type") + if type is not None: + type = PackageType[type.upper()] + + title = "Packages" + query = Package.query + + if type is not None: + title = type.value + "s" + query = query.filter_by(type=type, approved=True) + + search = request.args.get("q") + if search is not None: + query = query.filter(Package.title.contains(search)) + + if shouldReturnJson(): + pkgs = [package.getAsDictionary(app.config["BASE_URL"]) \ + for package in query.all() if package.getDownloadRelease() is not None] + 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()) + + +def getReleases(package): + if package.checkPerm(current_user, Permission.MAKE_RELEASE): + return package.releases + else: + return [rel for rel in package.releases if rel.approved] + + +@app.route("/packages/<author>/<name>/") +@is_package_page +def package_page(package): + if shouldReturnJson(): + return jsonify(package.getAsDictionary(app.config["BASE_URL"])) + else: + clearNotifications(package.getDetailsURL()) + + releases = getReleases(package) + requests = [r for r in package.requests if r.status == 0] + return render_template("packages/view.html", package=package, releases=releases, requests=requests) + + +@app.route("/packages/<author>/<name>/download/") +@is_package_page +def package_download_page(package): + release = package.getDownloadRelease() + + 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=302) + + +class PackageForm(FlaskForm): + name = StringField("Name", [InputRequired(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")]) + title = StringField("Title", [InputRequired(), Length(3, 50)]) + shortDesc = StringField("Short Description", [InputRequired(), Length(1,200)]) + desc = TextAreaField("Long Description", [Optional(), Length(0,10000)]) + type = SelectField("Type", [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.MOD) + license = QuerySelectField("License", [InputRequired()], query_factory=lambda: License.query, get_pk=lambda a: a.id, get_label=lambda a: a.name) + tags = QuerySelectMultipleField('Tags', query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)), get_pk=lambda a: a.id, get_label=lambda a: a.title) + harddeps = QuerySelectMultipleField('Dependencies', query_factory=lambda: Package.query.join(User).order_by(db.asc(Package.title), db.asc(User.display_name)), get_pk=lambda a: a.id, get_label=lambda a: a.title + " by " + a.author.display_name) + softdeps = QuerySelectMultipleField('Soft Dependencies', query_factory=lambda: Package.query.join(User).order_by(db.asc(Package.title), db.asc(User.display_name)), get_pk=lambda a: a.id, get_label=lambda a: a.title + " by " + a.author.display_name) + repo = StringField("Repo URL", [Optional(), URL()]) + website = StringField("Website URL", [Optional(), URL()]) + issueTracker = StringField("Issue Tracker URL", [Optional(), URL()]) + forums = IntegerField("Forum Topic ID", [Optional(), NumberRange(0,999999)]) + submit = SubmitField("Save") + +@app.route("/packages/new/", methods=["GET", "POST"]) +@app.route("/packages/<author>/<name>/edit/", methods=["GET", "POST"]) +@login_required +def create_edit_package_page(author=None, name=None): + package = None + form = None + if author is None: + form = PackageForm(formdata=request.form) + author = request.args.get("author") + if author is None or author == current_user.username: + author = current_user + else: + author = User.query.filter_by(username=author).first() + if author is None: + flash("Unable to find that user", "error") + return redirect(url_for("create_edit_package_page")) + + if not author.checkPerm(current_user, Permission.CHANGE_AUTHOR): + flash("Permission denied", "error") + return redirect(url_for("create_edit_package_page")) + + else: + package = getPackageByInfo(author, name) + if not package.checkPerm(current_user, Permission.EDIT_PACKAGE): + return redirect(package.getDetailsURL()) + + author = package.author + + form = PackageForm(formdata=request.form, obj=package) + + # Initial form class from post data and default data + if request.method == "POST" and form.validate(): + wasNew = False + if not package: + package = Package.query.filter_by(name=form["name"].data, author_id=author.id).first() + if package is not None: + flash("Package already exists!", "error") + return redirect(url_for("create_edit_package_page")) + + package = Package() + package.author = author + wasNew = True + else: + triggerNotif(package.author, current_user, + "{} edited".format(package.title), package.getDetailsURL()) + + form.populate_obj(package) # copy to row + + package.tags.clear() + for tag in form.tags.raw_data: + package.tags.append(Tag.query.get(tag)) + + db.session.commit() # save + + if wasNew and package.canImportScreenshot(): + task = importRepoScreenshot.delay(package.id) + return redirect(url_for("check_task", id=task.id, r=package.getDetailsURL())) + + return redirect(package.getDetailsURL()) + + enableWizard = name is None and request.method != "POST" + return render_template("packages/create_edit.html", package=package, \ + form=form, author=author, enable_wizard=enableWizard) + +@app.route("/packages/<author>/<name>/approve/", methods=["POST"]) +@login_required +@is_package_page +def approve_package_page(package): + if not package.checkPerm(current_user, Permission.APPROVE_NEW): + flash("You don't have permission to do that.", "error") + + elif package.approved: + flash("Package has already been approved", "error") + + else: + package.approved = True + + triggerNotif(package.author, current_user, + "{} approved".format(package.title), package.getDetailsURL()) + db.session.commit() + + return redirect(package.getDetailsURL()) + +from . import todo, screenshots, editrequests, releases diff --git a/app/views/packages/editrequests.py b/app/views/packages/editrequests.py new file mode 100644 index 0000000..51d5989 --- /dev/null +++ b/app/views/packages/editrequests.py @@ -0,0 +1,170 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + + +from flask import * +from flask_user import * +from flask.ext import menu +from app import app +from app.models import * + +from app.utils import * + +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField + +from . import PackageForm + + +class EditRequestForm(PackageForm): + edit_title = StringField("Edit Title", [InputRequired(), Length(1, 100)]) + edit_desc = TextField("Edit Description", [Optional()]) + +@app.route("/packages/<author>/<name>/requests/new/", methods=["GET","POST"]) +@app.route("/packages/<author>/<name>/requests/<id>/edit/", methods=["GET","POST"]) +@login_required +@is_package_page +def create_edit_editrequest_page(package, id=None): + edited_package = package + + erequest = None + if id is not None: + erequest = EditRequest.query.get(id) + if erequest.package != package: + abort(404) + + if not erequest.checkPerm(current_user, Permission.EDIT_EDITREQUEST): + abort(403) + + if erequest.status != 0: + flash("Can't edit EditRequest, it has already been merged or rejected", "error") + return redirect(erequest.getURL()) + + edited_package = Package(package) + erequest.applyAll(edited_package) + + + form = EditRequestForm(request.form, obj=edited_package) + if request.method == "POST" and form.validate(): + if erequest is None: + erequest = EditRequest() + erequest.package = package + erequest.author = current_user + + erequest.title = form["edit_title"].data + erequest.desc = form["edit_desc"].data + db.session.add(erequest) + + EditRequestChange.query.filter_by(request=erequest).delete() + + wasChangeMade = False + for e in PackagePropertyKey: + newValue = form[e.name].data + oldValue = getattr(package, e.name) + + newValueComp = newValue + oldValueComp = oldValue + if type(newValue) is str: + newValue = newValue.replace("\r\n", "\n") + newValueComp = newValue.strip() + oldValueComp = "" if oldValue is None else oldValue.strip() + + if newValueComp != oldValueComp: + change = EditRequestChange() + change.request = erequest + change.key = e + change.oldValue = e.convert(oldValue) + change.newValue = e.convert(newValue) + db.session.add(change) + wasChangeMade = True + + if wasChangeMade: + msg = "{}: Edit request #{} {}" \ + .format(package.title, erequest.id, "created" if id is None else "edited") + triggerNotif(package.author, current_user, msg, erequest.getURL()) + triggerNotif(erequest.author, current_user, msg, erequest.getURL()) + db.session.commit() + return redirect(erequest.getURL()) + else: + flash("No changes detected", "warning") + elif erequest is not None: + form["edit_title"].data = erequest.title + form["edit_desc"].data = erequest.desc + + return render_template("packages/editrequest_create_edit.html", package=package, form=form) + + +@app.route("/packages/<author>/<name>/requests/<id>/") +@is_package_page +def view_editrequest_page(package, id): + erequest = EditRequest.query.get(id) + if erequest is None or erequest.package != package: + abort(404) + + clearNotifications(erequest.getURL()) + return render_template("packages/editrequest_view.html", package=package, request=erequest) + + +@app.route("/packages/<author>/<name>/requests/<id>/approve/", methods=["POST"]) +@is_package_page +def approve_editrequest_page(package, id): + if not package.checkPerm(current_user, Permission.APPROVE_CHANGES): + flash("You don't have permission to do that.", "error") + return redirect(package.getDetailsURL()) + + erequest = EditRequest.query.get(id) + if erequest is None or erequest.package != package: + abort(404) + + if erequest.status != 0: + flash("Edit request has already been resolved", "error") + + else: + erequest.status = 1 + erequest.applyAll(package) + + msg = "{}: Edit request #{} merged".format(package.title, erequest.id) + triggerNotif(erequest.author, current_user, msg, erequest.getURL()) + triggerNotif(package.author, current_user, msg, erequest.getURL()) + db.session.commit() + + return redirect(package.getDetailsURL()) + +@app.route("/packages/<author>/<name>/requests/<id>/reject/", methods=["POST"]) +@is_package_page +def reject_editrequest_page(package, id): + if not package.checkPerm(current_user, Permission.APPROVE_CHANGES): + flash("You don't have permission to do that.", "error") + return redirect(package.getDetailsURL()) + + erequest = EditRequest.query.get(id) + if erequest is None or erequest.package != package: + abort(404) + + if erequest.status != 0: + flash("Edit request has already been resolved", "error") + + else: + erequest.status = 2 + + msg = "{}: Edit request #{} rejected".format(package.title, erequest.id) + triggerNotif(erequest.author, current_user, msg, erequest.getURL()) + triggerNotif(package.author, current_user, msg, erequest.getURL()) + db.session.commit() + + return redirect(package.getDetailsURL()) diff --git a/app/views/packages/releases.py b/app/views/packages/releases.py new file mode 100644 index 0000000..96a7507 --- /dev/null +++ b/app/views/packages/releases.py @@ -0,0 +1,132 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + + +from flask import * +from flask_user import * +from flask.ext import menu +from app import app +from app.models import * +from app.tasks.importtasks import makeVCSRelease + +from app.utils import * + +from celery import uuid +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * + +class CreatePackageReleaseForm(FlaskForm): + name = StringField("Name") + title = StringField("Title") + uploadOpt = RadioField ("Method", choices=[("upload", "File Upload")], default="upload") + vcsLabel = StringField("VCS Commit or Branch", default="master") + fileUpload = FileField("File Upload") + submit = SubmitField("Save") + +class EditPackageReleaseForm(FlaskForm): + name = StringField("Name") + title = StringField("Title") + url = StringField("URL", [URL]) + task_id = StringField("Task ID") + approved = BooleanField("Is Approved") + submit = SubmitField("Save") + +@app.route("/packages/<author>/<name>/releases/new/", methods=["GET", "POST"]) +@login_required +@is_package_page +def create_release_page(package): + if not package.checkPerm(current_user, Permission.MAKE_RELEASE): + return redirect(package.getDetailsURL()) + + # Initial form class from post data and default data + form = CreatePackageReleaseForm() + if package.canMakeReleaseFromVCS(): + form["uploadOpt"].choices = [("vcs", "From VCS Commit or Branch"), ("upload", "File Upload")] + if request.method != "POST": + form["uploadOpt"].data = "vcs" + + if request.method == "POST" and form.validate(): + if form["uploadOpt"].data == "vcs": + rel = PackageRelease() + rel.package = package + rel.title = form["title"].data + rel.url = "" + rel.task_id = uuid() + db.session.add(rel) + db.session.commit() + + makeVCSRelease.apply_async((rel.id, form["vcsLabel"].data), task_id=rel.task_id) + + msg = "{}: Release {} created".format(package.title, rel.title) + triggerNotif(package.author, current_user, msg, rel.getEditURL()) + db.session.commit() + + return redirect(url_for("check_task", id=rel.task_id, r=rel.getEditURL())) + else: + uploadedPath = doFileUpload(form.fileUpload.data, ["zip"], "a zip file") + if uploadedPath is not None: + rel = PackageRelease() + rel.package = package + rel.title = form["title"].data + rel.url = uploadedPath + db.session.add(rel) + db.session.commit() + + msg = "{}: Release {} created".format(package.title, rel.title) + triggerNotif(package.author, current_user, msg, rel.getEditURL()) + db.session.commit() + return redirect(package.getDetailsURL()) + + return render_template("packages/release_new.html", package=package, form=form) + +@app.route("/packages/<author>/<name>/releases/<id>/", methods=["GET", "POST"]) +@login_required +@is_package_page +def edit_release_page(package, id): + release = PackageRelease.query.get(id) + if release is None or release.package != package: + abort(404) + + clearNotifications(release.getEditURL()) + + canEdit = package.checkPerm(current_user, Permission.MAKE_RELEASE) + canApprove = package.checkPerm(current_user, Permission.APPROVE_RELEASE) + if not (canEdit or canApprove): + return redirect(package.getDetailsURL()) + + # Initial form class from post data and default data + form = EditPackageReleaseForm(formdata=request.form, obj=release) + if request.method == "POST" and form.validate(): + wasApproved = release.approved + if canEdit: + release.title = form["title"].data + + if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL): + release.url = form["url"].data + release.task_id = form["task_id"].data + if release.task_id.strip() == "": + release.task_id = None + + if canApprove: + release.approved = form["approved"].data + else: + release.approved = wasApproved + + db.session.commit() + return redirect(package.getDetailsURL()) + + return render_template("packages/release_edit.html", package=package, release=release, form=form) diff --git a/app/views/packages/screenshots.py b/app/views/packages/screenshots.py new file mode 100644 index 0000000..7ffb70e --- /dev/null +++ b/app/views/packages/screenshots.py @@ -0,0 +1,60 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + + +from flask import * +from flask_user import * +from app import app +from app.models import * + +from app.utils import * + +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * + + +class CreateScreenshotForm(FlaskForm): + title = StringField("Title/Caption", [Optional()]) + fileUpload = FileField("File Upload", [InputRequired()]) + submit = SubmitField("Save") + +@app.route("/packages/<author>/<name>/screenshots/new/", methods=["GET", "POST"]) +@login_required +@is_package_page +def create_screenshot_page(package): + if not package.checkPerm(current_user, Permission.MAKE_RELEASE): + return redirect(package.getDetailsURL()) + + # Initial form class from post data and default data + form = CreateScreenshotForm() + if request.method == "POST" and form.validate(): + uploadedPath = doFileUpload(form.fileUpload.data, ["png", "jpg", "jpeg"], + "a PNG or JPG image file") + if uploadedPath is not None: + ss = PackageScreenshot() + ss.package = package + ss.title = form["title"].data + ss.url = uploadedPath + db.session.add(ss) + + msg = "{}: Screenshot added {}" \ + .format(package.title, ss.title) + triggerNotif(package.author, current_user, msg, package.getDetailsURL()) + db.session.commit() + return redirect(package.getDetailsURL()) + + return render_template("packages/screenshot_new.html", package=package, form=form) diff --git a/app/views/packages/todo.py b/app/views/packages/todo.py new file mode 100644 index 0000000..53fec73 --- /dev/null +++ b/app/views/packages/todo.py @@ -0,0 +1,40 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + + +from flask import * +from flask_user import * +from flask.ext import menu +from app import app +from app.models import * + +@app.route("/todo/") +@login_required +def todo_page(): + canApproveNew = Permission.APPROVE_NEW.check(current_user) + canApproveRel = Permission.APPROVE_RELEASE.check(current_user) + + packages = None + if canApproveNew: + packages = Package.query.filter_by(approved=False).all() + + releases = None + if canApproveRel: + releases = PackageRelease.query.filter_by(approved=False).all() + + return render_template("todo.html", title="Reports and Work Queue", + approve_new=packages, releases=releases, + canApproveNew=canApproveNew, canApproveRel=canApproveRel) |
