aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorProf-Cheese <t.t.tomato16@gmail.com>2022-09-23 01:47:43 +0900
committerAUTOMATIC1111 <16777216c@gmail.com>2022-09-22 20:15:37 +0300
commitae32b8a53fd52cb4be195c4b4c329dd81a63ada7 (patch)
tree77ebf64e1e79b410b57222db1aa907a8b81b40e7 /modules
parentcae09e1651e7969e815b4d3443debaf606c8d4bb (diff)
Fixed directory name generation process.
'Max prompt words' has been added to config and modified to be used in the directory name generation process.
Diffstat (limited to 'modules')
-rw-r--r--modules/images.py3
-rw-r--r--modules/shared.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/images.py b/modules/images.py
index d1707263..4926d800 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -249,7 +249,6 @@ invalid_filename_prefix = ' '
invalid_filename_postfix = ' .'
re_nonletters = re.compile(r'[\s'+string.punctuation+']+')
max_filename_part_length = 128
-max_prompt_words = 8
def sanitize_filename_part(text, replace_spaces=True):
@@ -263,6 +262,8 @@ def sanitize_filename_part(text, replace_spaces=True):
def apply_filename_pattern(x, p, seed, prompt):
+ max_prompt_words = opts.directories_max_prompt_words
+
if seed is not None:
x = x.replace("[seed]", str(seed))
diff --git a/modules/shared.py b/modules/shared.py
index 5ffaefc5..2918efbd 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -116,6 +116,7 @@ class Options:
"save_to_dirs": OptionInfo(False, "Save images to a subdirectory"),
"grid_save_to_dirs": OptionInfo(False, "Save grids to subdirectory"),
"directories_filename_pattern": OptionInfo("", "Directory name pattern"),
+ "directories_max_prompt_words": OptionInfo(8, "Max prompt words", gr.Slider, {"minimum": 1, "maximum": 20, "step": 1}),
"outdir_samples": OptionInfo("", "Output directory for images; if empty, defaults to two directories below", component_args=hide_dirs),
"outdir_txt2img_samples": OptionInfo("outputs/txt2img-images", 'Output directory for txt2img images', component_args=hide_dirs),
"outdir_img2img_samples": OptionInfo("outputs/img2img-images", 'Output directory for img2img images', component_args=hide_dirs),