xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-09-11 01:27:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Preview for Custom Saving Images

Browse Source
This commit is contained in:
Render Node 2024-09-04 14:19:44 +01:00
parent ef663bf394
commit 4deafd8224
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
nodes.py
View File

@ -1492,30 +1492,11 @@ class SaveImage:
def save_images(self, images, filename_prefix="ComfyUI", prompt=None, extra_pnginfo=None, output_dir=None): def save_images(self, images, filename_prefix="ComfyUI", prompt=None, extra_pnginfo=None, output_dir=None):
# =========================== # ===========================
if not output_dir or output_dir == "None": self.r42_custom_save_location(images, filename_prefix, prompt, extra_pnginfo, output_dir)
output_dir = self.output_dir
output_dir = os.path.expandvars(output_dir)
if output_dir.startswith("Z:\\"):
output_dir = output_dir.replace("Z:\\", "\\\\192.168.0.3\\Work\\", 1)
elif output_dir.startswith("A:\\"):
output_dir = output_dir.replace("A:\\", "\\\\192.168.1.1\\Assets\\", 1)
elif output_dir.startswith("Y:\\"):
output_dir = output_dir.replace("Y:\\", "\\\\pixstor.r42.pri\\frames\\", 1)
print("====================================")
print(f"output_dir is {output_dir}")
print("====================================")
# os.startfile(output_dir)
if not os.path.isdir(output_dir):
logging.error(f"Output directory: {output_dir} does not exist")
raise FileNotFoundError(f"Output directory: {output_dir} does not exist")
return { "ui": { "images": () } }
# =========================== # ===========================
filename_prefix += self.prefix_append filename_prefix += self.prefix_append
full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, output_dir, images[0].shape[1], images[0].shape[0]) full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, self.output_dir, images[0].shape[1], images[0].shape[0])
results = list() results = list()
for (batch_number, image) in enumerate(images): for (batch_number, image) in enumerate(images):
i = 255. * image.cpu().numpy() i = 255. * image.cpu().numpy()
@ -1531,7 +1512,9 @@ class SaveImage:
filename_with_batch_num = filename.replace("%batch_num%", str(batch_number)) filename_with_batch_num = filename.replace("%batch_num%", str(batch_number))
file = f"{filename_with_batch_num}_{counter:05}_.png" file = f"{filename_with_batch_num}_{counter:05}_.png"
img.save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=self.compress_level) img.save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=self.compress_level)
results.append({ results.append({
"filename": file, "filename": file,
"subfolder": subfolder, "subfolder": subfolder,
@ -1541,6 +1524,44 @@ class SaveImage:
return { "ui": { "images": results } } return { "ui": { "images": results } }
def r42_custom_save_location(self, images, filename_prefix="ComfyUI", prompt=None, extra_pnginfo=None, output_dir=None):
if not output_dir or output_dir == "None":
return
output_dir = os.path.expandvars(output_dir)
if output_dir.startswith("Z:\\"):
output_dir = output_dir.replace("Z:\\", "\\\\192.168.0.3\\Work\\", 1)
elif output_dir.startswith("A:\\"):
output_dir = output_dir.replace("A:\\", "\\\\192.168.1.1\\Assets\\", 1)
elif output_dir.startswith("Y:\\"):
output_dir = output_dir.replace("Y:\\", "\\\\pixstor.r42.pri\\frames\\", 1)
if not os.path.isdir(output_dir):
logging.error(f"Output directory: {output_dir} does not exist")
raise FileNotFoundError(f"Output directory: {output_dir} does not exist")
return
filename_prefix += self.prefix_append
full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(
filename_prefix, output_dir, images[0].shape[1], images[0].shape[0])
for (batch_number, image) in enumerate(images):
i = 255. * image.cpu().numpy()
img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
metadata = None
if not args.disable_metadata:
metadata = PngInfo()
if prompt is not None:
metadata.add_text("prompt", json.dumps(prompt))
if extra_pnginfo is not None:
for x in extra_pnginfo:
metadata.add_text(x, json.dumps(extra_pnginfo[x]))
filename_with_batch_num = filename.replace("%batch_num%", str(batch_number))
file = f"{filename_with_batch_num}_{counter:05}_.png"
img.save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=self.compress_level)
class PreviewImage(SaveImage): class PreviewImage(SaveImage):
def __init__(self): def __init__(self):
self.output_dir = folder_paths.get_temp_directory() self.output_dir = folder_paths.get_temp_directory()