openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

use existing string quoting functions

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-01-14 14:32:49 -06:00
committed by Celtic Minstrel
parent 4eee43cd7e
commit 056fbfe393
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/prefs.win.cpp
View File

@@ -104,9 +104,11 @@ static bool save_prefs(fs::path fpath) {
else if(kv.second.type() == typeid(double))
fout << kv.first << " = " << std::fixed << boost::any_cast<double>(kv.second) << std::endl;
else if(kv.second.type() == typeid(std::string)){
std::string encoded;
TiXmlBase::EncodeString(boost::any_cast<std::string>(kv.second), &encoded);
fout << kv.first << " = \"" << encoded << "\"" << std::endl;
std::string value = boost::any_cast<std::string(kv.second);
// Surround with quotes so maybe_quote_string() will always quote it
value.push_front('"');
value.push_back('"');
fout << kv.first << " = " << maybe_quote_string(value) << std::endl;
}else printf("Warning: Unknown preference value type, skipping...\n");
if(!fout) {
perror("Error writing preferences");
@@ -149,14 +151,10 @@ static bool load_prefs(std::istream& in) {
std::string key = line.substr(0, key_end + 1), val = line.substr(val_beg);
if(val == "true") temp_prefs[key] = true;
else if(val == "false") temp_prefs[key] = false;
else if(val[0] == '"') {
// Dastardly trick to make TinyXML encode and decode string preferences
std::ostringstream dummy_xml;
dummy_xml << "<dummy>" << val.substr(1, val.size() - 2) << "</dummy>";
TiXmlElement text_element("");
text_element.Parse(dummy_xml.str().c_str(), nullptr, TIXML_ENCODING_UTF8);
std::string decoded = text_element.GetText();
temp_prefs[key] = decoded;
else if(val[0] == '"' || val[0] == '\'') {
std::istringstream str_val(val);
std::string value = read_maybe_quoted_string(str_val);
temp_prefs[key] = value;
} else if(val[0] == '[') {
int arr_end = val.find_first_of(']');
std::istringstream arr_vals(val.substr(1, arr_end - 1));