towk/gdpm
1
0
Fork 0
mirror of https://github.com/davidallendj/gdpm.git synced 2025-12-20 22:00:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed minor issues

Browse source 
- Fixed error message formatting
- Fixed setting verbosity levels
- Fixed implementation of `replace_first` and `replace_all`
- Fixed issue where installing a package would failed because of unescaped single quotes in SQL statement
- Fixed error code returned from SQLITE related errors
- Fixed verbose flag not being repeatable and set correctly
- Fixed some error messages to correctly reflect occuring error
- Fixed the prompt asking the user twice and not taking a default input
- Added functions to get logging default prefixes
- Added `version` command (not implemented yet)
This commit is contained in:
David Allen 2023-06-18 21:10:50 -06:00
parent 02a4e879a8
commit c88cb08e03
9 changed files with 126 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/utils.cpp
View file

@ -102,27 +102,29 @@ namespace gdpm::utils{
}
std::string replace_first(
std::string &s,
const std::string &s,
const std::string &from,
const std::string &to
){
size_t pos = s.find(from);
std::string copy = s; // make string copy
size_t pos = copy.find(from);
if(pos == std::string::npos)
return s;
return s.replace(pos, from.length(), to);
return copy;
return copy.replace(pos, from.length(), to);
}
std::string replace_all(
std::string& s,
const std::string& s,
const std::string& from,
const std::string& to
){
std::string copy = s; // make string copy
size_t pos = 0;
while((pos = s.find(from, pos)) != std::string::npos){
s.replace(pos, s.length(), to);
while((pos = copy.find(from, pos)) != std::string::npos){
copy.replace(pos, s.length(), to);
pos += to.length();
}
return s;
return copy;
}
/* Ref: https://gist.github.com/mobius/1759816 */
@ -204,17 +206,18 @@ namespace gdpm::utils{
std::string prompt_user(const char *message){
log::print("{} ", message);
std::string input;
std::cin >> input;
// std::cin >> input;
getline(std::cin, input);
return input;
}
bool prompt_user_yn(const char *message){
std::string input{"y"};
do{
input = utils::prompt_user(message);
to_lower(input);
input = (input == "\0" || input == "\n" || input.empty()) ? "y" : input;
}while( !std::cin.fail() && input != "y" && input != "n");
std::string input{""};
while( !std::cin.fail() && input != "y" && input != "n" ){
bool is_default = (input == "\0" || input == "\n" || input == "\r\n" || input.empty());
input = to_lower(utils::prompt_user(message));
input = is_default ? "y" : input;
}
return input == "y";
}