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

* update 'mu view' and 'mu cfind' to use colors in some cases

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-05-25 22:02:24 +03:00
parent 2b56e46260
commit f1ad2ebc51
2 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/mu-cmd-cfind.c
View File

@ -22,6 +22,7 @@
#endif /*HAVE_CONFIG_H*/
#include <stdlib.h>
#include <stdio.h>
#include "mu-cmd.h"
#include "mu-util.h"
@ -138,12 +139,37 @@ each_contact_org_contact (const char *email, const char *name)
name, email);
}
static void
print_plain (const char *email, const char *name, gboolean color)
{
if (name) {
if (color)
mu_util_color_print (MU_COLOR_MAGENTA, name);
else
fputs (name, stdout);
fputs (" ", stdout);
}
if (color)
mu_util_color_print (MU_COLOR_GREEN, email);
else
fputs (email, stdout);
fputs ("\n", stdout);
}
struct _ECData {
OutputFormat format;
gboolean color;
};
typedef struct _ECData ECData;
static void
each_contact (const char *email, const char *name, time_t tstamp,
OutputFormat format)
each_contact (const char *email, const char *name, time_t tstamp, ECData *ecdata)
{
switch (format) {
switch (ecdata->format) {
case FORMAT_MUTT_ALIAS: each_contact_mutt_alias (email, name); break;
case FORMAT_MUTT_AB:
g_print ("%s\t%s\t\n", email, name ? name : ""); break;
@ -155,17 +181,19 @@ each_contact (const char *email, const char *name, time_t tstamp,
g_print ("%s,%s\n", name ? name : "", email);
break;
default:
g_print ("%s%s%s\n", name ? name : "", name ? " " : "", email);
print_plain (email, name, ecdata->color);
}
}
static MuExitCode
run_cmd_cfind (const char* pattern, OutputFormat format)
run_cmd_cfind (const char* pattern, OutputFormat format,
gboolean color)
{
gboolean rv;
MuContacts *contacts;
size_t num;
ECData ecdata = {format, color};
contacts = mu_contacts_new (mu_runtime_path(MU_RUNTIME_PATH_CONTACTS));
if (!contacts) {
@ -176,7 +204,7 @@ run_cmd_cfind (const char* pattern, OutputFormat format)
print_header (format);
rv = mu_contacts_foreach (contacts,
(MuContactsForeachFunc)each_contact,
GINT_TO_POINTER(format), pattern, &num);
&ecdata, pattern, &num);
mu_contacts_destroy (contacts);
@ -208,10 +236,10 @@ mu_cmd_cfind (MuConfig *opts)
/* only one pattern allowed */
if (opts->params[1] && opts->params[2]) {
g_warning ("usage: mu cfind [OPTIONS] [<ptrn>]");
g_warning ("usage: mu cfind [options] [<ptrn>]");
return MU_EXITCODE_ERROR;
}
return run_cmd_cfind (opts->params[1], format);
return run_cmd_cfind (opts->params[1], format, opts->color);
}