emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu-maildir: No need for namespaced function names 

Mu::mu_maildir_... -> Mu::maildir_...
This commit is contained in:
Dirk-Jan C. Binnema 2022-05-09 19:34:07 +03:00
parent 2a3eb229ec
commit dc69505580
8 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mu-maildir.cc
View File

@ -106,7 +106,7 @@ create_noindex(const std::string& path)
}
Mu::Result<void>
Mu::mu_maildir_mkdir(const std::string& path, mode_t mode, bool noindex)
Mu::maildir_mkdir(const std::string& path, mode_t mode, bool noindex)
{
if (auto&& created{create_maildir(path, mode)}; !created)
return created; // fail.
@ -168,7 +168,7 @@ get_target_fullpath(const std::string& src, const std::string& targetpath)
}
Result<void>
Mu::mu_maildir_link(const std::string& src, const std::string& targetpath)
Mu::maildir_link(const std::string& src, const std::string& targetpath)
{
auto path_res{get_target_fullpath(src, targetpath)};
if (!path_res)
@ -231,7 +231,7 @@ clear_links(const std::string& path, DIR* dir)
}
Mu::Result<void>
Mu::mu_maildir_clear_links(const std::string& path)
Mu::maildir_clear_links(const std::string& path)
{
const auto dir{::opendir(path.c_str())};
if (!dir)
@ -247,7 +247,7 @@ Mu::mu_maildir_clear_links(const std::string& path)
Result<std::string>
Mu::mu_maildir_from_path(const std::string& path, const std::string& root)
Mu::maildir_from_path(const std::string& path, const std::string& root)
{
const auto pos = path.find(root);
if (pos != 0 || path[root.length()] != '/')
@ -339,7 +339,7 @@ base_message_dir_file(const std::string& path)
// refactor: we have the same code in mu-flags.cc
Mu::Result<Mu::Flags>
Mu::mu_maildir_flags_from_path(const std::string& path)
Mu::maildir_flags_from_path(const std::string& path)
{ /*
* this gets us the source maildir filesystem path, the directory
* in which new/ & cur/ lives, and the source file
@ -461,7 +461,7 @@ msg_move(const std::string& src, const std::string& dst)
Mu::Result<void>
Mu::mu_maildir_move_message(const std::string& oldpath,
Mu::maildir_move_message(const std::string& oldpath,
const std::string& newpath,
bool ignore_dups)
{
@ -526,7 +526,7 @@ static Mu::Result<void>
check_determine_target_params (const std::string& old_path,
const std::string& root_maildir_path,
const std::string& target_maildir,
Flags newflags)
Flags newflags)
{
if (!g_path_is_absolute(old_path.c_str()))
return Err(Error{Error::Code::File,
@ -556,10 +556,10 @@ check_determine_target_params (const std::string& old_path,
Mu::Result<std::string>
Mu::mu_maildir_determine_target(const std::string& old_path,
Mu::maildir_determine_target(const std::string& old_path,
const std::string& root_maildir_path,
const std::string& target_maildir,
Flags newflags,
Flags newflags,
bool new_name)
{
/* sanity checks */

16
lib/mu-maildir.hh
View File

@ -46,7 +46,7 @@ namespace Mu {
*
* @return a valid result (!!result) or an Error
*/
Result<void> mu_maildir_mkdir(const std::string& path, mode_t mode=0700,
Result<void> maildir_mkdir(const std::string& path, mode_t mode=0700,
bool noindex=false);
/**
@ -59,7 +59,7 @@ Result<void> mu_maildir_mkdir(const std::string& path, mode_t mode=0700,
*
* @return a valid result (!!result) or an Error
*/
Result<void> mu_maildir_link(const std::string& src, const std::string& targetpath);
Result<void> maildir_link(const std::string& src, const std::string& targetpath);
/**
* Recursively delete all the symbolic links in a directory tree
@ -68,11 +68,11 @@ Result<void> mu_maildir_link(const std::string& src, const std::string& targetpa
*
* @return a valid result (!!result) or an Error
*/
Result<void> mu_maildir_clear_links(const std::string& dir);
Result<void> maildir_clear_links(const std::string& dir);
/**
* Get the Maildir flags from the full path of a mailfile. The flags are as
* specified in http://cr.yp.to/proto/maildir.html, plus MU_MSG_FLAG_NEW for new
* specified in http://cr.yp.to/proto/maildir.html, plus Flag::New for new
* messages, ie the ones that live in new/. The flags are logically OR'ed. Note
* that the file does not have to exist; the flags are based on the path only.
*
@ -81,7 +81,7 @@ Result<void> mu_maildir_clear_links(const std::string& dir);
*
* @return the message flags or an error
*/
Result<Flags> mu_maildir_flags_from_path(const std::string& pathname);
Result<Flags> maildir_flags_from_path(const std::string& pathname);
/**
* get the maildir for a certain message path, ie, the path *before*
@ -92,7 +92,7 @@ Result<Flags> mu_maildir_flags_from_path(const std::string& pathname);
*
* @return the maildir or an Error
*/
Result<std::string> mu_maildir_from_path(const std::string& path,
Result<std::string> maildir_from_path(const std::string& path,
const std::string& root);
/**
@ -108,7 +108,7 @@ Result<std::string> mu_maildir_from_path(const std::string& path,
*
* @return * @return a valid result (!!result) or an Error
*/
Result<void> mu_maildir_move_message(const std::string& oldpath,
Result<void> maildir_move_message(const std::string& oldpath,
const std::string& newpath,
bool ignore_dups);
@ -134,7 +134,7 @@ Result<void> mu_maildir_move_message(const std::string& oldpath,
* of error
*/
Result<std::string>
mu_maildir_determine_target(const std::string& old_path,
maildir_determine_target(const std::string& old_path,
const std::string& root_maildir_path,
const std::string& target_maildir,
Flags newflags,

2
lib/mu-server.cc
View File

@ -822,7 +822,7 @@ void
Server::Private::mkdir_handler(const Parameters& params)
{
const auto path{get_string_or(params, ":path")};
if (auto&& res = mu_maildir_mkdir(path, 0755, FALSE); !res)
if (auto&& res = maildir_mkdir(path, 0755, FALSE); !res)
throw res.error();
Sexp::List lst;

6
lib/mu-store.cc
View File

@ -370,7 +370,7 @@ Store::add_message(Message& msg, bool use_transaction)
{
std::lock_guard guard{priv_->lock_};
const auto mdir{mu_maildir_from_path(msg.path(),
const auto mdir{maildir_from_path(msg.path(),
properties().root_maildir)};
if (!mdir)
return Err(mdir.error());
@ -471,13 +471,13 @@ Store::move_message(Store::Id id,
/* 1. first determine the file system path of the target */
const auto target_path =
mu_maildir_determine_target(msg->path(), properties().root_maildir,
maildir_determine_target(msg->path(), properties().root_maildir,
target_maildir,target_flags, change_name);
if (!target_path)
return Err(target_path.error());
/* 2. let's move it */
if (const auto res = mu_maildir_move_message(
if (const auto res = maildir_move_message(
msg->path(), target_path.value(), true/*ignore dups*/); !res)
return Err(res.error());

70
lib/tests/test-mu-maildir.cc
View File

@ -32,7 +32,7 @@
using namespace Mu;
static void
test_mu_maildir_mkdir_01(void)
test_maildir_mkdir_01(void)
{
int i;
gchar * tmpdir, *mdir, *tmp;
@ -41,7 +41,7 @@ test_mu_maildir_mkdir_01(void)
tmpdir = test_mu_common_get_random_tmpdir();
mdir = g_strdup_printf("%s%c%s", tmpdir, G_DIR_SEPARATOR, "cuux");
g_assert_true(!!mu_maildir_mkdir(mdir, 0755, FALSE));
g_assert_true(!!maildir_mkdir(mdir, 0755, FALSE));
for (i = 0; i != G_N_ELEMENTS(subs); ++i) {
gchar* dir;
@ -61,7 +61,7 @@ test_mu_maildir_mkdir_01(void)
}
static void
test_mu_maildir_mkdir_02(void)
test_maildir_mkdir_02(void)
{
int i;
gchar * tmpdir, *mdir, *tmp;
@ -70,7 +70,7 @@ test_mu_maildir_mkdir_02(void)
tmpdir = test_mu_common_get_random_tmpdir();
mdir = g_strdup_printf("%s%c%s", tmpdir, G_DIR_SEPARATOR, "cuux");
g_assert_true(!!mu_maildir_mkdir(mdir, 0755, TRUE));
g_assert_true(!!maildir_mkdir(mdir, 0755, TRUE));
for (i = 0; i != G_N_ELEMENTS(subs); ++i) {
gchar* dir;
@ -91,7 +91,7 @@ test_mu_maildir_mkdir_02(void)
}
static void
test_mu_maildir_mkdir_03(void)
test_maildir_mkdir_03(void)
{
int i;
gchar * tmpdir, *mdir, *tmp;
@ -109,7 +109,7 @@ test_mu_maildir_mkdir_03(void)
}
/* this should still work */
g_assert_true(!!mu_maildir_mkdir(mdir, 0755, FALSE));
g_assert_true(!!maildir_mkdir(mdir, 0755, FALSE));
for (i = 0; i != G_N_ELEMENTS(subs); ++i) {
gchar* dir;
@ -129,7 +129,7 @@ test_mu_maildir_mkdir_03(void)
}
static void
test_mu_maildir_mkdir_04(void)
test_maildir_mkdir_04(void)
{
gchar *tmpdir, *mdir;
@ -147,7 +147,7 @@ test_mu_maildir_mkdir_04(void)
/* this should fail now, because cur is not read/writable */
if (geteuid() != 0)
g_assert_false(!!mu_maildir_mkdir(mdir, 0755, false));
g_assert_false(!!maildir_mkdir(mdir, 0755, false));
g_free(tmpdir);
g_free(mdir);
@ -160,16 +160,16 @@ ignore_error(const char* log_domain, GLogLevelFlags log_level, const gchar* msg,
}
static void
test_mu_maildir_mkdir_05(void)
test_maildir_mkdir_05(void)
{
/* this must fail */
g_test_log_set_fatal_handler((GTestLogFatalFunc)ignore_error, NULL);
g_assert_false(!!mu_maildir_mkdir({}, 0755, true));
g_assert_false(!!maildir_mkdir({}, 0755, true));
}
static void
test_mu_maildir_flags_from_path(void)
test_maildir_flags_from_path(void)
{
int i;
struct {
@ -187,7 +187,7 @@ test_mu_maildir_flags_from_path(void)
{"/home/foo/Maildir/test/cur/123456:2,S", Flags::Seen}};
for (i = 0; i != G_N_ELEMENTS(paths); ++i) {
auto res{mu_maildir_flags_from_path(paths[i].path)};
auto res{maildir_flags_from_path(paths[i].path)};
g_assert_true(!!res);
if (g_test_verbose())
g_print("%s -> <%s>\n", paths[i].path,
@ -265,7 +265,7 @@ test_determine_target_ok(void)
};
for (auto&& testcase: testcases) {
const auto res = mu_maildir_determine_target(
const auto res = maildir_determine_target(
testcase.old_path,
testcase.root_maildir,
testcase.target_maildir,
@ -288,7 +288,7 @@ test_determine_target_ok(void)
// static void
// test_mu_maildir_determine_target(void)
// test_maildir_determine_target(void)
// {
// int i;
@ -313,7 +313,7 @@ test_determine_target_ok(void)
// "/home/djcb/Maildir/trash/cur/1312920597.2206_16.cthulhu:2,S"}};
// for (i = 0; i != G_N_ELEMENTS(paths); ++i) {
// const auto res{mu_maildir_determine_target(paths[i].oldpath,
// const auto res{maildir_determine_target(paths[i].oldpath,
// "/home/foo/Maildir",
// {},
// paths[i].flags, false)};
@ -328,7 +328,7 @@ test_determine_target_ok(void)
// }
// static void
// test_mu_maildir_get_new_path_01(void)
// test_maildir_get_new_path_01(void)
// {
// struct {
// std::string oldpath;
@ -351,7 +351,7 @@ test_determine_target_ok(void)
// "/home/djcb/Maildir/trash/cur/1312920597.2206_16.cthulhu:2,S"}};
// for (int i = 0; i != G_N_ELEMENTS(paths); ++i) {
// const auto newpath{mu_maildir_determine_target(
// const auto newpath{maildir_determine_target(
// paths[i].oldpath,
// "/home/foo/maildir",
// {}, paths[i].flags, false)};
@ -361,7 +361,7 @@ test_determine_target_ok(void)
// }
// static void
// test_mu_maildir_get_new_path_02(void)
// test_maildir_get_new_path_02(void)
// {
// struct {
// std::string oldpath;
@ -386,7 +386,7 @@ test_determine_target_ok(void)
// "/home/boy/Maildir/stuff/cur/1313038887_0.697:2,FPS"}};
// for (int i = 0; i != G_N_ELEMENTS(paths); ++i) {
// auto newpath{mu_maildir_determine_target(paths[i].oldpath,
// auto newpath{maildir_determine_target(paths[i].oldpath,
// paths[i].targetdir,
// paths[i].flags,
// false)};
@ -396,7 +396,7 @@ test_determine_target_ok(void)
// }
// static void
// test_mu_maildir_get_new_path_custom(void)
// test_maildir_get_new_path_custom(void)
// {
// struct {
// std::string oldpath;
@ -417,7 +417,7 @@ test_determine_target_ok(void)
// "/home/foo/Maildir/blabla/cur/123456:2,Pabc"}};
// for (int i = 0; i != G_N_ELEMENTS(paths); ++i) {
// auto newpath{mu_maildir_get_new_path(paths[i].oldpath,
// auto newpath{maildir_get_new_path(paths[i].oldpath,
// paths[i].targetdir,
// paths[i].flags,
// FALSE)};
@ -427,7 +427,7 @@ test_determine_target_ok(void)
// }
// static void
// test_mu_maildir_from_path(void)
// test_maildir_from_path(void)
// {
// unsigned u;
@ -437,7 +437,7 @@ test_determine_target_ok(void)
// {"/home/foo/Maildir/lala/new/1313038887_0.697:2,", "/home/foo/Maildir/lala"}};
// for (u = 0; u != G_N_ELEMENTS(cases); ++u) {
// auto mdir{mu_maildir_from_path(cases[u].path)};
// auto mdir{maildir_from_path(cases[u].path)};
// g_assert_true(mdir.has_value());
// g_assert_true(*mdir == cases[u].exp);
// }
@ -449,14 +449,14 @@ main(int argc, char* argv[])
g_test_init(&argc, &argv, NULL);
/* mu_util_maildir_mkmdir */
g_test_add_func("/mu-maildir/mu-maildir-mkdir-01", test_mu_maildir_mkdir_01);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-02", test_mu_maildir_mkdir_02);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-03", test_mu_maildir_mkdir_03);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-04", test_mu_maildir_mkdir_04);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-05", test_mu_maildir_mkdir_05);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-01", test_maildir_mkdir_01);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-02", test_maildir_mkdir_02);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-03", test_maildir_mkdir_03);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-04", test_maildir_mkdir_04);
g_test_add_func("/mu-maildir/mu-maildir-mkdir-05", test_maildir_mkdir_05);
g_test_add_func("/mu-maildir/mu-maildir-flags-from-path",
test_mu_maildir_flags_from_path);
test_maildir_flags_from_path);
g_test_add_func("/mu-maildir/mu-maildir-determine-target-ok",
@ -465,17 +465,17 @@ main(int argc, char* argv[])
// /* get/set flags */
// g_test_add_func("/mu-maildir/mu-maildir-get-new-path-new",
// test_mu_maildir_get_new_path_new);
// test_maildir_get_new_path_new);
// g_test_add_func("/mu-maildir/mu-maildir-get-new-path-01", test_mu_maildir_get_new_path_01);
// g_test_add_func("/mu-maildir/mu-maildir-get-new-path-02", test_mu_maildir_get_new_path_02);
// g_test_add_func("/mu-maildir/mu-maildir-get-new-path-01", test_maildir_get_new_path_01);
// g_test_add_func("/mu-maildir/mu-maildir-get-new-path-02", test_maildir_get_new_path_02);
// g_test_add_func("/mu-maildir/mu-maildir-get-new-path-custom",
// test_mu_maildir_get_new_path_custom);
// test_maildir_get_new_path_custom);
// g_test_add_func("/mu-maildir/mu-maildir-get-flags-from-path",
// test_mu_maildir_get_flags_from_path);
// test_maildir_get_flags_from_path);
// g_test_add_func("/mu-maildir/mu-maildir-from-path",
// test_mu_maildir_from_path);
// test_maildirx_from_path);
g_log_set_handler(
NULL,

2
lib/tests/test-mu-store.cc
View File

@ -261,7 +261,7 @@ Yes, that would be excellent.
TempDir tempdir2;
{ // create a message file.
const auto res1 = mu_maildir_mkdir(tempdir2.path() + "/Maildir/a");
const auto res1 = maildir_mkdir(tempdir2.path() + "/Maildir/a");
assert_valid_result(res1);
std::ofstream output{tempdir2.path() + "/Maildir/a/new/msg"};

6
mu/mu-cmd-find.cc
View File

@ -179,7 +179,7 @@ prepare_links(const MuConfig* opts, GError** err)
{
/* note, mu_maildir_mkdir simply ignores whatever part of the
* mail dir already exists */
if (auto&& res = mu_maildir_mkdir(opts->linksdir, 0700, true); !res) {
if (auto&& res = maildir_mkdir(opts->linksdir, 0700, true); !res) {
res.error().fill_g_error(err);
return FALSE;
}
@ -187,7 +187,7 @@ prepare_links(const MuConfig* opts, GError** err)
if (!opts->clearlinks)
return TRUE;
if (auto&& res = mu_maildir_clear_links(opts->linksdir); !res) {
if (auto&& res = maildir_clear_links(opts->linksdir); !res) {
res.error().fill_g_error(err);
return FALSE;
}
@ -205,7 +205,7 @@ output_link(const Option<Message>& msg, const OutputInfo& info, const MuConfig*
return prepare_links(opts, err);
else if (info.footer)
return true;
if (auto&& res = mu_maildir_link(msg->path(), opts->linksdir); !res) {
if (auto&& res = maildir_link(msg->path(), opts->linksdir); !res) {
res.error().fill_g_error(err);
return FALSE;
}

2
mu/mu-cmd.cc
View File

@ -226,7 +226,7 @@ cmd_mkdir(const MuConfig* opts, GError** err)
}
for (i = 1; opts->params[i]; ++i) {
if (auto&& res{mu_maildir_mkdir(opts->params[i],
if (auto&& res{maildir_mkdir(opts->params[i],
opts->dirmode, FALSE)}; !res) {
g_set_error(err, MU_ERROR_DOMAIN, MU_ERROR_FILE,
"%s", res.error().what());