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

contacts: rework: install in database

Browse Source 
Rewrite the contacts-cache backend in c++

Store the contacts as metadata in the xapian database, rather than in a
separate file.

Update the Store to deal with this.
This commit is contained in:
djcb
2019-04-28 13:57:07 +03:00
parent 9a225365c1
commit 8193cc3e4c
9 changed files with 525 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/mu-store-write.cc
View File

@ -40,7 +40,7 @@
#include "mu-str.h"
#include "mu-date.h"
#include "mu-flags.h"
#include "mu-contacts.h"
#include "mu-contacts.hh"
void
_MuStore::begin_transaction ()
@ -133,8 +133,7 @@ mu_store_new_writable (const char* xpath, const char *contacts_cache,
try {
try {
MuStore *store;
store = new _MuStore (xpath, contacts_cache,
rebuild ? true : false);
store = new _MuStore (xpath, rebuild ? true : false);
add_synonyms (store);
return store;
@ -190,20 +189,19 @@ mu_store_clear (MuStore *store, GError **err)
void
mu_store_flush (MuStore *store)
{
g_return_if_fail (store);
mu_store_flush (MuStore *store) try {
try {
if (store->in_transaction())
store->commit_transaction ();
store->db_writable()->commit ();
g_return_if_fail (store);
} MU_XAPIAN_CATCH_BLOCK;
if (store->in_transaction())
store->commit_transaction ();
store->db_writable()->commit ();
if (store->contacts())
mu_contacts_serialize (store->contacts());
}
if (store->contacts())
store->db_writable()->set_metadata(MU_CONTACTS_CACHE,
store->contacts()->serialize());
} MU_XAPIAN_CATCH_BLOCK;
static void
add_terms_values_date (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
@ -601,11 +599,12 @@ each_contact_info (MuMsgContact *contact, MsgDoc *msgdoc)
add_term(*msgdoc->_doc, pfx + flat);
add_address_subfields (*msgdoc->_doc, contact->address, pfx);
/* store it also in our contacts cache */
if (msgdoc->_store->contacts())
mu_contacts_add (msgdoc->_store->contacts(),
contact->address, contact->name,
msgdoc->_personal,
mu_msg_get_date(msgdoc->_msg));
auto contacts = msgdoc->_store->contacts();
if (contacts)
contacts->add(contact->address,
contact->name ? contact->name : "",
msgdoc->_personal,
mu_msg_get_date(msgdoc->_msg));
}
return TRUE;