Furizon
/
furizon_webint
3
2
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Fixed default propic and propic file removal

This commit is contained in:
Stranck 2024-01-09 23:42:54 +01:00
parent 95525d28a2
commit 5d815defc8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
propic.py
View File

@ -17,9 +17,16 @@ async def resetDefaultPropic(request, order: Order, isFursuiter, sendAnswer=True
with open("res/propic/default.png", "rb") as f: with open("res/propic/default.png", "rb") as f:
data = f.read() data = f.read()
f.close() f.close()
os.remove(f"res/propic/{order.ans(f'propic{s}')}") # converted file
filenameNoExt = order.ans(f'propic{s}').split(".jpg")[0] convertedFilename = order.ans(f'propic{s}')
os.remove(f"res/propic/{filenameNoExt}_original.jpg") # original file if convertedFilename is not None:
convertedFilename = f"res/propic/{convertedFilename}"
if os.path.exists(convertedFilename):
os.remove(convertedFilename) # converted file
originalFilename = f"res/propic/propic{s}_{order.code}_original"
if os.path.exists(originalFilename):
os.remove(originalFilename) # original file
await order.edit_answer_fileUpload(f'propic{s}_file', f'propic{s}_file_{order.code}_default.png', 'image/png', data) await order.edit_answer_fileUpload(f'propic{s}_file', f'propic{s}_file_{order.code}_default.png', 'image/png', data)
if(sendAnswer): if(sendAnswer):
await order.send_answers() await order.send_answers()
@ -35,11 +42,11 @@ async def upload_propic(request, order: Order):
raise exceptions.BadRequest("The deadline has passed. You cannot modify the badges at this moment.") raise exceptions.BadRequest("The deadline has passed. You cannot modify the badges at this moment.")
if request.form.get('submit') == 'Delete main image': if request.form.get('submit') == 'Delete main image':
await order.edit_answer('propic', None)
await resetDefaultPropic(request, order, False, sendAnswer=False) await resetDefaultPropic(request, order, False, sendAnswer=False)
await order.edit_answer('propic', None) #This MUST come after the reset default propic!
elif request.form.get('submit') == 'Delete fursuit image': elif request.form.get('submit') == 'Delete fursuit image':
await order.edit_answer('propic_fursuiter', None)
await resetDefaultPropic(request, order, True, sendAnswer=False) await resetDefaultPropic(request, order, True, sendAnswer=False)
await order.edit_answer('propic_fursuiter', None) #This MUST come after the reset default propic!
else: else:
for fn, body in request.files.items(): for fn, body in request.files.items():
if fn not in ['propic', 'propic_fursuiter']: if fn not in ['propic', 'propic_fursuiter']:
@ -66,7 +73,7 @@ async def upload_propic(request, order: Order):
raise exceptions.BadRequest(errorDetails) raise exceptions.BadRequest(errorDetails)
with open(f"res/propic/{fn}_{order.code}_original.jpg", "wb") as f: with open(f"res/propic/{fn}_{order.code}_original", "wb") as f:
f.write(body[0].body) f.write(body[0].body)
aspect_ratio = width/height aspect_ratio = width/height