respect --outdir again; fix issue #628

This commit is contained in:
Lincoln Stein 2022-09-16 19:58:16 -04:00
parent 6cb6c4a911
commit df95a7ddf2

View File

@ -216,9 +216,7 @@ class Args(object):
# the arg value. For example, the --grid and --individual options are a little # the arg value. For example, the --grid and --individual options are a little
# funny because of their push/pull relationship. This is how to handle it. # funny because of their push/pull relationship. This is how to handle it.
if name=='grid': if name=='grid':
return value_arg or value_cmd # arg supersedes cmd return not cmd_switches.individual and value_arg # arg supersedes cmd
if name=='individual':
return value_cmd or value_arg # cmd supersedes arg
if value_cmd is not None: if value_cmd is not None:
return value_cmd return value_cmd
else: else:
@ -294,11 +292,6 @@ class Args(object):
action='store_true', action='store_true',
help='Place images in subdirectories named after the prompt.', help='Place images in subdirectories named after the prompt.',
) )
render_group.add_argument(
'--seamless',
action='store_true',
help='Change the model to seamless tiling (circular) mode',
)
render_group.add_argument( render_group.add_argument(
'--grid', '--grid',
'-g', '-g',
@ -416,8 +409,8 @@ class Args(object):
help='generate a grid' help='generate a grid'
) )
render_group.add_argument( render_group.add_argument(
'--individual',
'-i', '-i',
'--individual',
action='store_true', action='store_true',
help='override command-line --grid setting and generate individual images' help='override command-line --grid setting and generate individual images'
) )
@ -448,7 +441,6 @@ class Args(object):
'--outdir', '--outdir',
'-o', '-o',
type=str, type=str,
default='outputs/img-samples',
help='Directory to save generated images and a log of prompts and seeds', help='Directory to save generated images and a log of prompts and seeds',
) )
img2img_group.add_argument( img2img_group.add_argument(