store: rename "metadata" into "properties"
properties are the constant (for the duration) values for a store; metadata may change, so reserve that name for that.
This commit is contained in:
@ -96,7 +96,7 @@ Mu::mu_cmd_index(Mu::Store& store, const MuConfig* opts, GError** err)
|
||||
return MU_ERROR;
|
||||
}
|
||||
|
||||
const auto mdir{store.metadata().root_maildir};
|
||||
const auto mdir{store.properties().root_maildir};
|
||||
if (G_UNLIKELY(access(mdir.c_str(), R_OK) != 0)) {
|
||||
mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE,
|
||||
@ -113,8 +113,8 @@ Mu::mu_cmd_index(Mu::Store& store, const MuConfig* opts, GError** err)
|
||||
std::cout << "lazily ";
|
||||
|
||||
std::cout << "indexing maildir " << col.fg(Color::Green)
|
||||
<< store.metadata().root_maildir << col.reset() << " -> store "
|
||||
<< col.fg(Color::Green) << store.metadata().database_path << col.reset()
|
||||
<< store.properties().root_maildir << col.reset() << " -> store "
|
||||
<< col.fg(Color::Green) << store.properties().database_path << col.reset()
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
|
||||
@ -113,8 +113,8 @@ try {
|
||||
Server server{store, output_sexp_stdout};
|
||||
|
||||
g_message("created server with store @ %s; maildir @ %s; debug-mode %s",
|
||||
store.metadata().database_path.c_str(),
|
||||
store.metadata().root_maildir.c_str(),
|
||||
store.properties().database_path.c_str(),
|
||||
store.properties().root_maildir.c_str(),
|
||||
opts->debug ? "yes" : "no");
|
||||
|
||||
tty = ::isatty(::fileno(stdout));
|
||||
|
||||
14
mu/mu-cmd.cc
14
mu/mu-cmd.cc
@ -518,14 +518,14 @@ cmd_info(const Mu::Store& store, const MuConfig* opts, GError** err)
|
||||
{
|
||||
Mu::MaybeAnsi col{!opts->nocolor};
|
||||
|
||||
key_val(col, "maildir", store.metadata().root_maildir);
|
||||
key_val(col, "database-path", store.metadata().database_path);
|
||||
key_val(col, "schema-version", store.metadata().schema_version);
|
||||
key_val(col, "max-message-size", store.metadata().max_message_size);
|
||||
key_val(col, "batch-size", store.metadata().batch_size);
|
||||
key_val(col, "maildir", store.properties().root_maildir);
|
||||
key_val(col, "database-path", store.properties().database_path);
|
||||
key_val(col, "schema-version", store.properties().schema_version);
|
||||
key_val(col, "max-message-size", store.properties().max_message_size);
|
||||
key_val(col, "batch-size", store.properties().batch_size);
|
||||
key_val(col, "messages in store", store.size());
|
||||
|
||||
const auto created{store.metadata().created};
|
||||
const auto created{store.properties().created};
|
||||
const auto tstamp{::localtime(&created)};
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
@ -536,7 +536,7 @@ cmd_info(const Mu::Store& store, const MuConfig* opts, GError** err)
|
||||
|
||||
key_val(col, "created", tbuf);
|
||||
|
||||
const auto addrs{store.metadata().personal_addresses};
|
||||
const auto addrs{store.properties().personal_addresses};
|
||||
if (addrs.empty())
|
||||
key_val(col, "personal-address", "<none>");
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user