mirror/stable-diffusion-webui
2
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2024-12-27 07:39:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #3791 from shirayu/fix/filename"

Browse Source 
This reverts commit eed58279e7, reversing
changes made to 4ae960b01c.
This commit is contained in:
AUTOMATIC 2023-01-04 18:20:38 +03:00
parent eed58279e7
commit a8eb9e3bf8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/images.py
View File

@ -447,14 +447,6 @@ def get_next_sequence_number(path, basename):
return result + 1 return result + 1
def truncate_fullpath(full_path, encoding='utf-8'):
dir_name, full_name = os.path.split(full_path)
file_name, file_ext = os.path.splitext(full_name)
max_length = os.statvfs(dir_name).f_namemax
file_name_truncated = file_name.encode(encoding)[:max_length - len(file_ext)].decode(encoding, 'ignore')
return os.path.join(dir_name , file_name_truncated + file_ext)
def save_image(image, path, basename, seed=None, prompt=None, extension='png', info=None, short_filename=False, no_prompt=False, grid=False, pnginfo_section_name='parameters', p=None, existing_info=None, forced_filename=None, suffix="", save_to_dirs=None): def save_image(image, path, basename, seed=None, prompt=None, extension='png', info=None, short_filename=False, no_prompt=False, grid=False, pnginfo_section_name='parameters', p=None, existing_info=None, forced_filename=None, suffix="", save_to_dirs=None):
"""Save an image. """Save an image.
@ -495,7 +487,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
if save_to_dirs: if save_to_dirs:
dirname = namegen.apply(opts.directories_filename_pattern or "[prompt_words]").lstrip(' ').rstrip('\\ /') dirname = namegen.apply(opts.directories_filename_pattern or "[prompt_words]").lstrip(' ').rstrip('\\ /')
path = truncate_fullpath(os.path.join(path, dirname)) path = os.path.join(path, dirname)
os.makedirs(path, exist_ok=True) os.makedirs(path, exist_ok=True)
@ -519,13 +511,13 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
fullfn = None fullfn = None
for i in range(500): for i in range(500):
fn = f"{basecount + i:05}" if basename == '' else f"{basename}-{basecount + i:04}" fn = f"{basecount + i:05}" if basename == '' else f"{basename}-{basecount + i:04}"
fullfn = truncate_fullpath(os.path.join(path, f"{fn}{file_decoration}.{extension}")) fullfn = os.path.join(path, f"{fn}{file_decoration}.{extension}")
if not os.path.exists(fullfn): if not os.path.exists(fullfn):
break break
else: else:
fullfn = truncate_fullpath(os.path.join(path, f"{file_decoration}.{extension}")) fullfn = os.path.join(path, f"{file_decoration}.{extension}")
else: else:
fullfn = truncate_fullpath(os.path.join(path, f"{forced_filename}.{extension}")) fullfn = os.path.join(path, f"{forced_filename}.{extension}")
pnginfo = existing_info or {} pnginfo = existing_info or {}
if info is not None: if info is not None: