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

Fix crash on reading mod.conf from Github

Browse Source
This commit is contained in:
rubenwardy 2019-08-09 11:27:54 +01:00
parent 776a3eff2a
commit 6ce495fcd3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/tasks/importtasks.py
View File

@ -55,6 +55,9 @@ class GithubURLMaker:
def getScreenshotURL(self): def getScreenshotURL(self):
return self.baseUrl + "/screenshot.png" return self.baseUrl + "/screenshot.png"
def getModConfURL(self):
return self.baseUrl + "/mod.conf"
def getCommitsURL(self, branch): def getCommitsURL(self, branch):
return "https://api.github.com/repos/{}/{}/commits?sha={}" \ return "https://api.github.com/repos/{}/{}/commits?sha={}" \
.format(self.user, self.repo, urllib.parse.quote_plus(branch)) .format(self.user, self.repo, urllib.parse.quote_plus(branch))
@ -346,7 +349,7 @@ def makeVCSReleaseFromGithub(id, branch, release, url):
try: try:
contents = urllib.request.urlopen(commitsURL).read().decode("utf-8") contents = urllib.request.urlopen(commitsURL).read().decode("utf-8")
commits = json.loads(contents) commits = json.loads(contents)
except urllib.error.HTTPError: except HTTPError:
raise TaskError("Unable to get commits for Github repository. Either the repository or reference doesn't exist.") raise TaskError("Unable to get commits for Github repository. Either the repository or reference doesn't exist.")
if len(commits) == 0 or not "sha" in commits[0]: if len(commits) == 0 or not "sha" in commits[0]: