Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
d0e8fa62
Commit
d0e8fa62
authored
May 27, 2023
by
AUTOMATIC1111
Committed by
GitHub
May 27, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10569 from strelokhalfer/pr
Change 'images.zip' to pattern settings
parents
2fc2fbb4
fb5d0ef2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
modules/images.py
modules/images.py
+7
-3
modules/shared.py
modules/shared.py
+1
-0
modules/ui_common.py
modules/ui_common.py
+7
-2
No files found.
modules/images.py
View file @
d0e8fa62
...
...
@@ -338,6 +338,8 @@ def sanitize_filename_part(text, replace_spaces=True):
class
FilenameGenerator
:
replacements
=
{
'seed'
:
lambda
self
:
self
.
seed
if
self
.
seed
is
not
None
else
''
,
'seed_first'
:
lambda
self
:
self
.
seed
if
self
.
p
.
batch_size
==
1
else
self
.
p
.
all_seeds
[
0
],
'seed_last'
:
lambda
self
:
NOTHING_AND_SKIP_PREVIOUS_TEXT
if
self
.
p
.
batch_size
==
1
else
self
.
p
.
all_seeds
[
-
1
],
'steps'
:
lambda
self
:
self
.
p
and
self
.
p
.
steps
,
'cfg'
:
lambda
self
:
self
.
p
and
self
.
p
.
cfg_scale
,
'width'
:
lambda
self
:
self
.
image
.
width
,
...
...
@@ -354,19 +356,21 @@ class FilenameGenerator:
'prompt_no_styles'
:
lambda
self
:
self
.
prompt_no_style
(),
'prompt_spaces'
:
lambda
self
:
sanitize_filename_part
(
self
.
prompt
,
replace_spaces
=
False
),
'prompt_words'
:
lambda
self
:
self
.
prompt_words
(),
'batch_number'
:
lambda
self
:
NOTHING_AND_SKIP_PREVIOUS_TEXT
if
self
.
p
.
batch_size
==
1
else
self
.
p
.
batch_index
+
1
,
'generation_number'
:
lambda
self
:
NOTHING_AND_SKIP_PREVIOUS_TEXT
if
self
.
p
.
n_iter
==
1
and
self
.
p
.
batch_size
==
1
else
self
.
p
.
iteration
*
self
.
p
.
batch_size
+
self
.
p
.
batch_index
+
1
,
'batch_number'
:
lambda
self
:
NOTHING_AND_SKIP_PREVIOUS_TEXT
if
self
.
p
.
batch_size
==
1
or
self
.
zip
else
self
.
p
.
batch_index
+
1
,
'batch_size'
:
lambda
self
:
self
.
p
.
batch_size
,
'generation_number'
:
lambda
self
:
NOTHING_AND_SKIP_PREVIOUS_TEXT
if
(
self
.
p
.
n_iter
==
1
and
self
.
p
.
batch_size
==
1
)
or
self
.
zip
else
self
.
p
.
iteration
*
self
.
p
.
batch_size
+
self
.
p
.
batch_index
+
1
,
'hasprompt'
:
lambda
self
,
*
args
:
self
.
hasprompt
(
*
args
),
# accepts formats:[hasprompt<prompt1|default><prompt2>..]
'clip_skip'
:
lambda
self
:
opts
.
data
[
"CLIP_stop_at_last_layers"
],
'denoising'
:
lambda
self
:
self
.
p
.
denoising_strength
if
self
.
p
and
self
.
p
.
denoising_strength
else
NOTHING_AND_SKIP_PREVIOUS_TEXT
,
}
default_time_format
=
'
%
Y
%
m
%
d
%
H
%
M
%
S'
def
__init__
(
self
,
p
,
seed
,
prompt
,
image
):
def
__init__
(
self
,
p
,
seed
,
prompt
,
image
,
zip
=
False
):
self
.
p
=
p
self
.
seed
=
seed
self
.
prompt
=
prompt
self
.
image
=
image
self
.
zip
=
zip
def
hasprompt
(
self
,
*
args
):
lower
=
self
.
prompt
.
lower
()
...
...
modules/shared.py
View file @
d0e8fa62
...
...
@@ -314,6 +314,7 @@ options_templates.update(options_section(('saving-images', "Saving images/grids"
"grid_extended_filename"
:
OptionInfo
(
False
,
"Add extended info (seed, prompt) to filename when saving grid"
),
"grid_only_if_multiple"
:
OptionInfo
(
True
,
"Do not save grids consisting of one picture"
),
"grid_prevent_empty_spots"
:
OptionInfo
(
False
,
"Prevent empty spots in grid (when set to autodetect)"
),
"grid_zip_filename_pattern"
:
OptionInfo
(
""
,
"Archive filename pattern"
,
component_args
=
hide_dirs
)
.
link
(
"wiki"
,
"https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Custom-Images-Filename-Name-and-Subdirectory"
),
"n_rows"
:
OptionInfo
(
-
1
,
"Grid row count; use -1 for autodetect and 0 for it to be same as batch size"
,
gr
.
Slider
,
{
"minimum"
:
-
1
,
"maximum"
:
16
,
"step"
:
1
}),
"enable_pnginfo"
:
OptionInfo
(
True
,
"Save text information about generation parameters as chunks to png files"
),
...
...
modules/ui_common.py
View file @
d0e8fa62
...
...
@@ -50,9 +50,10 @@ def save_files(js_data, images, do_make_zip, index):
save_to_dirs
=
shared
.
opts
.
use_save_to_dirs_for_ui
extension
:
str
=
shared
.
opts
.
samples_format
start_index
=
0
only_one
=
False
if
index
>
-
1
and
shared
.
opts
.
save_selected_only
and
(
index
>=
data
[
"index_of_first_image"
]):
# ensures we are looking at a specific non-grid picture, and we have save_selected_only
only_one
=
True
images
=
[
images
[
index
]]
start_index
=
index
...
...
@@ -70,6 +71,7 @@ def save_files(js_data, images, do_make_zip, index):
is_grid
=
image_index
<
p
.
index_of_first_image
i
=
0
if
is_grid
else
(
image_index
-
p
.
index_of_first_image
)
p
.
batch_index
=
image_index
-
1
fullfn
,
txt_fullfn
=
modules
.
images
.
save_image
(
image
,
path
,
""
,
seed
=
p
.
all_seeds
[
i
],
prompt
=
p
.
all_prompts
[
i
],
extension
=
extension
,
info
=
p
.
infotexts
[
image_index
],
grid
=
is_grid
,
p
=
p
,
save_to_dirs
=
save_to_dirs
)
filename
=
os
.
path
.
relpath
(
fullfn
,
path
)
...
...
@@ -83,7 +85,10 @@ def save_files(js_data, images, do_make_zip, index):
# Make Zip
if
do_make_zip
:
zip_filepath
=
os
.
path
.
join
(
path
,
"images.zip"
)
zip_fileseed
=
p
.
all_seeds
[
index
-
1
]
if
only_one
else
p
.
all_seeds
[
0
]
namegen
=
modules
.
images
.
FilenameGenerator
(
p
,
zip_fileseed
,
p
.
all_prompts
[
0
],
image
,
True
)
zip_filename
=
namegen
.
apply
(
shared
.
opts
.
grid_zip_filename_pattern
or
"[datetime]_[[model_name]]_[seed]-[seed_last]"
)
zip_filepath
=
os
.
path
.
join
(
path
,
f
"{zip_filename}.zip"
)
from
zipfile
import
ZipFile
with
ZipFile
(
zip_filepath
,
"w"
)
as
zip_file
:
...
...
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