mirrors/pferd
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2023-12-21 10:23:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split --dump-config into two options

Browse Source 
--dump-config with its optional argument tended to consume the command name, so
it had to be split up.
This commit is contained in:
Joscha 2021-05-25 16:57:14 +02:00
parent a848194601
commit 519a7ef435
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PFERD/__main__.py
View File

@ -46,7 +46,7 @@ def configure_logging_from_args(args: argparse.Namespace) -> None:
# We want to prevent any unnecessary output if we're printing the config to # We want to prevent any unnecessary output if we're printing the config to
# stdout, otherwise it would not be a valid config file. # stdout, otherwise it would not be a valid config file.
if args.dump_config == "-": if args.dump_config_to == "-":
log.output_explain = False log.output_explain = False
log.output_status = False log.output_status = False
log.output_report = False log.output_report = False
@ -56,7 +56,7 @@ def configure_logging_from_config(args: argparse.Namespace, config: Config) -> N
# In configure_logging_from_args(), all normal logging is already disabled # In configure_logging_from_args(), all normal logging is already disabled
# whenever we dump the config. We don't want to override that decision with # whenever we dump the config. We don't want to override that decision with
# values from the config file. # values from the config file.
if args.dump_config == "-": if args.dump_config_to == "-":
return return
try: try:
@ -74,13 +74,17 @@ def configure_logging_from_config(args: argparse.Namespace, config: Config) -> N
def dump_config(args: argparse.Namespace, config: Config) -> None: def dump_config(args: argparse.Namespace, config: Config) -> None:
log.explain_topic("Dumping config") log.explain_topic("Dumping config")
if args.dump_config and args.dump_config_to is not None:
log.error("--dump-config and --dump-config-to can't be specified at the same time")
exit(1)
try: try:
if args.dump_config is True: if args.dump_config:
config.dump() config.dump()
elif args.dump_config == "-": elif args.dump_config_to == "-":
config.dump_to_stdout() config.dump_to_stdout()
else: else:
config.dump(Path(args.dump_config)) config.dump(Path(args.dump_config_to))
except ConfigDumpError as e: except ConfigDumpError as e:
log.error(str(e)) log.error(str(e))
log.error_contd(e.reason) log.error_contd(e.reason)
@ -101,7 +105,7 @@ def main() -> None:
# all places that were not already covered by CLI args. # all places that were not already covered by CLI args.
configure_logging_from_config(args, config) configure_logging_from_config(args, config)
if args.dump_config is not None: if args.dump_config or args.dump_config_to is not None:
dump_config(args, config) dump_config(args, config)
exit() exit()

9
PFERD/cli/parser.py
View File

@ -155,11 +155,14 @@ PARSER.add_argument(
) )
PARSER.add_argument( PARSER.add_argument(
"--dump-config", "--dump-config",
nargs="?", action="store_true",
const=True, help="dump current configuration to the default config path and exit"
)
PARSER.add_argument(
"--dump-config-to",
metavar="PATH", metavar="PATH",
help="dump current configuration to a file and exit." help="dump current configuration to a file and exit."
" Uses default config file path if no path is specified" " Use '-' as path to print to stdout instead"
) )
PARSER.add_argument( PARSER.add_argument(
"--crawler", "-C", "--crawler", "-C",