Deukhoofd
/
LangBuilder
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Merge remote-tracking branch 'origin/master'
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2022-02-12 13:15:22 +01:00
parent 0d627d3e7b 003e33c05a
commit 3df014f332
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -5,8 +5,9 @@ project(LangBuilder)
add_compile_options(-Wall -Wextra -Werror) add_compile_options(-Wall -Wextra -Werror)
# We like new stuff, so set the c++ standard to c++20. # We like new stuff, so set the c++ standard to c++20.
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(BUILD_SHARED_LIBS OFF)
file(GLOB_RECURSE SRC_FILES "src/*.cpp" "src/*.hpp") file(GLOB_RECURSE SRC_FILES "src/*.cpp" "src/*.hpp")
add_executable(LangBuilder ${SRC_FILES}) add_executable(LangBuilder ${SRC_FILES})
target_link_libraries(LangBuilder -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread) target_link_libraries(LangBuilder -static -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread)

14
src/LocalizationFile.cpp
View File

@ -12,6 +12,10 @@ static bool IsKeyValid(const std::string_view & key){
return true; return true;
} }
const char PossibleSeparators[] = {
',', ';', '|', '\t', ':'
};
void LocalizationFile::LoadFile(const std::filesystem::path& path) { void LocalizationFile::LoadFile(const std::filesystem::path& path) {
if (!std::filesystem::exists(path)) { if (!std::filesystem::exists(path)) {
std::stringstream ss; std::stringstream ss;
@ -31,9 +35,11 @@ void LocalizationFile::LoadFile(const std::filesystem::path& path) {
while (std::getline(file, line)) { while (std::getline(file, line)) {
if (firstLine) { if (firstLine) {
firstLine = false; firstLine = false;
if (line.substr(0, 4) == "sep=") { for (auto& s :PossibleSeparators) {
sep = line[4]; if (line.find(s) != std::string::npos){
continue; sep = s;
break;
}
} }
} }
std::string key; std::string key;
@ -43,6 +49,8 @@ void LocalizationFile::LoadFile(const std::filesystem::path& path) {
std::getline(linestream, value, sep); std::getline(linestream, value, sep);
if (key.empty()) if (key.empty())
continue; continue;
if (key == "key" && value == "value")
continue;
if (!IsKeyValid(key)){ if (!IsKeyValid(key)){
std::cout << "Key not valid: '" << key << "'. Skipping key." << std::endl; std::cout << "Key not valid: '" << key << "'. Skipping key." << std::endl;
} }