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

* mu-msg-iter.cc: improve dup checking

Browse Source
This commit is contained in:
djcb
2012-12-22 21:12:11 +02:00
parent bb658a51de
commit 4c47b0b122
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,11 +117,14 @@ public:
MuMsgIterFlags flags() const { return _flags; } MuMsgIterFlags flags() const { return _flags; }
bool msg_uid_seen_before (const std::string& msg_uid) { bool msg_uid_seen_before (const std::string& msg_uid) {
if (_msg_uid_set.count (msg_uid) > 0) // g_printerr ("%s\n", msg_uid.c_str());
if (_msg_uid_set.find (msg_uid) != _msg_uid_set.end())
return true; return true;
else {
_msg_uid_set.insert (msg_uid); _msg_uid_set.insert (msg_uid);
return false; return false;
} }
}
private: private:
const Xapian::Enquire _enq; const Xapian::Enquire _enq;
@ -135,7 +138,7 @@ private:
struct ltstr { struct ltstr {
bool operator () (const std::string &s1, const std::string &s2) const { bool operator () (const std::string &s1, const std::string &s2) const {
return g_strcmp0 (s1.c_str(), s2.c_str()); return g_strcmp0 (s1.c_str(), s2.c_str()) < 0;
} }
}; };
std::set <std::string, ltstr> _msg_uid_set; std::set <std::string, ltstr> _msg_uid_set;
@ -266,16 +269,18 @@ mu_msg_iter_next (MuMsgIter *iter)
if (iter->cursor() == iter->matches().end()) if (iter->cursor() == iter->matches().end())
return FALSE; return FALSE;
/* filter out non-existing messages? */ /* filter out non-existing messages? */
else if ((iter->flags() & if ((iter->flags() &
MU_MSG_ITER_FLAG_SKIP_UNREADABLE) && MU_MSG_ITER_FLAG_SKIP_UNREADABLE)
!is_msg_file_readable (iter)) && !is_msg_file_readable (iter))
return mu_msg_iter_next (iter); /*skip!*/ return mu_msg_iter_next (iter); /*skip!*/
/* filter out msgid duplicates? */ /* filter out msgid duplicates? */
else if ((iter->flags() & MU_MSG_ITER_FLAG_SKIP_DUPS) && if ((iter->flags() & MU_MSG_ITER_FLAG_SKIP_DUPS) &&
msg_seen_before (iter)) msg_seen_before (iter))
return mu_msg_iter_next (iter); /*skip!*/ return mu_msg_iter_next (iter); /*skip!*/
else
return TRUE; return TRUE;
} MU_XAPIAN_CATCH_BLOCK_RETURN(FALSE); } MU_XAPIAN_CATCH_BLOCK_RETURN(FALSE);