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

Merge branch 'master' into procmule

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-07-10 20:11:35 +03:00
parent 0b7693d077 e06f036c72
commit 6e15e3a8e1
23 changed files with 284 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mu-cmd-extract.c
View File

@ -296,8 +296,6 @@ save_parts (const char *path, const char *filename, MuConfig *opts)
return rv;
}
#define color_maybe(C) do{ if (color) fputs ((C),stdout);}while(0)
static void

99
src/mu-cmd-find.c
View File

@ -51,7 +51,7 @@ enum _OutputFormat {
FORMAT_SEXP,
FORMAT_XML,
FORMAT_XQUERY,
FORMAT_NONE
};
typedef enum _OutputFormat OutputFormat;
@ -141,8 +141,8 @@ sort_field_from_string (const char* fieldstr)
static gboolean
run_query_format (MuMsgIter *iter, MuConfig *opts,
OutputFormat format, size_t *count)
output_query_results (MuMsgIter *iter, MuConfig *opts,
OutputFormat format, size_t *count)
{
switch (format) {
@ -165,14 +165,12 @@ run_query_format (MuMsgIter *iter, MuConfig *opts,
}
static gboolean
run_query (MuQuery *xapian, const gchar *query, MuConfig *opts,
OutputFormat format, size_t *count)
static MuMsgIter*
run_query (MuQuery *xapian, const gchar *query, MuConfig *opts, size_t *count)
{
GError *err;
MuMsgIter *iter;
MuMsgFieldId sortid;
gboolean rv;
sortid = MU_MSG_FIELD_ID_NONE;
if (opts->sortfield) {
@ -188,10 +186,25 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts,
if (!iter) {
g_warning ("error: %s", err->message);
g_error_free (err);
return FALSE;
return NULL;
}
rv = run_query_format (iter, opts, format, count);
return iter;
}
static gboolean
process_query (MuQuery *xapian, const gchar *query, MuConfig *opts,
OutputFormat format, size_t *count)
{
MuMsgIter *iter;
gboolean rv;
iter = run_query (xapian, query, opts, count);
if (!iter)
return FALSE;
rv = output_query_results (iter, opts, format, count);
if (rv && count && *count == 0)
g_warning ("no matching messages found");
@ -202,6 +215,66 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts,
}
static gboolean
exec_cmd (const char *path, const char *cmd)
{
gint status;
GError *err;
char *cmdline, *escpath;
gboolean rv;
if (access (path, R_OK) != 0) {
g_warning ("cannot read %s: %s", path, strerror(errno));
return FALSE;
}
escpath = g_strescape (path, NULL);
cmdline = g_strdup_printf ("%s %s", cmd, escpath);
err = NULL;
rv = g_spawn_command_line_sync (cmdline, NULL, NULL,
&status, &err);
g_free (cmdline);
g_free (escpath);
if (!rv) {
g_warning ("command returned %d on %s: %s\n",
status, path, err->message);
g_error_free (err);
return FALSE;
}
return TRUE;
}
static gboolean
exec_cmd_on_query (MuQuery *xapian, const gchar *query, MuConfig *opts,
size_t *count)
{
MuMsgIter *iter;
gboolean rv;
if (!(iter = run_query (xapian, query, opts, count)))
return FALSE;
for (rv = TRUE, *count = 0; !mu_msg_iter_is_done (iter); mu_msg_iter_next(iter)) {
rv = exec_cmd (mu_msg_get_path (mu_msg_iter_get_msg (iter, NULL)),
opts->exec);
if (rv)
++*count;
}
if (rv && count && *count == 0)
g_warning ("no matching messages found");
mu_msg_iter_destroy (iter);
return rv;
}
static gboolean
format_params_valid (MuConfig *opts)
@ -489,8 +562,6 @@ ansi_reset_maybe (MuMsgFieldId mfid, gboolean color)
}
static const char*
display_field (MuMsgIter *iter, MuMsgFieldId mfid)
{
@ -842,7 +913,7 @@ mu_cmd_find (MuConfig *opts)
if (!query_params_valid (opts) || !format_params_valid(opts))
return MU_EXITCODE_ERROR;
format = get_output_format (opts->formatstr);
xapian = get_query_obj();
query = get_query (opts);
@ -852,8 +923,10 @@ mu_cmd_find (MuConfig *opts)
if (format == FORMAT_XQUERY)
rv = print_xapian_query (xapian, query, &count);
else if (opts->exec)
rv = exec_cmd_on_query (xapian, query, opts, &count);
else
rv = run_query (xapian, query, opts, format, &count);
rv = process_query (xapian, query, opts, format, &count);
mu_query_destroy (xapian);
g_free (query);

6
src/mu-cmd.c
View File

@ -34,7 +34,7 @@
#include "mu-contacts.h"
#include "mu-runtime.h"
#define VIEW_SEPARATOR '\f' /* form-feed */
#define VIEW_TERMINATOR '\f' /* form-feed */
static void
@ -196,8 +196,8 @@ mu_cmd_view (MuConfig *opts)
if (rv != MU_EXITCODE_OK)
break;
/* add a separator between two messages? */
if (opts->params[i+1] && opts->separate)
g_print ("%c", VIEW_SEPARATOR);
if (opts->terminator)
g_print ("%c", VIEW_TERMINATOR);
}
return rv;

8
src/mu-config.c
View File

@ -176,7 +176,9 @@ config_options_group_find (MuConfig *opts)
"clear old links before filling a linksdir (false)", NULL},
{"format", 'o', 0, G_OPTION_ARG_STRING, &opts->formatstr,
"output format ('plain'(*), 'links', 'xml',"
"'json', 'sexp', 'xquery')", NULL},
"'json', 'sexp', 'xquery')", NULL},
{"exec", 'e', 0, G_OPTION_ARG_STRING, &opts->exec,
"execute command on each match message", NULL},
{NULL, 0, 0, 0, NULL, NULL, NULL}
};
@ -243,8 +245,8 @@ config_options_group_view (MuConfig *opts)
GOptionEntry entries[] = {
{"summary", 0, 0, G_OPTION_ARG_NONE, &opts->summary,
"only show a short summary of the message (false)", NULL},
{"separate", 0, 0, G_OPTION_ARG_NONE, &opts->separate,
"separate messages with ascii-0x07 (form-feed)", NULL},
{"terminate", 0, 0, G_OPTION_ARG_NONE, &opts->terminator,
"terminate messages with ascii-0x07 (\\f, form-feed)", NULL},
{NULL, 0, 0, 0, NULL, NULL, NULL}
};

