Commit 146856f6 authored by Milly's avatar Milly Committed by AUTOMATIC1111
Browse files

images: allow nested bracket in filename pattern

parent c7af69f8
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ invalid_filename_chars = '<>:"/\\|?*\n'
invalid_filename_prefix = ' '
invalid_filename_postfix = ' .'
re_nonletters = re.compile(r'[\s' + string.punctuation + ']+')
re_pattern = re.compile(r"([^\[\]]+|\[([^]]+)]|[\[\]]*)")
re_pattern = re.compile(r"(.*?)(?:\[([^\[\]]+)\]|$)")
re_pattern_arg = re.compile(r"(.*)<([^>]*)>$")
max_filename_part_length = 128

@@ -362,9 +362,9 @@ class FilenameGenerator:

        for m in re_pattern.finditer(x):
            text, pattern = m.groups()
            res += text

            if pattern is None:
                res += text
                continue

            pattern_args = []
@@ -385,11 +385,8 @@ class FilenameGenerator:
                    print(f"Error adding [{pattern}] to filename", file=sys.stderr)
                    print(traceback.format_exc(), file=sys.stderr)

                if replacement is None:
                    res += f'[{pattern}]'
                else:
                if replacement is not None:
                    res += str(replacement)

                    continue

            res += f'[{pattern}]'