LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Add CheckDataDirOption() function

Browse source
This commit is contained in:
Hennadii Stepanov 2019-07-24 03:21:25 +03:00
parent c1f325126c
commit 740d41ce9f
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/util/system.cpp
View file

@ -741,8 +741,9 @@ const fs::path &GetDataDir(bool fNetSpecific)
// this function // this function
if (!path.empty()) return path; if (!path.empty()) return path;
if (gArgs.IsArgSet("-datadir")) { std::string datadir = gArgs.GetArg("-datadir", "");
path = fs::system_complete(gArgs.GetArg("-datadir", "")); if (!datadir.empty()) {
path = fs::system_complete(datadir);
if (!fs::is_directory(path)) { if (!fs::is_directory(path)) {
path = ""; path = "";
return path; return path;
@ -761,6 +762,12 @@ const fs::path &GetDataDir(bool fNetSpecific)
return path; return path;
} }
bool CheckDataDirOption()
{
std::string datadir = gArgs.GetArg("-datadir", "");
return datadir.empty() || fs::is_directory(fs::system_complete(datadir));
}
void ClearDatadirCache() void ClearDatadirCache()
{ {
LOCK(csPathCached); LOCK(csPathCached);

2
src/util/system.h
View file

@ -83,6 +83,8 @@ fs::path GetDefaultDataDir();
// The blocks directory is always net specific. // The blocks directory is always net specific.
const fs::path &GetBlocksDir(); const fs::path &GetBlocksDir();
const fs::path &GetDataDir(bool fNetSpecific = true); const fs::path &GetDataDir(bool fNetSpecific = true);
// Return true if -datadir option points to a valid directory or is not specified.
bool CheckDataDirOption();
/** Tests only */ /** Tests only */
void ClearDatadirCache(); void ClearDatadirCache();
fs::path GetConfigFile(const std::string& confPath); fs::path GetConfigFile(const std::string& confPath);