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

* mu: provide fake-msgids for messages without; this fixes the problem where e.g. draft messages

Browse Source 
were not visible when using --include-related
This commit is contained in:
djcb
2013-04-09 21:20:25 +03:00
parent 21a216acd2
commit 3dc98724b3
4 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/mu-msg-iter.cc
View File

@ -125,22 +125,27 @@ public:
MuMsgIterFlags flags() const { return _flags; }
const std::string msgid () const {
const Xapian::Document doc (cursor().get_document());
return doc.get_value(MU_MSG_FIELD_ID_PATH);
}
unsigned docid () const {
const Xapian::Document doc (cursor().get_document());
return doc.get_docid();
}
bool looks_like_dup () const {
try {
const Xapian::Document doc (cursor().get_document());
const std::string msgid (doc.get_value(MU_MSG_FIELD_ID_MSGID));
unsigned docid (doc.get_docid());
if (msgid.empty())
return false;
// is this message in the preferred map? if
// so, it's not a duplicate, otherwise, it
// isn't
msgid_docid_map::const_iterator pref_iter (_preferred_map.find (msgid));
msgid_docid_map::const_iterator pref_iter (_preferred_map.find (msgid()));
if (pref_iter != _preferred_map.end()) {
//std::cerr << "in the set!" << std::endl;
if ((*pref_iter).second == docid)
if ((*pref_iter).second == docid())
return false; // in the set: not a dup!
else
return true;
@ -148,10 +153,10 @@ public:
// otherwise, simply check if we've already seen this message-id,
// and, if so, it's considered a dup
if (_msg_uid_set.find (msgid) != _msg_uid_set.end()) {
if (_msg_uid_set.find (msgid()) != _msg_uid_set.end()) {
return true;
} else {
_msg_uid_set.insert (msgid);
_msg_uid_set.insert (msgid());
return false;
}
} catch (...) {
@ -159,7 +164,8 @@ public:
}
}
static void each_preferred (const char *msgid, gpointer docidp, msgid_docid_map *preferred_map) {
static void each_preferred (const char *msgid, gpointer docidp,
msgid_docid_map *preferred_map) {
(*preferred_map)[msgid] = GPOINTER_TO_SIZE(docidp);
}
@ -346,7 +352,7 @@ mu_msg_iter_get_docid (MuMsgIter *iter)
g_return_val_if_fail (!mu_msg_iter_is_done(iter),
(unsigned int)-1);
try {
return iter->cursor().get_document().get_docid();
return iter->docid();
} MU_XAPIAN_CATCH_BLOCK_RETURN ((unsigned int)-1);
}
@ -360,10 +366,7 @@ mu_msg_iter_get_msgid (MuMsgIter *iter)
g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
try {
const std::string msgid (
iter->cursor().get_document().get_value(MU_MSG_FIELD_ID_MSGID).c_str());
return msgid.empty() ? NULL : msgid.c_str();
return iter->msgid().c_str();
} MU_XAPIAN_CATCH_BLOCK_RETURN (NULL);
}