Showing the changes to python (1 of 1 file). Show all
Unified · Split
| @@ -22,6 +22,8 @@ def aubio_parser(): · 21 unmodified lines | |||
| 22 | subparsers = parser.add_subparsers(title='commands', dest='command', | 22 | subparsers = parser.add_subparsers(title='commands', dest='command', |
| 23 | metavar="") | 23 | metavar="") |
| 24 | 24 | ||
| 25 | parser_add_subcommand_help(subparsers) | ||
| 26 | |||
| 25 | parser_add_subcommand_onset(subparsers) | 27 | parser_add_subcommand_onset(subparsers) |
| 26 | parser_add_subcommand_pitch(subparsers) | 28 | parser_add_subcommand_pitch(subparsers) |
| 27 | parser_add_subcommand_beat(subparsers) | 29 | parser_add_subcommand_beat(subparsers) |
| @@ -33,6 +35,12 @@ def aubio_parser(): · 5 unmodified lines | |||
| 33 | 35 | ||
| 34 | return parser | 36 | return parser |
| 35 | 37 | ||
| 38 | def parser_add_subcommand_help(subparsers): | ||
| 39 | # global help subcommand | ||
| 40 | subparsers.add_parser('help', | ||
| 41 | help='show help message', | ||
| 42 | formatter_class = argparse.ArgumentDefaultsHelpFormatter) | ||
| 43 | |||
| 36 | def parser_add_subcommand_onset(subparsers): | 44 | def parser_add_subcommand_onset(subparsers): |
| 37 | # onset subcommand | 45 | # onset subcommand |
| 38 | subparser = subparsers.add_parser('onset', | 46 | subparser = subparsers.add_parser('onset', |
| @@ -436,10 +444,13 @@ def main(): · 397 unmodified lines | |||
| 436 | sys.exit(0) | 444 | sys.exit(0) |
| 437 | elif 'verbose' in args and args.verbose > 3: | 445 | elif 'verbose' in args and args.verbose > 3: |
| 438 | sys.stderr.write('aubio version ' + aubio.version + '\n') | 446 | sys.stderr.write('aubio version ' + aubio.version + '\n') |
| 439 | if 'command' not in args or args.command is None: | 447 | if 'command' not in args or args.command is None or args.command in ['help']: |
| 440 | # no command given, print help and return 1 | 448 | # no command given, print help and return 1 |
| 441 | parser.print_help() | 449 | parser.print_help() |
| 442 | sys.exit(1) | 450 | if args.command and args.command in ['help']: |
| 451 | sys.exit(0) | ||
| 452 | else: | ||
| 453 | sys.exit(1) | ||
| 443 | elif not args.source_uri and not args.source_uri2: | 454 | elif not args.source_uri and not args.source_uri2: |
| 444 | sys.stderr.write("Error: a source is required\n") | 455 | sys.stderr.write("Error: a source is required\n") |
| 445 | parser.print_help() | 456 | parser.print_help() |