qmsk.irclogs: comparison scripts/search-index

equal deleted inserted replaced

-:df859bfdd3be
+:86aebc9cb60b
 # handle errors
 except CommandError, e :
 # skip?
 if options.skip_missing :
-print "[ERROR] %s" % (date_name, e)
+if not options.quiet :
+print "[ERROR] %s" % (date_name, e)
 continue
 else :
 raise
 # get the set of days
 days = list(channel.source.get_month_days(month))
-print "Loading %d days of logs:" % (len(days))
+if not options.quiet :
+print "Loading %d days of logs:" % (len(days))
 # load each day
 for date in days :
 # convert to datetime
 dt = datetime.datetime.combine(date, datetime.time(0)).replace(tzinfo=channel.source.tz)
 channels = [config.LOG_CHANNELS.lookup(channel_name) for channel_name in channel_names]
 # reset autoload state?
 if options.reset :
 _autoload_reset(options, channels)
-print
+if not options.quiet :
+print
 # iterate channels
 for channel in channels :
 if not options.quiet :
 print "Channel %s:" % channel.id
 # close+delete tempfile
 statefile_tmp.close()
 os.remove(statefile_tmppath)
-print
+if not options.quiet :
+print
 # done
 return
 def cmd_help (options, *args) :
 general = optparse.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",
+metavar="FMT",  type="choice",                              default=config.PREF_FORMATTER_DEFAULT.name,
 choices=[fmt_name for fmt_name in config.LOG_FORMATTERS.iterkeys()]                             )
 general.add_option(     "--index",          dest="index_path",      help="Index database path",
-metavar="PATH",                                             default="logs/index"                )
+metavar="PATH",                                             default=config.SEARCH_INDEX_PATH    )
 general.add_option(     "--timezone",       dest="timezone",        help="Timezone for output",
 metavar="TZ",   type="timezone",                            default=pytz.utc                    )
 general.add_option(     "--force",          dest="force",           help="Force dangerous operation",
 # cmd_autoload options  #                   #                       #                                   #
 autoload = optparse.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"       )
+metavar="PATH",                                             default=config.SEARCH_AUTOINDEX_PATH)
 autoload.add_option(    "--from",           dest="after",           help="Only autoload logfiles from the given date on",
 metavar="DATE", type="date",        action="parse_date",    default=None                        )
 autoload.add_option(    "--until",          dest="until",           help="Only autoload logfiles up to (and including) the given date",

changeset 121	86aebc9cb60b
parent 106	0690d715385d