Skip to content

Commit

Permalink
Fix #432: Make application name case insensitive
Browse files Browse the repository at this point in the history
  • Loading branch information
JoseExposito committed Jan 18, 2021
1 parent 266a102 commit d1595d6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 10 deletions.
6 changes: 4 additions & 2 deletions src/config/config.cpp
Expand Up @@ -20,6 +20,8 @@
#include <string>
#include <unordered_map>

#include "utils/string.h"

Config::Config() { this->loadDefaultGlobalSettings(); }

void Config::clear() {
Expand Down Expand Up @@ -79,6 +81,6 @@ std::string Config::getConfigKey(const std::string &application,
GestureDirection gestureDirection) {
auto gestureTypeInt = static_cast<int>(gestureType);
auto gestureDirectionInt = static_cast<int>(gestureDirection);
return application + "_" + std::to_string(gestureTypeInt) + "_" + numFingers +
"_" + std::to_string(gestureDirectionInt);
return toLower(application) + "_" + std::to_string(gestureTypeInt) + "_" +
numFingers + "_" + std::to_string(gestureDirectionInt);
}
17 changes: 13 additions & 4 deletions src/utils/string.cpp
Expand Up @@ -17,13 +17,15 @@
*/
#include "utils/string.h"

#include <algorithm>
#include <cctype>
#include <regex> // NOLINT
#include <sstream>
#include <string>
#include <utility>
#include <vector>

std::vector<std::string> split(const std::string& string, char delimiter) {
std::vector<std::string> split(const std::string &string, char delimiter) {
std::stringstream ss(string);
std::string item;
std::vector<std::string> elems;
Expand All @@ -35,12 +37,19 @@ std::vector<std::string> split(const std::string& string, char delimiter) {
return elems;
}

std::string ltrim(const std::string& s) {
std::string ltrim(const std::string &s) {
return std::regex_replace(s, std::regex("^\\s+"), std::string(""));
}

std::string rtrim(const std::string& s) {
std::string rtrim(const std::string &s) {
return std::regex_replace(s, std::regex("\\s+$"), std::string(""));
}

std::string trim(const std::string& s) { return ltrim(rtrim(s)); }
std::string trim(const std::string &s) { return ltrim(rtrim(s)); }

std::string toLower(const std::string &string) {
std::string lower = string;
std::transform(lower.begin(), lower.end(), lower.begin(),
[](unsigned char c) { return std::tolower(c); });
return lower;
}
10 changes: 6 additions & 4 deletions src/utils/string.h
Expand Up @@ -21,10 +21,12 @@
#include <string>
#include <vector>

std::vector<std::string> split(const std::string& string, char delimiter);
std::vector<std::string> split(const std::string &string, char delimiter);

std::string ltrim(const std::string& s);
std::string rtrim(const std::string& s);
std::string trim(const std::string& s);
std::string ltrim(const std::string &s);
std::string rtrim(const std::string &s);
std::string trim(const std::string &s);

std::string toLower(const std::string &string);

#endif // UTILS_STRING_H_

0 comments on commit d1595d6

Please sign in to comment.