Merge pull request #780 from hseg/cleanup-cli-main-wip

cli.py: move out parseArgs
This commit is contained in:
Jim Miller 2021-12-19 12:10:36 -06:00 committed by GitHub
commit 555872bdef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -64,18 +64,13 @@ def write_story(config, adapter, writeformat,
del writer
return output_filename
def main(argv=None,
parser=None,
passed_defaultsini=None,
passed_personalini=None):
if argv is None:
argv = sys.argv[1:]
def mkParser(calibre, parser=None):
# read in args, anything starting with -- will be treated as --<varible>=<value>
if not parser:
parser = OptionParser('usage: %prog [options] [STORYURL]...')
parser.add_option('-f', '--format', dest='format', default='epub',
help='Write story as FORMAT, epub(default), mobi, txt or html.', metavar='FORMAT')
if passed_defaultsini:
if calibre:
config_help = 'calibre plugin defaults.ini, calibre plugin personal.ini'
else:
config_help = '~/.fanficfare/defaults.ini, $XDG_CONFIG_HOME/fanficfare/defaults.ini, ./defaults.ini'
@ -177,6 +172,16 @@ def main(argv=None,
action='store_true', dest='unverified_ssl',
help=SUPPRESS_HELP, )
return parser
def main(argv=None,
parser=None,
passed_defaultsini=None,
passed_personalini=None):
if argv is None:
argv = sys.argv[1:]
parser = mkParser(bool(passed_defaultsini), parser)
options, args = parser.parse_args(argv)
if options.unverified_ssl: