alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-cmd-index: simplify cmd-index, cmd-cleanup a bit

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-09-13 21:25:30 +03:00
parent 88ed5a9a6f
commit cd34353b27
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/mu-cmd-index.c
View File

@ -164,26 +164,28 @@ database_version_check_and_update (MuConfigOptions *opts)
} }
static MuResult static void
run_cleanup (MuIndex *midx, MuIndexStats *stats, gboolean quiet) show_time (unsigned t, unsigned processed)
{ {
g_message ("Cleaning up database"); if (t)
g_message ("Elapsed: %u second(s), ~ %u msg/s",
return mu_index_cleanup (midx, stats, t, processed/t);
quiet ? index_msg_silent_cb : index_msg_cb, else
NULL); g_message ("Elapsed: %u second(s)", t);
} }
gboolean gboolean
mu_cmd_cleanup (MuConfigOptions *opts) mu_cmd_cleanup (MuConfigOptions *opts)
{ {
MuResult rv; MuResult rv;
MuIndex *midx; MuIndex *midx;
MuIndexStats stats; MuIndexStats stats;
time_t t;
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") ||
mu_cmd_equals (opts, "index"),
FALSE);
if (!check_index_params (opts)) if (!check_index_params (opts))
return FALSE; return FALSE;
@ -199,10 +201,15 @@ mu_cmd_cleanup (MuConfigOptions *opts)
g_message ("Cleaning up removed messages from %s", g_message ("Cleaning up removed messages from %s",
opts->xpath); opts->xpath);
mu_index_stats_clear (&stats); mu_index_stats_clear (&stats);
rv = run_cleanup (midx, &stats, opts->quiet);
t = time (NULL);
rv = mu_index_cleanup (midx, &stats,
opts->quiet ? index_msg_silent_cb : index_msg_cb,
NULL);
maybe_newline (opts->quiet);
show_time ((unsigned)(time(NULL)-t),stats._processed);
mu_index_destroy (midx); mu_index_destroy (midx);
maybe_newline (opts->quiet);
return (rv == MU_OK || rv == MU_STOP) ? TRUE: FALSE; return (rv == MU_OK || rv == MU_STOP) ? TRUE: FALSE;
} }
@ -220,16 +227,6 @@ run_index (MuIndex *midx, const char* maildir, MuIndexStats *stats,
return rv; return rv;
} }
static void
show_time (unsigned t, unsigned processed)
{
if (t)
g_message ("Elapsed: %u second(s), ca. %u msg/s",
t, processed/t);
else
g_message ("Elapsed: %u second(s)", t);
}
gboolean gboolean
mu_cmd_index (MuConfigOptions *opts) mu_cmd_index (MuConfigOptions *opts)
@ -259,16 +256,11 @@ mu_cmd_index (MuConfigOptions *opts)
rv = run_index (midx, opts->maildir, &stats, opts->reindex, opts->quiet); rv = run_index (midx, opts->maildir, &stats, opts->reindex, opts->quiet);
maybe_newline (opts->quiet); maybe_newline (opts->quiet);
show_time ((unsigned)(time(NULL)-t), stats._processed); show_time ((unsigned)(time(NULL)-t), stats._processed);
if (rv == MU_OK && !opts->nocleanup) {
stats._processed = 0; /* restart processed at 0 */
t = time (NULL);
rv = run_cleanup (midx, &stats, opts->quiet);
maybe_newline (opts->quiet);
show_time ((unsigned)(time(NULL)-t),stats._processed);
}
mu_index_destroy (midx); mu_index_destroy (midx);
if (rv == MU_OK && !opts->nocleanup)
rv = mu_cmd_cleanup (opts);
MU_WRITE_LOG ("processed: %u; updated/new: %u, cleaned-up: %u", MU_WRITE_LOG ("processed: %u; updated/new: %u, cleaned-up: %u",
stats._processed, stats._updated, stats._cleaned_up); stats._processed, stats._updated, stats._cleaned_up);