The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Fix to #3465. Prevent, resaving of duplicate images if overwrite not specified (#3472)
shawnington52aaee251fcd
diff --git a/server.py b/server.pyindex 30ea90c6c..5b98620ad 100644--- a/server.py+++ b/server.py@@ -12,6 +12,7 @@ import jsonimport globimport structimport ssl+import hashlibfrom PIL import Image, ImageOpsfrom PIL.PngImagePlugin import PngInfofrom io import BytesIO@@ -153,10 +154,24 @@ class PromptServer():type_dir = folder_paths.get_output_directory()return type_dir, dir_type-++ def compare_image_hash(filepath, image):+ # function to compare hashes of two images to see if it already exists, fix to #3465+ if os.path.exists(filepath):+ a = hashlib.sha256()+ b = hashlib.sha256()+ with open(filepath, "rb") as f:+ a.update(f.read())+ b.update(image.file.read())+ image.file.seek(0)+ f.close()+ return a.hexdigest() == b.hexdigest()+ return False+def image_upload(post, image_save_function=None):image = post.get("image")overwrite = post.get("overwrite")+ image_is_duplicate = Falseimage_upload_type = post.get("type")upload_dir, image_upload_type = get_dir_by_type(image_upload_type)@@ -183,15 +198,19 @@ class PromptServer():else:i = 1while os.path.exists(filepath):+ if compare_image_hash(filepath, image): #compare hash to prevent saving of duplicates with same name, fix for #3465+ image_is_duplicate = True+ breakfilename = f"{split[0]} ({i}){split[1]}"filepath = os.path.join(full_output_folder, filename)i += 1- if image_save_function is not None:- image_save_function(image, post, filepath)- else:- with open(filepath, "wb") as f:- f.write(image.file.read())+ if not image_is_duplicate:+ if image_save_function is not None:+ image_save_function(image, post, filepath)+ else:+ with open(filepath, "wb") as f:+ f.write(image.file.read())return web.json_response({"name" : filename, "subfolder": subfolder, "type": image_upload_type})else: