diff options
Diffstat (limited to 'src/common/profile.cpp')
-rw-r--r-- | src/common/profile.cpp | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/src/common/profile.cpp b/src/common/profile.cpp index fa7aa26..2fddd51 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -20,10 +20,13 @@ #include "common/profile.h" +#include "common/resources/inputstream.h" +#include "common/resources/outputstream.h" #include "app/system.h" #include "common/logger.h" +#include <memory> #include <utility> #include <cstring> #include <boost/property_tree/ini_parser.hpp> @@ -51,16 +54,29 @@ void CProfile::SetUseCurrentDirectory(bool useCurrentDirectory) m_useCurrentDirectory = useCurrentDirectory; } -std::string CProfile::GetIniFileLocation() -{ - return m_useCurrentDirectory ? "colobot.ini" : GetSystemUtils()->GetProfileFileLocation(); -} - bool CProfile::Init() { try { - bp::ini_parser::read_ini(GetIniFileLocation(), m_propertyTree); + std::unique_ptr<std::istream> stream; + if (m_useCurrentDirectory) + { + stream = std::unique_ptr<std::istream>(new std::ifstream("./colobot.ini")); + } + else + { + stream = std::unique_ptr<std::istream>(new CInputStream("colobot.ini")); + } + + if (stream->good()) + { + bp::ini_parser::read_ini(*stream, m_propertyTree); + } + else + { + GetLogger()->Error("Error on parsing profile: failed to open file\n"); + return false; + } } catch (std::exception & e) { @@ -76,7 +92,25 @@ bool CProfile::Save() { try { - bp::ini_parser::write_ini(GetIniFileLocation(), m_propertyTree); + std::unique_ptr<std::ostream> stream; + if (m_useCurrentDirectory) + { + stream = std::unique_ptr<std::ostream>(new std::ofstream("./colobot.ini")); + } + else + { + stream = std::unique_ptr<std::ostream>(new COutputStream("colobot.ini")); + } + + if (stream->good()) + { + bp::ini_parser::write_ini(*stream, m_propertyTree); + } + else + { + GetLogger()->Error("Error on storing profile: failed to open file\n"); + return false; + } } catch (std::exception & e) { |