11
src/mu-config.h
View File

@ -103,11 +103,14 @@ struct _MuConfig {
char *bookmark; /* use bookmark */
char *formatstr; /* output type
* (plain,links,xml,json,sexp) */
char *exec; /* command to execute on the
* files for the matched
* messages */
/* options for view */
gboolean separate; /* add separator between
* multiple messages in mu
* view */
gboolean terminator; /* add separator \f between
* multiple messages in mu
* view */
/* output to a maildir with symlinks */
char *linksdir; /* maildir to output symlinks */

2
src/mu-msg-doc.cc
View File

@ -92,7 +92,7 @@ mu_msg_doc_get_str_list_field (MuMsgDoc *self, MuMsgFieldId mfid,
try {
/* return a comma-separated string as a GSList */
const std::string s (self->doc().get_value(mfid));
return s.empty() ? NULL : mu_str_to_list(s.c_str(),',');
return s.empty() ? NULL : mu_str_to_list(s.c_str(),',',TRUE);
} MU_XAPIAN_CATCH_BLOCK_RETURN(NULL);
}

7
src/mu-msg-fields.c
View File

@ -204,16 +204,15 @@ static const MuMsgField FIELD_DATA[] = {
MU_MSG_FIELD_ID_REFS,
MU_MSG_FIELD_TYPE_STRING_LIST,
NULL, 'r', 'R',
FLAG_GMIME | FLAG_XAPIAN_VALUE |
FLAG_XAPIAN_PREFIX_ONLY
FLAG_GMIME | FLAG_XAPIAN_VALUE | FLAG_XAPIAN_PREFIX_ONLY
},
{
MU_MSG_FIELD_ID_TAGS,
MU_MSG_FIELD_TYPE_STRING_LIST,
"tag", 'x', 'X',
FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_VALUE |
FLAG_XAPIAN_PREFIX_ONLY
FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_PREFIX_ONLY |
FLAG_NORMALIZE | FLAG_XAPIAN_ESCAPE
}
};

