emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mu-cmd: enable the 'help' and 'cleanup' commands

This commit is contained in:
Dirk-Jan C. Binnema 2010-01-24 13:15:43 +02:00
parent 0b3de03d9d
commit f752584002
2 changed files with 47 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/mu-cmd.c
View File

@ -156,7 +156,7 @@ print_rows (MuQueryXapian *xapian, const gchar *query, MuConfigOptions *opts)
iter = mu_query_xapian_run (xapian, query, sortfield,
!opts->descending,
10000);
0);
if (!iter) {
g_printerr ("error: running query failed\n");
return FALSE;
@ -384,7 +384,7 @@ index_msg_cb (MuIndexStats* stats, void *user_data)
printf ("\b");
len = snprintf (output, sizeof(output),
"%c indexing mail; processed: %d; "
"%c processing mail; processed: %d; "
"updated/new: %d, cleaned-up: %d",
kars[i % 4], stats->_processed,
stats->_updated, stats->_cleaned_up);
@ -394,6 +394,37 @@ index_msg_cb (MuIndexStats* stats, void *user_data)
return MU_OK;
}
static gboolean
cmd_cleanup (MuConfigOptions *opts)
{
int rv;
MuIndex *midx;
MuIndexStats stats;
if (!check_index_params (opts))
return FALSE;
midx = mu_index_new (opts->xpath);
if (!midx) {
g_warning ("Cleanup failed");
return FALSE;
}
g_message ("Cleaning up removed messages from %s",
opts->xpath);
mu_index_stats_clear (&stats);
rv = mu_index_cleanup (midx, &stats,
opts->quiet ? NULL : index_msg_cb,
NULL);
mu_index_destroy (midx);
if (!opts->quiet)
g_print ("\n");
return rv == MU_OK ? TRUE : FALSE;
}
static gboolean
database_version_check_and_update (MuConfigOptions *opts)
@ -478,31 +509,6 @@ cmd_index (MuConfigOptions *opts)
}
MuResult
cleanup_cb (MuIndexStats *stats, void *user_data)
{
char *kars="-\\|/";
char output[100];
static int i = 0;
static int len = 0;
while (len --> 0)
printf ("\b");
len = snprintf (output, sizeof(output),
"%c mu is cleaning up the message database; "
"processed: %d; cleaned-up: %d",
kars[i % 4], stats->_processed, stats->_cleaned_up);
g_print ("%s", output);
++i;
return MU_OK;
}
static int
cmd_mkdir (MuConfigOptions *opts)
{
@ -529,60 +535,6 @@ cmd_mkdir (MuConfigOptions *opts)
return TRUE;
}
#if 0 /* currently, turned off */
static gboolean
cmd_help (MuConfigOptions *opts)
{
/* FIXME: get context-sensitive help */
_show_version ();
return _show_usage (FALSE);
}
static gboolean
cmd_cleanup (MuConfigOptions *opts)
{
int rv;
if (!_check_index_params (opts))
return FALSE;
mu_msg_gmime_init ();
{
MuIndex *midx;
MuIndexStats stats;
mu_index_stats_clear (&stats);
midx = mu_index_new (opts->xpath);
if (!midx) {
g_warning ("Cleanup failed");
return FALSE;
}
g_message ("Cleaning up removed messages from %s",
opts->xpath);
mu_index_cleanup (midx, &stats,
opts->quiet ? NULL :_cleanup_cb,
NULL);
mu_index_destroy (midx);
if (!opts->quiet) {
_cleanup_cb (&stats, NULL);
g_print ("\n");
}
}
mu_msg_gmime_uninit ();
return rv == MU_OK ? TRUE : FALSE;
}
#endif /* 0 */
static gboolean
show_usage (gboolean noerror)
{
@ -617,6 +569,16 @@ show_version (void)
}
static gboolean
cmd_help (MuConfigOptions *opts)
{
/* FIXME: get context-sensitive help */
show_version ();
return show_usage (FALSE);
}
gboolean
mu_cmd_execute (MuConfigOptions *opts)
{
@ -635,9 +597,8 @@ mu_cmd_execute (MuConfigOptions *opts)
case MU_CMD_INDEX: return cmd_index (opts);
case MU_CMD_FIND: return cmd_find (opts);
case MU_CMD_MKDIR: return cmd_mkdir (opts);
/* case MU_CMD_CLEANUP: return cmd_cleanup (opts); */
/* case MU_CMD_HELP: return cmd_help (opts); */
case MU_CMD_CLEANUP: return cmd_cleanup (opts);
case MU_CMD_HELP: return cmd_help (opts);
case MU_CMD_UNKNOWN: return show_usage (FALSE);
default:

5
src/mu-cmd.h
View File

@ -31,9 +31,8 @@ enum _MuCmd {
MU_CMD_FIND,
MU_CMD_CLEANUP,
MU_CMD_MKDIR,
/* not currently present */
/* MU_CMD_LINK, */
/* MU_CMD_HELP, */
MU_CMD_HELP,
MU_CMD_UNKNOWN
};
typedef enum _MuCmd MuCmd;