diff options
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/global.h | 8 | ||||
-rw-r--r-- | src/common/profile.cpp | 129 | ||||
-rw-r--r-- | src/common/profile.h | 5 | ||||
-rw-r--r-- | src/common/test/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/common/test/colobot.ini | 10 | ||||
-rw-r--r-- | src/common/test/profile_test.cpp | 59 |
6 files changed, 156 insertions, 71 deletions
diff --git a/src/common/global.h b/src/common/global.h index 2f2104a..9704a2b 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -29,10 +29,10 @@ */ enum Language { - LANG_ENGLISH = 0, - LANG_FRENCH = 1, - LANG_GERMAN = 2, - LANG_POLISH = 3 + LANGUAGE_ENGLISH = 0, + LANGUAGE_FRENCH = 1, + LANGUAGE_GERMAN = 2, + LANGUAGE_POLISH = 3 }; /** diff --git a/src/common/profile.cpp b/src/common/profile.cpp index 1025567..2c78f9f 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -18,76 +18,145 @@ #include "common/profile.h" +#include "common/logger.h" #include <utility> #include <cstring> +#include <boost/property_tree/ini_parser.hpp> +#include <boost/regex.hpp> template<> CProfile* CSingleton<CProfile>::mInstance = nullptr; +namespace bp = boost::property_tree; -CProfile::CProfile() +CProfile::CProfile() : + m_profileNeedSave(false) { - m_ini = new CSimpleIniA(); - m_ini->SetUnicode(); - m_ini->SetMultiKey(); } CProfile::~CProfile() { - m_ini->Reset(); - delete m_ini; + if (m_profileNeedSave) + { + try + { + bp::ini_parser::write_ini("colobot.ini", m_propertyTree); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on storing profile: %s\n", e.what()); + } + } } bool CProfile::InitCurrentDirectory() { - bool result = m_ini->LoadFile("colobot.ini") == SI_OK; - return result; + try + { + bp::ini_parser::read_ini("colobot.ini", m_propertyTree); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; + } + return true; } + bool CProfile::SetLocalProfileString(std::string section, std::string key, std::string value) { - return (m_ini->SetValue(section.c_str(), key.c_str(), value.c_str()) == SI_OK); + try + { + m_propertyTree.put(section + "." + key, value); + m_profileNeedSave = true; + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; + } + return true; } bool CProfile::GetLocalProfileString(std::string section, std::string key, std::string &buffer) { - const char* value = m_ini->GetValue(section.c_str(), key.c_str(), nullptr); - if (value != nullptr && strlen(value) > 0) { - buffer = std::string(value); - return true; + try + { + buffer = m_propertyTree.get<std::string>(section + "." + key); } - - return false; + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; + } + return true; } bool CProfile::SetLocalProfileInt(std::string section, std::string key, int value) { - return (m_ini->SetLongValue(section.c_str(), key.c_str(), value) == SI_OK); + try + { + m_propertyTree.put(section + "." + key, value); + m_profileNeedSave = true; + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; + } + return true; } bool CProfile::GetLocalProfileInt(std::string section, std::string key, int &value) { - value = m_ini->GetLongValue(section.c_str(), key.c_str(), 0L); + try + { + value = m_propertyTree.get<int>(section + "." + key); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; + } return true; } bool CProfile::SetLocalProfileFloat(std::string section, std::string key, float value) { - return (m_ini->SetDoubleValue(section.c_str(), key.c_str(), value) == SI_OK); + try + { + m_propertyTree.put(section + "." + key, value); + m_profileNeedSave = true; + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; + } + return true; } bool CProfile::GetLocalProfileFloat(std::string section, std::string key, float &value) { - value = m_ini->GetDoubleValue(section.c_str(), key.c_str(), 0.0d); + try + { + value = m_propertyTree.get<float>(section + "." + key); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; + } return true; } @@ -95,13 +164,21 @@ bool CProfile::GetLocalProfileFloat(std::string section, std::string key, float std::vector< std::string > CProfile::GetLocalProfileSection(std::string section, std::string key) { std::vector< std::string > ret_list; - - CSimpleIniA::TNamesDepend values; - m_ini->GetAllValues(section.c_str(), key.c_str(), values); - values.sort(CSimpleIniA::Entry::LoadOrder()); - - for (auto item : values) { - ret_list.push_back(item.pItem); + boost::regex re(key + "[0-9]*"); //we want to match all key followed my any number + + try + { + for(bp::ptree::value_type const & v : m_propertyTree.get_child(section)) + { + if (boost::regex_search(v.first, re)) + { + ret_list.push_back(v.second.get_value<std::string>()); + } + } + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); } return ret_list; diff --git a/src/common/profile.h b/src/common/profile.h index 7a23d94..ed948ff 100644 --- a/src/common/profile.h +++ b/src/common/profile.h @@ -21,7 +21,7 @@ #pragma once -#include "lib/simpleini/SimpleIni.h" +#include <boost/property_tree/ptree.hpp> #include "common/singleton.h" @@ -102,7 +102,8 @@ class CProfile : public CSingleton<CProfile> std::vector< std::string > GetLocalProfileSection(std::string section, std::string key); private: - CSimpleIniA *m_ini; + boost::property_tree::ptree m_propertyTree; + bool m_profileNeedSave; }; //! Global function to get profile instance diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt index a1a7a50..7936862 100644 --- a/src/common/test/CMakeLists.txt +++ b/src/common/test/CMakeLists.txt @@ -1,14 +1,20 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_BUILD_TYPE debug) -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0 -std=c++11") +set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wold-style-cast -std=gnu++0x") + +include_directories( +. +../.. +../../.. +${GTEST_DIR}/include +) -include_directories("../../") -include_directories("../../../") add_executable(image_test ../image.cpp image_test.cpp) -target_link_libraries(image_test -lpng -lSDL -lSDL_image) +target_link_libraries(image_test ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${PNG_LIBRARIES}) -add_executable(profile_test ../profile.cpp profile_test.cpp) +add_executable(profile_test ../profile.cpp ../logger.cpp profile_test.cpp) +target_link_libraries(profile_test gtest ${Boost_LIBRARIES}) add_test(profile_test ./profile_test) diff --git a/src/common/test/colobot.ini b/src/common/test/colobot.ini index f6a5f96..2ca37ee 100644 --- a/src/common/test/colobot.ini +++ b/src/common/test/colobot.ini @@ -8,8 +8,8 @@ string_value=Hello world int_value=42 [test_multi] -entry=1 -entry=2 -entry=3 -entry=4 -entry=5 +entry1=1 +entry2=2 +entry3=3 +entry4=4 +entry5=5 diff --git a/src/common/test/profile_test.cpp b/src/common/test/profile_test.cpp index 65e20c5..6236083 100644 --- a/src/common/test/profile_test.cpp +++ b/src/common/test/profile_test.cpp @@ -1,43 +1,44 @@ #include "../profile.h" +#include "../logger.h" #include <iostream> #include <string> #include <vector> +#include <gtest/gtest.h> -using namespace std; -int main() +class CProfileTest : public testing::Test { - CProfile profile; - profile.InitCurrentDirectory(); // load colobot.ini file +protected: + CLogger m_logger; + CProfile m_profile; - string result; - profile.GetLocalProfileString("test_string", "string_value", result); - if (result != "Hello world") { - cout << "GetLocalProfileString failed!" << endl; - return 1; - } +}; + +TEST_F(CProfileTest, ReadTest) +{ + ASSERT_TRUE(m_profile.InitCurrentDirectory()); // load colobot.ini file + + std::string result; + ASSERT_TRUE(m_profile.GetLocalProfileString("test_string", "string_value", result)); + ASSERT_STREQ("Hello world", result.c_str()); int int_value; - profile.GetLocalProfileInt("test_int", "int_value", int_value); - if (int_value != 42) { - cout << "GetLocalProfileInt failed!" << endl; - return 1; - } + ASSERT_TRUE(m_profile.GetLocalProfileInt("test_int", "int_value", int_value)); + ASSERT_EQ(42, int_value); float float_value; - profile.GetLocalProfileFloat("test_float", "float_value", float_value); - if (float_value != 1.5) { - cout << "GetLocalProfileFloat failed!" << endl; - return 1; - } - - vector<string> list; - list = profile.GetLocalProfileSection("test_multi", "entry"); - if (list.size() != 5) { - cout << "GetLocalProfileSection failed!" << endl; - return 1; - } - - return 0; + ASSERT_TRUE(m_profile.GetLocalProfileFloat("test_float", "float_value", float_value)); + ASSERT_FLOAT_EQ(1.5, float_value); + + std::vector<std::string> list; + list = m_profile.GetLocalProfileSection("test_multi", "entry"); + ASSERT_EQ(5u, list.size()); } + +int main(int argc, char *argv[]) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} + |