diff options
Diffstat (limited to 'app/blueprints')
| -rw-r--r-- | app/blueprints/packages/releases.py | 15 | ||||
| -rw-r--r-- | app/blueprints/packages/screenshots.py | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/app/blueprints/packages/releases.py b/app/blueprints/packages/releases.py index 6ef19d2..e160fcf 100644 --- a/app/blueprints/packages/releases.py +++ b/app/blueprints/packages/releases.py @@ -22,7 +22,7 @@ from . import bp from app.rediscache import has_key, set_key, make_download_key from app.models import * -from app.tasks.importtasks import makeVCSRelease +from app.tasks.importtasks import makeVCSRelease, checkZIPRelease from app.utils import * from celery import uuid @@ -98,22 +98,25 @@ def create_release(package): return redirect(url_for("tasks.check", id=rel.task_id, r=rel.getEditURL())) else: - uploadedPath = doFileUpload(form.fileUpload.data, "zip", "a zip file") - if uploadedPath is not None: + uploadedUrl, uploadedPath = doFileUpload(form.fileUpload.data, "zip", "a zip file") + if uploadedUrl is not None: rel = PackageRelease() rel.package = package rel.title = form["title"].data - rel.url = uploadedPath + rel.url = uploadedUrl + rel.task_id = uuid() rel.min_rel = form["min_rel"].data.getActual() rel.max_rel = form["max_rel"].data.getActual() - rel.approve(current_user) db.session.add(rel) db.session.commit() + checkZIPRelease.apply_async((rel.id, uploadedPath), 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(package.getDetailsURL()) + + return redirect(url_for("tasks.check", id=rel.task_id, r=rel.getEditURL())) return render_template("packages/release_new.html", package=package, form=form) diff --git a/app/blueprints/packages/screenshots.py b/app/blueprints/packages/screenshots.py index c7fc7eb..2646e29 100644 --- a/app/blueprints/packages/screenshots.py +++ b/app/blueprints/packages/screenshots.py @@ -50,13 +50,13 @@ def create_screenshot(package, id=None): # Initial form class from post data and default data form = CreateScreenshotForm() if request.method == "POST" and form.validate(): - uploadedPath = doFileUpload(form.fileUpload.data, "image", + uploadedUrl, uploadedPath = doFileUpload(form.fileUpload.data, "image", "a PNG or JPG image file") - if uploadedPath is not None: + if uploadedUrl is not None: ss = PackageScreenshot() ss.package = package ss.title = form["title"].data or "Untitled" - ss.url = uploadedPath + ss.url = uploadedUrl ss.approved = package.checkPerm(current_user, Permission.APPROVE_SCREENSHOT) db.session.add(ss) |