Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ def get_timestamp(time_format):
return timestamp


def make_pathname(filename, seed, modelname, counter, time_format):
def make_pathname(filename, seed, modelname, counter, pad_counter, time_format):
filename = filename.replace("%date", get_timestamp("%Y-%m-%d"))
filename = filename.replace("%time", get_timestamp(time_format))
filename = filename.replace("%model", modelname)
filename = filename.replace("%seed", str(seed))
filename = filename.replace("%counter", str(counter))
filename = filename.replace("%counter", str(counter).rjust(pad_counter, "0"))
return filename


def make_filename(filename, seed, modelname, counter, time_format):
filename = make_pathname(filename, seed, modelname, counter, time_format)
def make_filename(filename, seed, modelname, counter, pad_counter, time_format):
filename = make_pathname(filename, seed, modelname, counter, pad_counter, time_format)

return get_timestamp(time_format) if filename == "" else filename

Expand Down Expand Up @@ -194,6 +194,7 @@ def INPUT_TYPES(cls):
"lossless_webp": ("BOOLEAN", {"default": True}),
"quality_jpeg_or_webp": ("INT", {"default": 100, "min": 1, "max": 100}),
"counter": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff }),
"pad_counter": ("INT", {"default": 5, "min": 0, "max": 200 }),
"time_format": ("STRING", {"default": "%Y-%m-%d-%H%M%S", "multiline": False}),
},
"hidden": {
Expand All @@ -210,9 +211,9 @@ def INPUT_TYPES(cls):
CATEGORY = "ImageSaverTools"

def save_files(self, images, seed_value, steps, cfg, sampler_name, scheduler, positive, negative, modelname, quality_jpeg_or_webp,
lossless_webp, width, height, counter, filename, path, extension, time_format, prompt=None, extra_pnginfo=None):
filename = make_filename(filename, seed_value, modelname, counter, time_format)
path = make_pathname(path, seed_value, modelname, counter, time_format)
lossless_webp, width, height, counter, pad_counter, filename, path, extension, time_format, prompt=None, extra_pnginfo=None):
filename = make_filename(filename, seed_value, modelname, counter, pad_counter, time_format)
path = make_pathname(path, seed_value, modelname, counter, pad_counter, time_format)
ckpt_path = folder_paths.get_full_path("checkpoints", modelname)
basemodelname = parse_name(modelname)
modelhash = calculate_sha256(ckpt_path)[:10]
Expand Down