yuuki/taiko-web
1
0
Fork 0
mirror of https://github.com/yuukiwww/taiko-web.git synced 2024-10-22 17:05:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Admin: Fix hashing if songs baseurl is not absolute

Browse Source
This commit is contained in:
LoveEevee 2020-03-18 06:54:42 +03:00
parent 54a98b77d9
commit 8d8a4577d2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app.py
View File

@ -52,10 +52,16 @@ def generate_hash(id, form):
urls.append('%s%s/%s.osu' % (config.SONGS_BASEURL, id, diff)) urls.append('%s%s/%s.osu' % (config.SONGS_BASEURL, id, diff))
for url in urls: for url in urls:
resp = requests.get(url) if url.startswith("http://") or url.startswith("https://"):
if resp.status_code != 200: resp = requests.get(url)
raise HashException('Invalid response from %s (status code %s)' % (resp.url, resp.status_code)) if resp.status_code != 200:
md5.update(resp.content) raise HashException('Invalid response from %s (status code %s)' % (resp.url, resp.status_code))
md5.update(resp.content)
else:
if url.startswith("/"):
url = url[1:]
with open(os.path.join("public", url), "rb") as file:
md5.update(file.read())
return base64.b64encode(md5.digest())[:-2].decode('utf-8') return base64.b64encode(md5.digest())[:-2].decode('utf-8')