aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-11-01 15:29:44 +0200
committerRiccardo Spagni <ric@spagni.net>2016-11-01 15:29:44 +0200
commitb06c1abaa6d02d3232bb582af90e3058305f2bb1 (patch)
tree34bb9f14545d026458dada24d4295e0b255482c6
parentMerge pull request #1283 (diff)
parentWallet API: added walletExists logic (diff)
downloadmonero-b06c1abaa6d02d3232bb582af90e3058305f2bb1.tar.xz
Merge pull request #1278
43ec2d0 Wallet API: added walletExists logic (Jacob Brydolf)
-rw-r--r--src/wallet/api/wallet_manager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index b8500aae3..d2395ace1 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -81,6 +81,12 @@ bool WalletManagerImpl::closeWallet(Wallet *wallet)
bool WalletManagerImpl::walletExists(const std::string &path)
{
+ bool keys_file_exists;
+ bool wallet_file_exists;
+ tools::wallet2::wallet_exists(path, keys_file_exists, wallet_file_exists);
+ if(keys_file_exists){
+ return true;
+ }
return false;
}
@@ -91,7 +97,7 @@ std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path)
boost::filesystem::path work_dir(path);
// return empty result if path doesn't exist
if(!boost::filesystem::is_directory(path)){
- return result;
+ return result;
}
const boost::regex wallet_rx("(.*)\\.(keys)$"); // searching for <wallet_name>.keys files
boost::filesystem::recursive_directory_iterator end_itr; // Default ctor yields past-the-end