Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
b2338ea4
Unverified
Commit
b2338ea4
authored
Oct 03, 2022
by
AUTOMATIC1111
Committed by
GitHub
Oct 03, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1490 from RnDMonkey/#1484_fix_empty_styles_pattern
#1484 fix empty styles pattern
parents
4c2eccf8
3fac3764
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
images.py
modules/images.py
+2
-2
No files found.
modules/images.py
View file @
b2338ea4
...
@@ -315,7 +315,7 @@ def apply_filename_pattern(x, p, seed, prompt):
...
@@ -315,7 +315,7 @@ def apply_filename_pattern(x, p, seed, prompt):
#currently disabled if using the save button, will work otherwise
#currently disabled if using the save button, will work otherwise
# if enabled it will cause a bug because styles is not included in the save_files data dictionary
# if enabled it will cause a bug because styles is not included in the save_files data dictionary
if
hasattr
(
p
,
"styles"
):
if
hasattr
(
p
,
"styles"
):
x
=
x
.
replace
(
"[styles]"
,
sanitize_filename_part
(
", "
.
join
([
x
for
x
in
p
.
styles
if
not
x
==
"None"
]),
replace_spaces
=
False
))
x
=
x
.
replace
(
"[styles]"
,
sanitize_filename_part
(
", "
.
join
([
x
for
x
in
p
.
styles
if
not
x
==
"None"
]
or
"None"
),
replace_spaces
=
False
))
x
=
x
.
replace
(
"[sampler]"
,
sanitize_filename_part
(
sd_samplers
.
samplers
[
p
.
sampler_index
]
.
name
,
replace_spaces
=
False
))
x
=
x
.
replace
(
"[sampler]"
,
sanitize_filename_part
(
sd_samplers
.
samplers
[
p
.
sampler_index
]
.
name
,
replace_spaces
=
False
))
...
@@ -379,7 +379,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
...
@@ -379,7 +379,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
save_to_dirs
=
(
grid
and
opts
.
grid_save_to_dirs
)
or
(
not
grid
and
opts
.
save_to_dirs
and
not
no_prompt
)
save_to_dirs
=
(
grid
and
opts
.
grid_save_to_dirs
)
or
(
not
grid
and
opts
.
save_to_dirs
and
not
no_prompt
)
if
save_to_dirs
:
if
save_to_dirs
:
dirname
=
apply_filename_pattern
(
opts
.
directories_filename_pattern
or
"[prompt_words]"
,
p
,
seed
,
prompt
)
dirname
=
apply_filename_pattern
(
opts
.
directories_filename_pattern
or
"[prompt_words]"
,
p
,
seed
,
prompt
)
.
strip
(
'
\\
/'
)
path
=
os
.
path
.
join
(
path
,
dirname
)
path
=
os
.
path
.
join
(
path
,
dirname
)
os
.
makedirs
(
path
,
exist_ok
=
True
)
os
.
makedirs
(
path
,
exist_ok
=
True
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment