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
146856f6
Commit
146856f6
authored
Oct 24, 2022
by
Milly
Committed by
AUTOMATIC1111
Oct 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
images: allow nested bracket in filename pattern
parent
c7af69f8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
images.py
modules/images.py
+4
-7
No files found.
modules/images.py
View file @
146856f6
...
@@ -277,7 +277,7 @@ invalid_filename_chars = '<>:"/\\|?*\n'
...
@@ -277,7 +277,7 @@ invalid_filename_chars = '<>:"/\\|?*\n'
invalid_filename_prefix
=
' '
invalid_filename_prefix
=
' '
invalid_filename_postfix
=
' .'
invalid_filename_postfix
=
' .'
re_nonletters
=
re
.
compile
(
r'[\s'
+
string
.
punctuation
+
']+'
)
re_nonletters
=
re
.
compile
(
r'[\s'
+
string
.
punctuation
+
']+'
)
re_pattern
=
re
.
compile
(
r"(
[^\[\]]+|\[([^]]+)]|[\[\]]*
)"
)
re_pattern
=
re
.
compile
(
r"(
.*?)(?:\[([^\[\]]+)\]|$
)"
)
re_pattern_arg
=
re
.
compile
(
r"(.*)<([^>]*)>$"
)
re_pattern_arg
=
re
.
compile
(
r"(.*)<([^>]*)>$"
)
max_filename_part_length
=
128
max_filename_part_length
=
128
...
@@ -362,9 +362,9 @@ class FilenameGenerator:
...
@@ -362,9 +362,9 @@ class FilenameGenerator:
for
m
in
re_pattern
.
finditer
(
x
):
for
m
in
re_pattern
.
finditer
(
x
):
text
,
pattern
=
m
.
groups
()
text
,
pattern
=
m
.
groups
()
res
+=
text
if
pattern
is
None
:
if
pattern
is
None
:
res
+=
text
continue
continue
pattern_args
=
[]
pattern_args
=
[]
...
@@ -385,12 +385,9 @@ class FilenameGenerator:
...
@@ -385,12 +385,9 @@ class FilenameGenerator:
print
(
f
"Error adding [{pattern}] to filename"
,
file
=
sys
.
stderr
)
print
(
f
"Error adding [{pattern}] to filename"
,
file
=
sys
.
stderr
)
print
(
traceback
.
format_exc
(),
file
=
sys
.
stderr
)
print
(
traceback
.
format_exc
(),
file
=
sys
.
stderr
)
if
replacement
is
None
:
if
replacement
is
not
None
:
res
+=
f
'[{pattern}]'
else
:
res
+=
str
(
replacement
)
res
+=
str
(
replacement
)
continue
continue
res
+=
f
'[{pattern}]'
res
+=
f
'[{pattern}]'
...
...
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