sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

(followup) bitcoin#21244: Move GetBackupsDir to ArgsManager

Browse Source
This commit is contained in:
Vijay 2024-04-11 07:50:10 +05:30 committed by pasta
parent 1f4e26baf9
commit 262fe0ada6
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/guiutil.cpp
View File

@ -643,7 +643,7 @@ void openConfigfile()
void showBackups() void showBackups()
{ {
fs::path backupsDir = GetBackupsDir(); fs::path backupsDir = gArgs.GetBackupsDirPath();
/* Open folder with default browser */ /* Open folder with default browser */
if (fs::exists(backupsDir)) if (fs::exists(backupsDir))

13
src/util/system.cpp
View File

@ -455,6 +455,14 @@ const fs::path& ArgsManager::GetDataDirPath(bool net_specific) const
return path; return path;
} }
fs::path ArgsManager::GetBackupsDirPath()
{
if (!IsArgSet("-walletbackupsdir"))
return GetDataDirPath() / "backups";
return fs::absolute(GetArg("-walletbackupsdir", ""));
}
void ArgsManager::ClearPathCache() void ArgsManager::ClearPathCache()
{ {
LOCK(cs_args); LOCK(cs_args);
@ -804,10 +812,7 @@ const fs::path &GetDataDir(bool fNetSpecific)
fs::path GetBackupsDir() fs::path GetBackupsDir()
{ {
if (!gArgs.IsArgSet("-walletbackupsdir")) return gArgs.GetBackupsDirPath();
return GetDataDir() / "backups";
return fs::absolute(gArgs.GetArg("-walletbackupsdir", ""));
} }
bool CheckDataDirOption() bool CheckDataDirOption()

3
src/util/system.h
View File

@ -98,7 +98,6 @@ void ReleaseDirectoryLocks();
bool TryCreateDirectories(const fs::path& p); bool TryCreateDirectories(const fs::path& p);
fs::path GetDefaultDataDir(); fs::path GetDefaultDataDir();
const fs::path &GetDataDir(bool fNetSpecific = true); const fs::path &GetDataDir(bool fNetSpecific = true);
fs::path GetBackupsDir();
// Return true if -datadir option points to a valid directory or is not specified. // Return true if -datadir option points to a valid directory or is not specified.
bool CheckDataDirOption(); bool CheckDataDirOption();
fs::path GetConfigFile(const std::string& confPath); fs::path GetConfigFile(const std::string& confPath);
@ -279,6 +278,8 @@ public:
*/ */
const fs::path& GetDataDirPath(bool net_specific = true) const; const fs::path& GetDataDirPath(bool net_specific = true) const;
fs::path GetBackupsDirPath();
/** /**
* Clear cached directory paths * Clear cached directory paths
*/ */

2
src/wallet/wallet.cpp
View File

@ -5017,7 +5017,7 @@ bool CWallet::AutoBackupWallet(const fs::path& wallet_path, bilingual_str& error
return false; return false;
} }
fs::path backupsDir = GetBackupsDir(); fs::path backupsDir = gArgs.GetBackupsDirPath();
backupsDir.make_preferred(); backupsDir.make_preferred();
if (!fs::exists(backupsDir)) if (!fs::exists(backupsDir))