Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-22 22:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error creating releases from certain git references

Browse Source 
Fixes #249
This commit is contained in:
rubenwardy 2020-12-14 21:05:56 +00:00
parent 4820d11ce3
commit c7aecd32be
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ def create_release(package):
db.session.add(rel) db.session.add(rel)
db.session.commit() db.session.commit()
makeVCSRelease.apply_async((rel.id, form["vcsLabel"].data), task_id=rel.task_id) makeVCSRelease.apply_async((rel.id, nonEmptyOrNone(form.vcsLabel.data)), task_id=rel.task_id)
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)

18
app/tasks/importtasks.py
View File

@ -35,7 +35,7 @@ def generateGitURL(urlstr):
@contextlib.contextmanager @contextlib.contextmanager
def getTempDir(): def get_temp_dir():
temp = os.path.join(tempfile.gettempdir(), randomString(10)) temp = os.path.join(tempfile.gettempdir(), randomString(10))
yield temp yield temp
shutil.rmtree(temp) shutil.rmtree(temp)
@ -46,7 +46,7 @@ def getTempDir():
# Throws `TaskError` on failure. # Throws `TaskError` on failure.
# Caller is responsible for deleting returned directory. # Caller is responsible for deleting returned directory.
@contextlib.contextmanager @contextlib.contextmanager
def cloneRepo(urlstr, ref=None, recursive=False): def clone_repo(urlstr, ref=None, recursive=False):
gitDir = os.path.join(tempfile.gettempdir(), randomString(10)) gitDir = os.path.join(tempfile.gettempdir(), randomString(10))
err = None err = None
@ -58,11 +58,13 @@ def cloneRepo(urlstr, ref=None, recursive=False):
repo = git.Repo.clone_from(gitUrl, gitDir, repo = git.Repo.clone_from(gitUrl, gitDir,
progress=None, env=None, depth=1, recursive=recursive, kill_after_timeout=15) progress=None, env=None, depth=1, recursive=recursive, kill_after_timeout=15)
else: else:
assert ref != ""
repo = git.Repo.init(gitDir) repo = git.Repo.init(gitDir)
origin = repo.create_remote("origin", url=gitUrl) origin = repo.create_remote("origin", url=gitUrl)
assert origin.exists() assert origin.exists()
origin.fetch() origin.fetch()
origin.pull(ref) repo.git.checkout(ref)
for submodule in repo.submodules: for submodule in repo.submodules:
submodule.update(init=True) submodule.update(init=True)
@ -85,7 +87,7 @@ def cloneRepo(urlstr, ref=None, recursive=False):
@celery.task() @celery.task()
def getMeta(urlstr, author): def getMeta(urlstr, author):
with cloneRepo(urlstr, recursive=True) as repo: with clone_repo(urlstr, recursive=True) as repo:
try: try:
tree = build_tree(repo.working_tree_dir, author=author, repo=urlstr) tree = build_tree(repo.working_tree_dir, author=author, repo=urlstr)
except MinetestCheckError as err: except MinetestCheckError as err:
@ -178,7 +180,7 @@ def updateMetaFromRelease(self, id, path):
print("updateMetaFromRelease: {} for {}/{}" \ print("updateMetaFromRelease: {} for {}/{}" \
.format(id, release.package.author.display_name, release.package.name)) .format(id, release.package.author.display_name, release.package.name))
with getTempDir() as temp: with get_temp_dir() as temp:
with ZipFile(path, 'r') as zip_ref: with ZipFile(path, 'r') as zip_ref:
zip_ref.extractall(temp) zip_ref.extractall(temp)
@ -194,7 +196,7 @@ def checkZipRelease(self, id, path):
elif release.package is None: elif release.package is None:
raise TaskError("No package attached to release") raise TaskError("No package attached to release")
with getTempDir() as temp: with get_temp_dir() as temp:
with ZipFile(path, 'r') as zip_ref: with ZipFile(path, 'r') as zip_ref:
zip_ref.extractall(temp) zip_ref.extractall(temp)
@ -213,7 +215,7 @@ def makeVCSRelease(self, id, branch):
elif release.package is None: elif release.package is None:
raise TaskError("No package attached to release") raise TaskError("No package attached to release")
with cloneRepo(release.package.repo, ref=branch, recursive=True) as repo: with clone_repo(release.package.repo, ref=branch, recursive=True) as repo:
postReleaseCheckUpdate(self, release, repo.working_tree_dir) postReleaseCheckUpdate(self, release, repo.working_tree_dir)
filename = randomString(10) + ".zip" filename = randomString(10) + ".zip"
@ -242,7 +244,7 @@ def importRepoScreenshot(id):
raise Exception("Unexpected none package") raise Exception("Unexpected none package")
try: try:
with cloneRepo(package.repo) as repo: with clone_repo(package.repo) as repo:
for ext in ["png", "jpg", "jpeg"]: for ext in ["png", "jpg", "jpeg"]:
sourcePath = repo.working_tree_dir + "/screenshot." + ext sourcePath = repo.working_tree_dir + "/screenshot." + ext
if os.path.isfile(sourcePath): if os.path.isfile(sourcePath):

6
utils/reload_worker.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/bash
set -e
docker-compose build worker
docker-compose up --no-deps -d worker

8
utils/update.sh
View File

@ -5,8 +5,8 @@
# This is for production use. See reload.sh for debug mode hot/live reloading. # This is for production use. See reload.sh for debug mode hot/live reloading.
# #
sudo docker-compose build app docker-compose build app
sudo docker-compose build worker docker-compose build worker
sudo docker-compose up --no-deps -d app docker-compose up --no-deps -d app
sudo docker-compose up --no-deps --scale worker=2 -d worker docker-compose up --no-deps --scale worker=2 -d worker