From 36c4537be740b381243f975ac8bff69f7bdabf84 Mon Sep 17 00:00:00 2001 From: Chris Dumas Date: Wed, 21 Oct 2026 16:08:56 +0000 Subject: [PATCH] Adopt Pixaroma save image preview features --- README.md | 4 ++++ dumas_image_nodes.py | 22 +++++++++++++++++++++- js/save_image/index.js | 18 ++++++++++++++---- tests/test_dumas_image_nodes.py | 13 +++++++++++++ 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5f0d1c8..7da0010 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,10 @@ previous clip is never passed forward as the continuity input. - Dumas Image Compare - Save Image Dumas + - Saves PNG, JPG, or WebP to the ComfyUI output folder or a selected external folder. + - Uses collision-safe counters for files and nested folders, with batch-safe numbering. + - Preview mode writes temporary images for inspection without touching the destination folder. + - Supports filename chips for inputs, date/time, counter, dimensions, and batch number. - Load Images from Folder Dumas - Dumas JSON helpers diff --git a/dumas_image_nodes.py b/dumas_image_nodes.py index a3a8caa..2b5fe41 100644 --- a/dumas_image_nodes.py +++ b/dumas_image_nodes.py @@ -151,7 +151,27 @@ class DumasSaveImageNode: def save_images(self, images, folder, pattern, format, quality, embed_workflow, save_on_run, name="", name_2="", prompt=None, extra_pnginfo=None, **_kwargs): if not save_on_run: - return {"ui": {"images": []}} + # Match the preview/save split used by Pixaroma: Preview mode must + # still produce visible, temporary images, but must not write to + # the selected destination folder. + temp_dir = Path(folder_paths.get_temp_directory()).resolve() + temp_dir.mkdir(parents=True, exist_ok=True) + preview_images = [] + preview_format = str(format or "png").lower() + extension = ".jpg" if preview_format == "jpg" else ( + ".webp" if preview_format == "webp" else ".png" + ) + for index, image in enumerate(images): + path = temp_dir / f"dumas_save_preview_{uuid.uuid4().hex}{extension}" + pil = _image_to_pil(image) + if preview_format == "jpg": + pil.convert("RGB").save(path, "JPEG", quality=max(1, min(100, int(quality)))) + elif preview_format == "webp": + pil.save(path, "WEBP", quality=max(1, min(100, int(quality)))) + else: + pil.save(path, "PNG", pnginfo=_build_pnginfo(prompt, extra_pnginfo) if embed_workflow else None) + preview_images.append({"filename": path.name, "subfolder": "", "type": "temp"}) + return {"ui": {"images": preview_images}} output_dir = Path(folder_paths.get_output_directory()).resolve() base = Path(folder).expanduser().resolve() if str(folder or "").strip() else output_dir base.mkdir(parents=True, exist_ok=True) diff --git a/js/save_image/index.js b/js/save_image/index.js index a81c139..fdefc5a 100644 --- a/js/save_image/index.js +++ b/js/save_image/index.js @@ -120,7 +120,7 @@ function resolveDateTokens(value) { function buildPreviewPath(node, ui) { const folder = (ui.folderInput.value || "").trim() || "ComfyUI output"; - const format = ui.format === "jpg" ? ".jpg" : ".png"; + const format = ui.format === "jpg" ? ".jpg" : (ui.format === "webp" ? ".webp" : ".png"); let pattern = ui.patternInput.value || DEFAULT_PATTERN; pattern = resolveDateTokens(pattern); pattern = pattern @@ -141,7 +141,7 @@ function buildPreviewPath(node, ui) { function scheduleCounterFetch(node, ui) { const folder = (ui.folderInput.value || "").trim(); - const format = ui.format === "jpg" ? ".jpg" : ".png"; + const format = ui.format === "jpg" ? ".jpg" : (ui.format === "webp" ? ".webp" : ".png"); let pattern = ui.patternInput.value || DEFAULT_PATTERN; pattern = resolveDateTokens(pattern) .replaceAll("%input%", "input") @@ -254,11 +254,13 @@ function renderPreview(node, ui) { function syncFromWidgets(node, ui) { ui.folderInput.value = String(getWidget(node, "folder")?.value || ""); ui.patternInput.value = String(getWidget(node, "pattern")?.value || DEFAULT_PATTERN); - ui.format = String(getWidget(node, "format")?.value || "png").toLowerCase() === "jpg" ? "jpg" : "png"; + const selectedFormat = String(getWidget(node, "format")?.value || "png").toLowerCase(); + ui.format = ["png", "jpg", "webp"].includes(selectedFormat) ? selectedFormat : "png"; ui.saveOnRun = !!getWidget(node, "save_on_run")?.value; ui.embedWorkflow = !!getWidget(node, "embed_workflow")?.value; ui.fmtPng.classList.toggle("on", ui.format === "png"); ui.fmtJpg.classList.toggle("on", ui.format === "jpg"); + ui.fmtWebp.classList.toggle("on", ui.format === "webp"); ui.modeSave.classList.toggle("on", ui.saveOnRun); ui.modePreview.classList.toggle("on", !ui.saveOnRun); renderPreview(node, ui); @@ -329,7 +331,9 @@ function createRoot(node) { fmtPng.type = "button"; const fmtJpg = el("button", null, "JPG"); fmtJpg.type = "button"; - formatSeg.append(fmtPng, fmtJpg); + const fmtWebp = el("button", null, "WebP"); + fmtWebp.type = "button"; + formatSeg.append(fmtPng, fmtJpg, fmtWebp); const modeSeg = el("div", "dsi-seg"); const modeSave = el("button", null, "Save"); modeSave.type = "button"; @@ -362,6 +366,7 @@ function createRoot(node) { prevPath: previewPath, fmtPng, fmtJpg, + fmtWebp, modeSave, modePreview, openButton, @@ -421,6 +426,11 @@ function createRoot(node) { setWidgetValue(node, "format", "jpg"); syncFromWidgets(node, ui); }); + fmtWebp.addEventListener("click", () => { + ui.format = "webp"; + setWidgetValue(node, "format", "webp"); + syncFromWidgets(node, ui); + }); modeSave.addEventListener("click", () => { ui.saveOnRun = true; setWidgetValue(node, "save_on_run", true); diff --git a/tests/test_dumas_image_nodes.py b/tests/test_dumas_image_nodes.py index 1a578d0..4f0c486 100644 --- a/tests/test_dumas_image_nodes.py +++ b/tests/test_dumas_image_nodes.py @@ -155,6 +155,19 @@ class DumasImageNodeTests(unittest.TestCase): nested, ) + def test_preview_mode_writes_temp_images_without_touching_destination(self): + with tempfile.TemporaryDirectory() as directory: + FakeImage.saved_paths.clear() + self.nodes.DumasSaveImageNode().save_images( + [FakeBatch()], directory, "preview_%counter%", "webp", 90, False, False + ) + + self.assertEqual(len(FakeImage.saved_paths), 1) + saved_path = FakeImage.saved_paths[-1][0] + self.assertTrue(str(saved_path).startswith(self.temp_dir)) + self.assertTrue(str(saved_path).endswith(".webp")) + self.assertFalse(os.path.exists(os.path.join(directory, "preview_001.webp"))) + if __name__ == "__main__": unittest.main()