From be66b06cf8ef10ef12df0fd0e8c977b1902c94bb Mon Sep 17 00:00:00 2001
From: r42-chun <ChunYou@random42.com>
Date: Fri, 16 Aug 2024 13:27:05 +0100
Subject: [PATCH] change save image function to allow output dir specification

---
 .gitignore                     |  3 ++-
 extra_model_paths.yaml.example | 42 ----------------------------------
 nodes.py                       |  8 +++++--
 styles/default.csv             |  3 +++
 4 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 extra_model_paths.yaml.example
 create mode 100644 styles/default.csv

diff --git a/.gitignore b/.gitignore
index 9f0389241..afad81489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ venv/
 !/web/extensions/logging.js.example
 !/web/extensions/core/
 /tests-ui/data/object_info.json
-/user/
\ No newline at end of file
+/user/
+comfyui*.log
diff --git a/extra_model_paths.yaml.example b/extra_model_paths.yaml.example
deleted file mode 100644
index 846d04dbe..000000000
--- a/extra_model_paths.yaml.example
+++ /dev/null
@@ -1,42 +0,0 @@
-#Rename this to extra_model_paths.yaml and ComfyUI will load it
-
-
-#config for a1111 ui
-#all you have to do is change the base_path to where yours is installed
-a111:
-    base_path: path/to/stable-diffusion-webui/
-
-    checkpoints: models/Stable-diffusion
-    configs: models/Stable-diffusion
-    vae: models/VAE
-    loras: |
-         models/Lora
-         models/LyCORIS
-    upscale_models: |
-                  models/ESRGAN
-                  models/RealESRGAN
-                  models/SwinIR
-    embeddings: embeddings
-    hypernetworks: models/hypernetworks
-    controlnet: models/ControlNet
-
-#config for comfyui
-#your base path should be either an existing comfy install or a central folder where you store all of your models, loras, etc.
-
-#comfyui:
-#     base_path: path/to/comfyui/
-#     checkpoints: models/checkpoints/
-#     clip: models/clip/
-#     clip_vision: models/clip_vision/
-#     configs: models/configs/
-#     controlnet: models/controlnet/
-#     embeddings: models/embeddings/
-#     loras: models/loras/
-#     upscale_models: models/upscale_models/
-#     vae: models/vae/
-
-#other_ui:
-#    base_path: path/to/ui
-#    checkpoints: models/checkpoints
-#    gligen: models/gligen
-#    custom_nodes: path/custom_nodes
diff --git a/nodes.py b/nodes.py
index a1cfd6365..e86911ff8 100644
--- a/nodes.py
+++ b/nodes.py
@@ -1399,9 +1399,13 @@ class SaveImage:
 
     CATEGORY = "image"
 
-    def save_images(self, images, filename_prefix="ComfyUI", prompt=None, extra_pnginfo=None):
+    def save_images(self, images, filename_prefix="ComfyUI", prompt=None, extra_pnginfo=None, output_dir=None):
+        # ===========================
+        if not output_dir:
+            output_dir = self.output_dir
+        # ===========================
         filename_prefix += self.prefix_append
-        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])
+        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])
         results = list()
         for (batch_number, image) in enumerate(images):
             i = 255. * image.cpu().numpy()
diff --git a/styles/default.csv b/styles/default.csv
new file mode 100644
index 000000000..b7977e597
--- /dev/null
+++ b/styles/default.csv
@@ -0,0 +1,3 @@
+name,prompt,negative_prompt
+❌Low Token,,"embedding:EasyNegative, NSFW, Cleavage, Pubic Hair, Nudity, Naked, censored"
+✅Line Art / Manga,"(Anime Scene, Toonshading, Satoshi Kon, Ken Sugimori, Hiromu Arakawa:1.2), (Anime Style, Manga Style:1.3), Low detail, sketch, concept art, line art, webtoon, manhua, hand drawn, defined lines, simple shades, minimalistic, High contrast, Linear compositions, Scalable artwork, Digital art, High Contrast Shadows, glow effects, humorous illustration, big depth of field, Masterpiece, colors, concept art, trending on artstation, Vivid colors, dramatic",