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

* mu-cmd-index: use isatty, do not write progress info to stdout unless it's a tty

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-09-15 20:59:42 +03:00
parent 18e2cf2912
commit 3375066c4f
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <unistd.h>
#include "mu-util.h" #include "mu-util.h"
#include "mu-util-db.h" #include "mu-util-db.h"
@ -187,6 +188,7 @@ mu_cmd_cleanup (MuConfigOptions *opts)
MuIndex *midx; MuIndex *midx;
MuIndexStats stats; MuIndexStats stats;
time_t t; time_t t;
gboolean quiet;
g_return_val_if_fail (opts, FALSE); g_return_val_if_fail (opts, FALSE);
g_return_val_if_fail (mu_cmd_equals (opts, "cleanup") || g_return_val_if_fail (mu_cmd_equals (opts, "cleanup") ||
@ -209,8 +211,9 @@ mu_cmd_cleanup (MuConfigOptions *opts)
mu_index_stats_clear (&stats); mu_index_stats_clear (&stats);
t = time (NULL); t = time (NULL);
quiet = opts->quiet || !isatty(fileno(stdout));
rv = mu_index_cleanup (midx, &stats, rv = mu_index_cleanup (midx, &stats,
opts->quiet ? index_msg_silent_cb : index_msg_cb, quiet ? index_msg_silent_cb : index_msg_cb,
NULL); NULL);
maybe_newline (opts->quiet); maybe_newline (opts->quiet);
show_time ((unsigned)(time(NULL)-t),stats._processed); show_time ((unsigned)(time(NULL)-t),stats._processed);
@ -220,24 +223,12 @@ mu_cmd_cleanup (MuConfigOptions *opts)
return (rv == MU_OK || rv == MU_STOP) ? TRUE: FALSE; return (rv == MU_OK || rv == MU_STOP) ? TRUE: FALSE;
} }
static MuResult
run_index (MuIndex *midx, const char* maildir, MuIndexStats *stats,
gboolean reindex, gboolean quiet)
{
MuResult rv;
mu_index_stats_clear (stats);
rv = mu_index_run (midx, maildir, reindex, stats,
quiet ? index_msg_silent_cb :index_msg_cb,
NULL, NULL);
return rv;
}
gboolean gboolean
mu_cmd_index (MuConfigOptions *opts) mu_cmd_index (MuConfigOptions *opts)
{ {
gboolean rv; MuResult rv;
gboolean quiet;
MuIndex *midx; MuIndex *midx;
MuIndexStats stats; MuIndexStats stats;
time_t t; time_t t;
@ -259,7 +250,12 @@ 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);
t = time (NULL); t = time (NULL);
rv = run_index (midx, opts->maildir, &stats, opts->reindex, opts->quiet);
mu_index_stats_clear (&stats);
quiet = opts->quiet || !isatty(fileno(stdout));
rv = mu_index_run (midx, opts->maildir, opts->reindex, &stats,
quiet ? index_msg_silent_cb :index_msg_cb,
NULL, NULL);
maybe_newline (opts->quiet); maybe_newline (opts->quiet);
show_time ((unsigned)(time(NULL)-t), stats._processed); show_time ((unsigned)(time(NULL)-t), stats._processed);
mu_index_destroy (midx); mu_index_destroy (midx);