Merge branch 'comfyanonymous:master' into feature/colab-gdrive

This commit is contained in:
ltdrdata 2023-03-23 13:44:15 +09:00 committed by GitHub
commit c47c16ba07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -779,7 +779,7 @@ class SaveImage:
metadata.add_text(x, json.dumps(extra_pnginfo[x])) metadata.add_text(x, json.dumps(extra_pnginfo[x]))
file = f"{filename}_{counter:05}_.png" 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({ results.append({
"filename": file, "filename": file,
"subfolder": subfolder, "subfolder": subfolder,

View File

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