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

lib: use join_paths

Browse Source 
Convert some manual concatenation to the new join_paths helper.
This commit is contained in:
Dirk-Jan C. Binnema
2023-01-28 22:09:05 +02:00
parent 25635c5cfe
commit a8daec9598
4 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/utils/mu-utils-file.cc
View File

@ -153,11 +153,9 @@ Mu::runtime_path(Mu::RuntimePath path, const std::string& muhome)
{
auto [mu_cache, mu_config] =
std::invoke([&]()->std::pair<std::string, std::string> {
static std::string mu{"/mu"};
if (muhome.empty())
return { g_get_user_cache_dir() + mu,
g_get_user_config_dir() + mu };
return { join_paths(g_get_user_cache_dir(), "mu"),
join_paths(g_get_user_config_dir(), "mu")};
else
return { muhome, muhome };
});
@ -166,15 +164,15 @@ Mu::runtime_path(Mu::RuntimePath path, const std::string& muhome)
case Mu::RuntimePath::Cache:
return mu_cache;
case Mu::RuntimePath::XapianDb:
return mu_cache + "/xapian";
return join_paths(mu_cache, "xapian");
case Mu::RuntimePath::LogFile:
return mu_cache + "/mu.log";
return join_paths(mu_cache, "mu.log");
case Mu::RuntimePath::Bookmarks:
return mu_config + "/bookmarks";
return join_paths(mu_config, "bookmarks");
case Mu::RuntimePath::Config:
return mu_config;
case Mu::RuntimePath::Scripts:
return mu_config + "/scripts";
return join_paths(mu_config, "scripts");
default:
throw std::logic_error("unknown path");
}