--- a/scripts/search-index Wed Feb 11 04:14:22 2009 +0200
+++ b/scripts/search-index Wed Feb 11 04:19:10 2009 +0200
@@ -479,7 +479,7 @@
Command-line main, with given argv
"""
- from optparse import OptionParser
+ from optparse import OptionParser, OptionGroup
# define parser
parser = OptionParser(
@@ -488,22 +488,30 @@
)
# define command-line arguments
- parser.add_option('-h', "--help", dest="help", help="Show this help message and exit", action="store_true" )
- parser.add_option('-F', "--formatter", dest="formatter_name", help="LogFormatter to use", metavar="FMT", type="choice", default="irssi",
+ general = OptionGroup(parser, "General Options")
+ general.add_option('-h', "--help", dest="help", help="Show this help message and exit", action="store_true" )
+ general.add_option( "--formatter", dest="formatter_name", help="LogFormatter to use", metavar="FMT", type="choice", default="irssi",
choices=[fmt_name for fmt_name in config.LOG_FORMATTERS.iterkeys()])
- parser.add_option('-I', "--index", dest="index_path", help="Index database path", metavar="PATH", default="logs/index" )
- parser.add_option( "--autoload-state", dest="autoload_state_path", help="Path to autoload state dir", metavar="PATH", default="logs/autoload-state" )
- parser.add_option( "--after", dest="after", help="Only autoload logfiles after the given date", metavar="DATE", default=None )
- parser.add_option( "--until", dest="until", help="Only autoload logfiles up to the given date", metavar="DATE", default=None )
- parser.add_option('-Z', "--timezone", dest="tz_name", help="Timezone for output", metavar="TZ", default="UTC" )
- parser.add_option('-f', "--force", dest="force", help="Force dangerous operation", action="store_true" )
- parser.add_option( "--create", dest="create", help="Create index database", action="store_true" )
- parser.add_option( "--skip-missing", dest="skip_missing", help="Skip missing logfiles", action="store_true" )
- parser.add_option( "--reload", dest="reload", help="Force reload lines", action="store_true" )
- parser.add_option( "--reset", dest="reset", help="Reset old autload state", action="store_true" )
- parser.add_option( "--ignore-resume", dest="ignore_resume", help="Do not try and resume interrupted autoload", action="store_true" )
- parser.add_option( "--quiet", dest="quiet", help="Supress status messages", action="store_true" )
+ general.add_option( "--index", dest="index_path", help="Index database path", metavar="PATH", default="logs/index" )
+ general.add_option( "--timezone", dest="tz_name", help="Timezone for output", metavar="TZ", default="UTC" )
+ general.add_option( "--force", dest="force", help="Force dangerous operation", action="store_true" )
+ general.add_option( "--quiet", dest="quiet", help="Supress status messages", action="store_true" )
+ parser.add_option_group(general)
+
+ load = OptionGroup(parser, "Load Options")
+ load.add_option( "--skip-missing", dest="skip_missing", help="Skip missing logfiles", action="store_true" )
+ load.add_option( "--create", dest="create", help="Create index database", action="store_true" )
+ parser.add_option_group(load)
+
+ autoload = OptionGroup(parser, "Autoload Options")
+ autoload.add_option( "--autoload-state", dest="autoload_state_path", help="Path to autoload state dir", metavar="PATH", default="logs/autoload-state" )
+ autoload.add_option( "--after", dest="after", help="Only autoload logfiles after the given date", metavar="DATE", default=None )
+ autoload.add_option( "--until", dest="until", help="Only autoload logfiles up to the given date", metavar="DATE", default=None )
+ autoload.add_option( "--reload", dest="reload", help="Force reload lines", action="store_true" )
+ autoload.add_option( "--reset", dest="reset", help="Reset old autload state", action="store_true" )
+ autoload.add_option( "--ignore-resume", dest="ignore_resume", help="Do not try and resume interrupted autoload", action="store_true" )
+ parser.add_option_group(autoload)
# parse
options, args = parser.parse_args(argv[1:])