Merge pull request #1278

43ec2d0 Wallet API: added walletExists logic (Jacob Brydolf)
This commit is contained in:
Riccardo Spagni 2016-11-01 15:29:44 +02:00
commit b06c1abaa6
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -81,6 +81,12 @@ bool WalletManagerImpl::closeWallet(Wallet *wallet)
bool WalletManagerImpl::walletExists(const std::string &path) 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; return false;
} }
@ -91,7 +97,7 @@ std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path)
boost::filesystem::path work_dir(path); boost::filesystem::path work_dir(path);
// return empty result if path doesn't exist // return empty result if path doesn't exist
if(!boost::filesystem::is_directory(path)){ if(!boost::filesystem::is_directory(path)){
return result; return result;
} }
const boost::regex wallet_rx("(.*)\\.(keys)$"); // searching for <wallet_name>.keys files 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 boost::filesystem::recursive_directory_iterator end_itr; // Default ctor yields past-the-end