mirror of https://github.com/djcb/mu.git
index: improve error message when file does not seem to be an email
This commit is contained in:
parent
66ebdf21e0
commit
edfdef44a4
|
@ -128,9 +128,9 @@ insert_or_update_maybe (const char *fullpath, const char *mdir,
|
||||||
time_t filestamp, MuIndexCallbackData *data,
|
time_t filestamp, MuIndexCallbackData *data,
|
||||||
gboolean *updated)
|
gboolean *updated)
|
||||||
{
|
{
|
||||||
MuMsg *msg;
|
MuMsg *msg;
|
||||||
GError *err;
|
GError *err;
|
||||||
gboolean rv;
|
gboolean rv;
|
||||||
|
|
||||||
*updated = FALSE;
|
*updated = FALSE;
|
||||||
if (!needs_index (data, fullpath, filestamp))
|
if (!needs_index (data, fullpath, filestamp))
|
||||||
|
@ -139,8 +139,13 @@ insert_or_update_maybe (const char *fullpath, const char *mdir,
|
||||||
err = NULL;
|
err = NULL;
|
||||||
msg = mu_msg_new_from_file (fullpath, mdir, &err);
|
msg = mu_msg_new_from_file (fullpath, mdir, &err);
|
||||||
if (!msg) {
|
if (!msg) {
|
||||||
g_warning ("error creating message object: %s",
|
if (!err)
|
||||||
err ? err->message : "cause unknown");
|
g_warning ("error creating message object: %s",
|
||||||
|
fullpath);
|
||||||
|
else {
|
||||||
|
g_warning ("%s", err->message);
|
||||||
|
g_clear_error (&err);
|
||||||
|
}
|
||||||
/* warn, then simply continue */
|
/* warn, then simply continue */
|
||||||
return MU_OK;
|
return MU_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,8 +155,7 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
|
||||||
g_object_unref (stream);
|
g_object_unref (stream);
|
||||||
if (!parser) {
|
if (!parser) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
|
||||||
"%s: cannot create mime parser for %s",
|
"cannot create mime parser for %s", path);
|
||||||
__FUNCTION__, path);
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,8 +163,7 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
|
||||||
g_object_unref (parser);
|
g_object_unref (parser);
|
||||||
if (!self->_mime_msg) {
|
if (!self->_mime_msg) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
|
||||||
"%s: cannot construct mime message for %s",
|
"message seems invalid, ignoring (%s)", path);
|
||||||
__FUNCTION__, path);
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue