From f6638a173e21fbee3cc961d3dea82cc89382b873 Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Wed, 26 Sep 2012 22:57:43 +0200 Subject: Work in progress on opening files, and listing dirs Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet --- src/common/profile.cpp | 118 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 94 insertions(+), 24 deletions(-) (limited to 'src/common/profile.cpp') diff --git a/src/common/profile.cpp b/src/common/profile.cpp index 1025567..0881c92 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -18,76 +18,132 @@ #include "common/profile.h" +#include "common/logger.h" #include #include +#include template<> CProfile* CSingleton::mInstance = nullptr; +namespace bp = boost::property_tree; CProfile::CProfile() { - m_ini = new CSimpleIniA(); - m_ini->SetUnicode(); - m_ini->SetMultiKey(); + // m_ini = new CSimpleIniA(); + // m_ini->SetUnicode(); + // m_ini->SetMultiKey(); } CProfile::~CProfile() { - m_ini->Reset(); - delete m_ini; + // m_ini->Reset(); + // delete m_ini; } 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 result; + 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); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + } + // return (m_ini->SetValue(section.c_str(), key.c_str(), value.c_str()) == SI_OK); + 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(section + "." + key); } - - return false; + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + } + 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); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + } + // return (m_ini->SetLongValue(section.c_str(), key.c_str(), value) == SI_OK); + 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(section + "." + key); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + } + // value = m_ini->GetLongValue(section.c_str(), key.c_str(), 0L); 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); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + } + // return (m_ini->SetDoubleValue(section.c_str(), key.c_str(), value) == SI_OK); + 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(section + "." + key); + } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + } + // value = m_ini->GetDoubleValue(section.c_str(), key.c_str(), 0.0d); return true; } @@ -96,13 +152,27 @@ std::vector< std::string > CProfile::GetLocalProfileSection(std::string section, { 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); + try + { + for(bp::ptree::value_type const & v : m_propertyTree.get_child(section)) + { + if (v.first == key) + { + ret_list.push_back(v.second.get_value()); + } + } } + catch (std::exception & e) + { + GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + } + // 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); + // } return ret_list; } -- cgit v1.2.3-1-g7c22 From cc9a5070544bbac127df45ca73810a03ed2fa9d2 Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Thu, 27 Sep 2012 00:30:47 +0200 Subject: Profile rewritten to boost. Read/write to ini should work. Load/Save should work. --- src/common/profile.cpp | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'src/common/profile.cpp') diff --git a/src/common/profile.cpp b/src/common/profile.cpp index 0881c92..c66725f 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -23,24 +23,32 @@ #include #include #include +#include template<> CProfile* CSingleton::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()); + } + } } @@ -53,23 +61,25 @@ bool CProfile::InitCurrentDirectory() catch (std::exception & e) { GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; } - // return result; return true; } + bool CProfile::SetLocalProfileString(std::string section, std::string key, std::string value) { 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 (m_ini->SetValue(section.c_str(), key.c_str(), value.c_str()) == SI_OK); return true; } @@ -83,6 +93,7 @@ bool CProfile::GetLocalProfileString(std::string section, std::string key, std:: catch (std::exception & e) { GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; } return true; } @@ -97,8 +108,8 @@ bool CProfile::SetLocalProfileInt(std::string section, std::string key, int valu catch (std::exception & e) { GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; } - // return (m_ini->SetLongValue(section.c_str(), key.c_str(), value) == SI_OK); return true; } @@ -112,8 +123,8 @@ bool CProfile::GetLocalProfileInt(std::string section, std::string key, int &val catch (std::exception & e) { GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; } - // value = m_ini->GetLongValue(section.c_str(), key.c_str(), 0L); return true; } @@ -127,8 +138,8 @@ bool CProfile::SetLocalProfileFloat(std::string section, std::string key, float catch (std::exception & e) { GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; } - // return (m_ini->SetDoubleValue(section.c_str(), key.c_str(), value) == SI_OK); return true; } @@ -142,8 +153,8 @@ bool CProfile::GetLocalProfileFloat(std::string section, std::string key, float catch (std::exception & e) { GetLogger()->Info("Error on parsing profile: %s\n", e.what()); + return false; } - // value = m_ini->GetDoubleValue(section.c_str(), key.c_str(), 0.0d); return true; } @@ -151,12 +162,13 @@ 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; + 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 (v.first == key) + if (boost::regex_search(v.first, re)) { ret_list.push_back(v.second.get_value()); } @@ -166,13 +178,6 @@ std::vector< std::string > CProfile::GetLocalProfileSection(std::string section, { GetLogger()->Info("Error on parsing profile: %s\n", e.what()); } - // 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); - // } return ret_list; } -- cgit v1.2.3-1-g7c22 From df4e3dfb6e623889757afe79fc4dfd29ae85748e Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Fri, 28 Sep 2012 21:03:28 +0200 Subject: Small fix in profile + profile_test rewritten to gtest. --- src/common/profile.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/common/profile.cpp') diff --git a/src/common/profile.cpp b/src/common/profile.cpp index c66725f..2c78f9f 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -104,6 +104,7 @@ bool CProfile::SetLocalProfileInt(std::string section, std::string key, int valu try { m_propertyTree.put(section + "." + key, value); + m_profileNeedSave = true; } catch (std::exception & e) { @@ -134,6 +135,7 @@ bool CProfile::SetLocalProfileFloat(std::string section, std::string key, float try { m_propertyTree.put(section + "." + key, value); + m_profileNeedSave = true; } catch (std::exception & e) { -- cgit v1.2.3-1-g7c22