Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2025-01-10 15:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix postReleaseCheckUpdate running twice on release creation

Browse Source
This commit is contained in:
rubenwardy 2020-12-31 18:19:07 +00:00
parent afb699f8d3
commit 6ebab36877
4 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/blueprints/admin/admin.py
View File

@ -26,7 +26,7 @@ from wtforms.validators import InputRequired, Length
from app.models import * from app.models import *
from app.tasks.forumtasks import importTopicList, checkAllForumAccounts from app.tasks.forumtasks import importTopicList, checkAllForumAccounts
from app.tasks.importtasks import importRepoScreenshot, checkZipRelease, updateMetaFromRelease, importForeignDownloads from app.tasks.importtasks import importRepoScreenshot, checkZipRelease, importForeignDownloads
from app.utils import rank_required, addAuditLog, addNotification from app.utils import rank_required, addAuditLog, addNotification
from . import bp from . import bp
@ -64,7 +64,7 @@ def admin_page():
release = package.releases.first() release = package.releases.first()
if release: if release:
zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"]) zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"])
tasks.append(updateMetaFromRelease.s(release.id, zippath)) tasks.append(checkZipRelease.s(release.id, zippath))
result = group(tasks).apply_async() result = group(tasks).apply_async()

4
app/blueprints/packages/packages.py
View File

@ -30,7 +30,7 @@ from wtforms.validators import *
from app.querybuilder import QueryBuilder from app.querybuilder import QueryBuilder
from app.rediscache import has_key, set_key from app.rediscache import has_key, set_key
from app.tasks.importtasks import importRepoScreenshot, updateMetaFromRelease from app.tasks.importtasks import importRepoScreenshot, checkZipRelease
from app.utils import * from app.utils import *
from . import bp from . import bp
@ -545,6 +545,6 @@ def update_from_release(package):
task_id = uuid() task_id = uuid()
zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"]) zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"])
updateMetaFromRelease.apply_async((release.id, zippath), task_id=task_id) checkZipRelease.apply_async((release.id, zippath), task_id=task_id)
return redirect(url_for("tasks.check", id=task_id, r=package.getEditURL())) return redirect(url_for("tasks.check", id=task_id, r=package.getEditURL()))

3
app/blueprints/packages/releases.py
View File

@ -24,7 +24,7 @@ from wtforms.ext.sqlalchemy.fields import QuerySelectField
from wtforms.validators import * from wtforms.validators import *
from app.rediscache import has_key, set_key, make_download_key from app.rediscache import has_key, set_key, make_download_key
from app.tasks.importtasks import makeVCSRelease, checkZipRelease, updateMetaFromRelease from app.tasks.importtasks import makeVCSRelease, checkZipRelease
from app.utils import * from app.utils import *
from . import bp from . import bp
@ -108,7 +108,6 @@ def create_release(package):
db.session.commit() db.session.commit()
checkZipRelease.apply_async((rel.id, uploadedPath), task_id=rel.task_id) checkZipRelease.apply_async((rel.id, uploadedPath), task_id=rel.task_id)
updateMetaFromRelease.delay(rel.id, uploadedPath)
msg = "Release {} created".format(rel.title) msg = "Release {} created".format(rel.title)
addNotification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT, msg, rel.getEditURL(), package) addNotification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT, msg, rel.getEditURL(), package)

21
app/tasks/importtasks.py
View File

@ -169,25 +169,6 @@ def postReleaseCheckUpdate(self, release, path):
raise TaskError(str(err)) raise TaskError(str(err))
@celery.task(bind=True)
def updateMetaFromRelease(self, id, path):
release = PackageRelease.query.get(id)
if release is None:
raise TaskError("No such release!")
elif release.package is None:
raise TaskError("No package attached to release")
print("updateMetaFromRelease: {} for {}/{}" \
.format(id, release.package.author.display_name, release.package.name))
with get_temp_dir() as temp:
with ZipFile(path, 'r') as zip_ref:
zip_ref.extractall(temp)
postReleaseCheckUpdate(self, release, temp)
db.session.commit()
@celery.task(bind=True) @celery.task(bind=True)
def checkZipRelease(self, id, path): def checkZipRelease(self, id, path):
release = PackageRelease.query.get(id) release = PackageRelease.query.get(id)
@ -232,8 +213,6 @@ def makeVCSRelease(self, id, branch):
release.approve(release.package.author) release.approve(release.package.author)
db.session.commit() db.session.commit()
updateMetaFromRelease.delay(release.id, destPath)
return release.url return release.url