monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WalletManager::findWallets: searching by "keys" files instead of

Browse source 
"address.txt" files
This commit is contained in:
Ilya Kitaev 2016-06-23 14:47:22 +03:00
parent ca61153003
commit d60864785f
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/api/wallet_manager.cpp
View file

@ -85,7 +85,7 @@ bool WalletManagerImpl::walletExists(const std::string &path)
std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path) std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path)
{ {
std::vector<std::string> result; std::vector<std::string> result;
const boost::regex wallet_rx("(.*)\\.(address\\.txt)$"); // searching for <wallet_name>.address.txt 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
boost::filesystem::path work_dir(path); boost::filesystem::path work_dir(path);
@ -100,11 +100,9 @@ std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path)
bool matched = boost::regex_match(filename, what, wallet_rx); bool matched = boost::regex_match(filename, what, wallet_rx);
if (matched) { if (matched) {
// if address file found, checking if there's corresponding .keys file and wallet file itself // if keys file found, checking if there's wallet file itself
std::string wallet_file = (itr->path().parent_path() /= what[1]).string(); std::string wallet_file = (itr->path().parent_path() /= what[1]).string();
std::string wallet_key_file = wallet_file + std::string(".keys"); if (boost::filesystem::exists(wallet_file)) {
if (boost::filesystem::exists(wallet_file)
&& boost::filesystem::exists(wallet_key_file)) {
LOG_PRINT_L3("Found wallet: " << wallet_file); LOG_PRINT_L3("Found wallet: " << wallet_file);
result.push_back(wallet_file); result.push_back(wallet_file);
} }