Skip to content

Commit

Permalink
#15 now correctly numbering files
Browse files Browse the repository at this point in the history
when batch count is > 1
  • Loading branch information
kex0 committed Jan 29, 2023
1 parent 2b023f0 commit 337fff0
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions scripts/batch_face_swap.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,23 +155,23 @@ def faceSwap(p, masks, image, finishedImages, invertMask, forced_filename, pathT
proc = process_images(p)

if pathToSave != "":
for n in range(p.batch_size):
for n in range(p.n_iter * p.batch_size):
if opts.samples_format == "png":
images.save_image(proc.images[n], pathToSave, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and p.batch_size > 1 else forced_filename)
images.save_image(proc.images[n], pathToSave, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and (p.batch_size > 1 or p.n_iter > 1) else forced_filename)
elif image.mode != 'RGB':
image = image.convert('RGB')
images.save_image(proc.images[n], pathToSave, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and p.batch_size > 1 else forced_filename)
images.save_image(proc.images[n], pathToSave, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and (p.batch_size > 1 or p.n_iter > 1) else forced_filename)
else:
images.save_image(proc.images[n], pathToSave, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and p.batch_size > 1 else forced_filename)
images.save_image(proc.images[n], pathToSave, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and (p.batch_size > 1 or p.n_iter > 1) else forced_filename)
else:
for n in range(p.batch_size):
for n in range(p.n_iter * p.batch_size):
if opts.samples_format == "png":
images.save_image(proc.images[n], p.outpath_samples, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and p.batch_size > 1 else forced_filename)
images.save_image(proc.images[n], p.outpath_samples, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and (p.batch_size > 1 or p.n_iter > 1) else forced_filename)
elif image.mode != 'RGB':
image = image.convert('RGB')
images.save_image(proc.images[n], p.outpath_samples, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and p.batch_size > 1 else forced_filename)
images.save_image(proc.images[n], p.outpath_samples, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and (p.batch_size > 1 or p.n_iter > 1) else forced_filename)
else:
images.save_image(proc.images[n], p.outpath_samples, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and p.batch_size > 1 else forced_filename)
images.save_image(proc.images[n], p.outpath_samples, "", p.seed, p.prompt, opts.samples_format, info=info, p=p, forced_filename=forced_filename+"_"+str(n+1) if forced_filename != None and (p.batch_size > 1 or p.n_iter > 1) else forced_filename)

finishedImages.append(proc.images[n])
else:
Expand Down

0 comments on commit 337fff0

Please sign in to comment.