* mu-cmd-index: mention cleanup phase in user output

This commit is contained in:
Dirk-Jan C. Binnema
2010-09-09 08:17:50 +03:00
parent ae50a6364e
commit 42cdf60504

View File

@ -159,9 +159,11 @@ database_version_check_and_update (MuConfigOptions *opts)
static MuResult static MuResult
run_cleanup (MuIndex *midx, MuIndexStats *stats, gboolean quiet) run_cleanup (MuIndex *midx, MuIndexStats *stats, gboolean quiet)
{ {
return mu_index_cleanup (midx, stats, g_message ("Cleaning up database");
quiet ? index_msg_silent_cb : index_msg_cb,
NULL); return mu_index_cleanup (midx, stats,
quiet ? index_msg_silent_cb : index_msg_cb,
NULL);
} }
@ -175,7 +177,6 @@ mu_cmd_cleanup (MuConfigOptions *opts)
g_return_val_if_fail (opts, FALSE); g_return_val_if_fail (opts, FALSE);
g_return_val_if_fail (mu_cmd_equals (opts, "cleanup"), FALSE); g_return_val_if_fail (mu_cmd_equals (opts, "cleanup"), FALSE);
if (!check_index_params (opts)) if (!check_index_params (opts))
return FALSE; return FALSE;
@ -246,7 +247,8 @@ mu_cmd_index (MuConfigOptions *opts)
g_message ("Indexing messages under %s", opts->maildir); g_message ("Indexing messages under %s", opts->maildir);
g_message ("Database: %s", opts->xpath); g_message ("Database: %s", opts->xpath);
rv = run_index (midx, opts->maildir, &stats, opts->reindex, opts->quiet); rv = run_index (midx, opts->maildir, &stats,
opts->reindex, opts->quiet);
if (rv == MU_OK && !opts->nocleanup) { if (rv == MU_OK && !opts->nocleanup) {
stats._processed = 0; /* restart processed at 0 */ stats._processed = 0; /* restart processed at 0 */
rv = run_cleanup (midx, &stats, opts->quiet); rv = run_cleanup (midx, &stats, opts->quiet);