diff options
| author | Dynamic <bradje@naver.com> | 2022-10-25 00:16:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 00:16:26 +0900 |
| commit | 0b990d1d34c532291e72b0be6bade45bd7c29a1c (patch) | |
| tree | c34d644f7a05cad4f54fade6ab68006db15e27bb | |
| parent | 8d8d4d8a1b6401ef3c21d21d7784eb2e1f82d955 (diff) | |
| parent | df0a1f83815c771246a7b1bca85d63feaefad8d1 (diff) | |
Merge branch 'AUTOMATIC1111:master' into kr-localization
| -rw-r--r-- | javascript/hints.js | 4 | ||||
| -rw-r--r-- | modules/images.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/javascript/hints.js b/javascript/hints.js index a1fcc93b..6ddd6aec 100644 --- a/javascript/hints.js +++ b/javascript/hints.js @@ -62,8 +62,8 @@ titles = { "Interrogate": "Reconstruct prompt from existing image and put it into the prompt field.", - "Images filename pattern": "Use following tags to define how filenames for images are chosen: [steps], [cfg], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [job_timestamp]; leave empty for default.", - "Directory name pattern": "Use following tags to define how subdirectories for images and grids are chosen: [steps], [cfg], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [job_timestamp]; leave empty for default.", + "Images filename pattern": "Use following tags to define how filenames for images are chosen: [steps], [cfg], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [datetime<Format>], [datetime<Format><Time Zone>], [job_timestamp]; leave empty for default.", + "Directory name pattern": "Use following tags to define how subdirectories for images and grids are chosen: [steps], [cfg], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [datetime<Format>], [datetime<Format><Time Zone>], [job_timestamp]; leave empty for default.", "Max prompt words": "Set the maximum number of words to be used in the [prompt_words] option; ATTENTION: If the words are too long, they may exceed the maximum length of the file path that the system can handle", "Loopback": "Process an image, use it as an input, repeat.", diff --git a/modules/images.py b/modules/images.py index 848ede75..9a8fe3ed 100644 --- a/modules/images.py +++ b/modules/images.py @@ -344,7 +344,10 @@ class FilenameGenerator: time_datetime = datetime.datetime.now()
time_format = args[0] if len(args) > 0 else self.default_time_format
- time_zone = pytz.timezone(args[1]) if len(args) > 1 else None
+ try:
+ time_zone = pytz.timezone(args[1]) if len(args) > 1 else None
+ except pytz.exceptions.UnknownTimeZoneError as _:
+ time_zone = None
time_zone_time = time_datetime.astimezone(time_zone)
try:
|