2
src/mu-msg-file.c
View File

@ -715,7 +715,7 @@ get_tags (MuMsgFile *self)
obj = GMIME_OBJECT(self->_mime_msg);
return mu_str_to_list (g_mime_object_get_header
(obj, "X-Label"), ',');
(obj, "X-Label"), ',', TRUE);
}

69
src/mu-store.cc
View File

@ -374,34 +374,6 @@ add_terms_values_str (Xapian::Document& doc, char *val,
doc.add_term (prefix(mfid) +
std::string(val, 0, MU_STORE_MAX_TERM_LENGTH));
}
static void
add_terms_values_string_list (Xapian::Document& doc, MuMsg *msg,
MuMsgFieldId mfid)
{
const GSList *lst;
lst = mu_msg_get_field_string_list (msg, mfid);
if (lst && mu_msg_field_xapian_value (mfid)) {
gchar *str;
str = mu_str_from_list (lst, ',');
if (str)
doc.add_value ((Xapian::valueno)mfid, str);
g_free (str);
}
if (lst && mu_msg_field_xapian_term (mfid)) {
while (lst) {
doc.add_term (prefix(mfid) +
std::string((char*)lst->data, 0,
MU_STORE_MAX_TERM_LENGTH));
lst = g_slist_next ((GSList*)lst);
}
}
}
static void
@ -426,6 +398,47 @@ add_terms_values_string (Xapian::Document& doc, MuMsg *msg,
g_free (val);
}
static void
add_terms_values_string_list (Xapian::Document& doc, MuMsg *msg,
MuMsgFieldId mfid)
{
const GSList *lst;
lst = mu_msg_get_field_string_list (msg, mfid);
if (lst && mu_msg_field_xapian_value (mfid)) {
gchar *str;
str = mu_str_from_list (lst, ',');
if (str)
doc.add_value ((Xapian::valueno)mfid, str);
g_free (str);
}
if (lst && mu_msg_field_xapian_term (mfid)) {
while (lst) {
size_t len;
char *val;
/* try stack-allocation, it's much faster*/
len = strlen ((char*)lst->data);
if (G_LIKELY(len < 1024))
val = (char*)g_alloca(len+1);
else
val = (char*)g_malloc(len+1);
strcpy (val, (char*)lst->data);
add_terms_values_str (doc, val, mfid);
if (!(G_LIKELY(len < 1024)))
g_free (val);
lst = g_slist_next ((GSList*)lst);
}
}
}
struct PartData {
PartData (Xapian::Document& doc, MuMsgFieldId mfid):
_doc (doc), _mfid(mfid) {}

12
src/mu-str.c
View File

@ -399,7 +399,7 @@ mu_str_from_list (const GSList *lst, char sepa)
}
GSList*
mu_str_to_list (const char *str, char sepa)
mu_str_to_list (const char *str, char sepa, gboolean strip)
{
GSList *lst;
gchar **strs, **cur;
@ -413,8 +413,14 @@ mu_str_to_list (const char *str, char sepa)
sep[0] = sepa;
strs = g_strsplit (str, sep, -1);
for (cur = strs, lst = NULL; cur && *cur; ++cur)
lst = g_slist_prepend (lst, g_strdup(*cur));
for (cur = strs, lst = NULL; cur && *cur; ++cur) {
char *elm;
elm = g_strdup(*cur);
if (strip)
elm = g_strstrip (elm);
lst = g_slist_prepend (lst, elm);
}
lst = g_slist_reverse (lst);
g_strfreev (strs);

5
src/mu-str.h
View File

@ -277,14 +277,15 @@ char* mu_str_from_list (const GSList *lst, char sepa);
/**
* convert a #sepa-separated list of strings in to a GSList
* convert a #se0pa-separated list of strings in to a GSList
*
* @param str a #sepa-separated list of strings
* @param the separator character
* @param remove leading/trailing whitespace from the string
*
* @return a newly allocated GSList (free with mu_str_free_list)
*/
GSList* mu_str_to_list (const char *str, char sepa);
GSList* mu_str_to_list (const char *str, char sepa, gboolean strip);
/**

1
src/tests/Makefile.am
View File

@ -124,6 +124,7 @@ EXTRA_DIST= \
testdir2/bar/cur/mail4 \
testdir2/bar/cur/mail5 \
testdir2/bar/cur/181736.eml \
testdir2/bar/cur/mail6 \
testdir2/bar/tmp/.noindex \
testdir2/bar/new/.noindex \
testdir2/Foo/cur/mail5 \

7
src/tests/test-mu-cmd.c
View File

@ -115,7 +115,7 @@ test_mu_index (void)
store = mu_store_new (xpath, NULL, NULL);
g_assert (store);
g_assert_cmpuint (mu_store_count (store), ==, 8);
g_assert_cmpuint (mu_store_count (store), ==, 9);
mu_store_destroy (store);
g_free (muhome);
@ -498,7 +498,7 @@ test_mu_view_multi_separate (void)
tmpdir = test_mu_common_get_random_tmpdir();
g_assert (g_mkdir_with_parents (tmpdir, 0700) == 0);
cmdline = g_strdup_printf ("%s view --separate --muhome=%s "
cmdline = g_strdup_printf ("%s view --terminate --muhome=%s "
"%s%cbar%ccur%cmail5 "
"%s%cbar%ccur%cmail5",
MU_PROGRAM,
@ -517,8 +517,7 @@ test_mu_view_multi_separate (void)
len = strlen(output);
/* g_print ("\n[%s](%u)\n", output, len); */
g_assert_cmpuint (len,==,165);
g_assert_cmpuint (len,==,166);
g_free (output);
g_free (cmdline);

4
src/tests/test-mu-msg.c
View File

@ -321,8 +321,8 @@ test_mu_msg_tags (void)
==, 1217530645);
tags = mu_msg_get_tags (msg);
g_assert_cmpstr ((char*)tags->data,==,"paradise");
g_assert_cmpstr ((char*)tags->next->data,==,"lost");
g_assert_cmpstr ((char*)tags->data,==,"Paradise");
g_assert_cmpstr ((char*)tags->next->data,==,"losT");
g_assert (tags->next->next == NULL);
mu_msg_unref (msg);

