Merge branch 'Main' into feature/img-send

This commit is contained in:
Lt.Dr.Data 2023-03-23 13:43:57 +09:00
commit c6bf46af07
2 changed files with 5 additions and 5 deletions

View File

@ -780,7 +780,7 @@ class SaveImage:
metadata.add_text(x, json.dumps(extra_pnginfo[x]))
file = f"{filename}_{counter:05}_.png"
img.save(os.path.join(full_output_folder, file), pnginfo=metadata, optimize=True)
img.save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=4)
results.append({
"filename": file,
"subfolder": subfolder,

View File

@ -142,12 +142,12 @@ class PromptServer():
return web.Response(status=403)
output_dir = full_output_dir
file = request.rel_url.query["filename"]
file = os.path.basename(file)
file = os.path.join(output_dir, file)
filename = request.rel_url.query["filename"]
filename = os.path.basename(filename)
file = os.path.join(output_dir, filename)
if os.path.isfile(file):
return web.FileResponse(file)
return web.FileResponse(file, headers={"Content-Disposition": f"filename=\"{filename}\""})
return web.Response(status=404)