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

lib: xapian-db/store: simplify

Browse Source 
No need for "pimpl" in xapian-db; keep it simple.
This commit is contained in:
Dirk-Jan C. Binnema
2023-07-09 23:17:08 +03:00
parent a32b924692
commit 0b4f7c4cbe
3 changed files with 44 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mu-store.cc
View File

@ -65,8 +65,8 @@ remove_slash(const std::string& str)
struct Store::Private {
Private(const std::string& path, bool readonly):
xapian_db_{make_db(path, readonly ? XapianDb::Flavor::ReadOnly
: XapianDb::Flavor::Open)},
xapian_db_{XapianDb(path, readonly ? XapianDb::Flavor::ReadOnly
: XapianDb::Flavor::Open)},
config_{xapian_db_},
contacts_cache_{config_},
root_maildir_{remove_slash(config_.get<Config::Id::RootMaildir>())}
@ -74,7 +74,7 @@ struct Store::Private {
Private(const std::string& path, const std::string& root_maildir,
Option<const Config&> conf):
xapian_db_{make_db(path, XapianDb::Flavor::CreateOverwrite)},
xapian_db_{XapianDb(path, XapianDb::Flavor::CreateOverwrite)},
config_{make_config(xapian_db_, root_maildir, conf)},
contacts_cache_{config_},
root_maildir_{remove_slash(config_.get<Config::Id::RootMaildir>())}
@ -118,13 +118,6 @@ struct Store::Private {
}
}
XapianDb make_db(const std::string& path, XapianDb::Flavor flavor) {
if (auto&& res{XapianDb::make(path, flavor)}; res)
return std::move(res.value());
else
throw res.error();
}
Config make_config(XapianDb& xapian_db, const std::string& root_maildir,
Option<const Config&> conf) {