44
src/tests/test-mu-query.c
View File

@ -45,7 +45,7 @@ fill_database (const char *testdir)
" --quiet",
MU_PROGRAM, tmpdir, testdir);
/* g_printerr ("\n%s\n", cmdline); */
/* g_printerr ("\n%s\n", cmdline); */
g_assert (g_spawn_command_line_sync (cmdline, NULL, NULL,
NULL, NULL));
@ -87,7 +87,6 @@ run_and_count_matches (const char *xpath, const char *query)
MuQuery *mquery;
MuMsgIter *iter;
guint count1, count2;
GHashTable *hash;
mquery = mu_query_new (xpath, NULL);
g_assert (query);
@ -107,9 +106,6 @@ run_and_count_matches (const char *xpath, const char *query)
mu_query_destroy (mquery);
g_assert (iter);
hash = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify)g_free, NULL);
assert_no_dups (iter);
/* run query twice, to test mu_msg_iter_reset */
@ -414,7 +410,7 @@ test_mu_query_attach (void)
/* g_print ("(%s)\n", xpath); */
for (i = 0; i != G_N_ELEMENTS(queries); ++i)
for (i = 0; i != G_N_ELEMENTS(queries); ++i)
g_assert_cmpuint (run_and_count_matches (xpath, queries[i].query),
==, queries[i].count);
@ -450,6 +446,34 @@ test_mu_query_tags (void)
}
static void
test_mu_query_tags_02 (void)
{
gchar *xpath;
int i;
QResults queries[] = {
{ "x:paradise", 1},
{ "tag:@NextActions", 1},
{ "x:queensrÿche", 1},
{ "tag:lost OR tag:operation:mindcrime", 2},
};
xpath = fill_database (MU_TESTMAILDIR2);
g_assert (xpath != NULL);
/* g_print ("(%s)\n", xpath); */
for (i = 0; i != G_N_ELEMENTS(queries); ++i) {
/* g_print ("%s\n", queries[i].query); */
g_assert_cmpuint (run_and_count_matches (xpath, queries[i].query),
==, queries[i].count);
}
g_free (xpath);
}
int
@ -476,10 +500,12 @@ main (int argc, char *argv[])
test_mu_query_attach);
g_test_add_func ("/mu-query/test-mu-query-tags",
test_mu_query_tags);
g_test_add_func ("/mu-query/test-mu-query-tags_02",
test_mu_query_tags_02);
/* g_log_set_handler (NULL, */
/* G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION, */
/* (GLogFunc)black_hole, NULL); */
g_log_set_handler (NULL,
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION,
(GLogFunc)black_hole, NULL);
rv = g_test_run ();

