From a95f4e9757e985d8b643c9214e3fbf350c2b3603 Mon Sep 17 00:00:00 2001 From: Silversith Date: Tue, 11 Apr 2023 10:25:23 +0200 Subject: [PATCH] DeleteAll updated modify deleteAll to only delete the images listed in the drawer --- server.py | 4 ++-- web/extensions/core/imageFeed.js | 5 +++-- web/scripts/api.js | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server.py b/server.py index 3ad340fa7..81686afee 100644 --- a/server.py +++ b/server.py @@ -187,8 +187,8 @@ class PromptServer(): if not os.path.exists(output_dir): return web.json_response({"message": "Output directory does not exist."}, status=404) try: - if (filename == "all"): - for file_name in os.listdir(output_dir): + if isinstance(filename, list): + for file_name in filename: #os.listdir(output_dir): file_path = os.path.join(output_dir, file_name) if os.path.isfile(file_path): os.remove(file_path) diff --git a/web/extensions/core/imageFeed.js b/web/extensions/core/imageFeed.js index e6720a118..6078f1c9f 100644 --- a/web/extensions/core/imageFeed.js +++ b/web/extensions/core/imageFeed.js @@ -210,9 +210,10 @@ app.registerExtension({ right: "5px", }); deleteAllButton.onclick = () => { - const confirmDelete = confirm("Are you sure you want to delete all images?"); + const confirmDelete = confirm("Are you sure you want to delete all images in the drawer?"); if (confirmDelete) { - api.deleteAllImages(); + debugger; + api.deleteAllImages(allImages.map(item => item.filename)); allImages = [] imageList.replaceChildren(menu, resizeHandle); } diff --git a/web/scripts/api.js b/web/scripts/api.js index 1d75b40f8..c9fb7f54f 100644 --- a/web/scripts/api.js +++ b/web/scripts/api.js @@ -117,8 +117,8 @@ class ComfyApi extends EventTarget { return await resp.json(); } - async deleteAllImages() { - await this.#postItem("delete", { delete: "all" }) + async deleteAllImages(filenames) { + await this.#postItem("delete", { delete: filenames }) } async deleteImage(filename) { await this.#postItem("delete", { delete: filename })