20
src/tests/test-mu-str.c
View File

@ -323,19 +323,31 @@ static void
test_mu_str_to_list (void)
{
{
const char *items[]= {"foo", "bar", "cuux", NULL};
GSList *lst = mu_str_to_list ("foo@bar@cuux",'@');
const char *items[]= {"foo", "bar ", "cuux", NULL};
GSList *lst = mu_str_to_list ("foo@bar @cuux",'@', FALSE);
assert_cmplst (lst, items);
mu_str_free_list (lst);
}
{
GSList *lst = mu_str_to_list (NULL,'x');
GSList *lst = mu_str_to_list (NULL,'x',FALSE);
g_assert (lst == NULL);
mu_str_free_list (lst);
}
}
static void
test_mu_str_to_list_strip (void)
{
{
const char *items[]= {"foo", "bar", "cuux", NULL};
GSList *lst = mu_str_to_list ("foo@bar @cuux",'@', TRUE);
assert_cmplst (lst, items);
mu_str_free_list (lst);
}
}
static void
@ -474,6 +486,8 @@ main (int argc, char *argv[])
test_mu_str_from_list);
g_test_add_func ("/mu-str/mu-str-to-list",
test_mu_str_to_list);
g_test_add_func ("/mu-str/mu-str-to-list-strip",
test_mu_str_to_list_strip);
g_test_add_func ("/mu-str/mu_str_date_parse_hdwmy",
test_mu_str_date_parse_hdwmy);

2
src/tests/testdir2/bar/cur/mail1
View File

@ -4,7 +4,7 @@ Subject: Fere libenter homines id quod volunt credunt
To: "Julius Caesar" <jc@example.com>
Message-id: <3BE9E6535E3029448670913581E7A1A20D852173@emss35m06.us.lmco.com>
MIME-version: 1.0
x-label: paradise,lost
x-label: Paradise, losT
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Precedence: high

18
src/tests/testdir2/bar/cur/mail6 Normal file
View File

@ -0,0 +1,18 @@
Date: Thu, 31 Jul 2008 14:57:25 -0400
From: "Geoff Tate" <jeff@example.com>
Subject: eyes of a stranger
To: "Enrico Fermi" <enrico@example.com>
Message-id: <3BE9E6535E302944823E7A1A20D852173@msg.id>
MIME-version: 1.0
X-label: @NextActions, operation:mindcrime, Queensrÿche
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Precedence: high
And I raise my head and stare
Into the eyes of a stranger
I've always known that the mirror never lies
People always turn away
From the eyes of a stranger
Afraid to know what
Lies behind the stare