mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.

Browse source
This commit is contained in:
AnyOldName3 2017-10-15 01:59:21 +01:00
parent 28ff677337
commit 7329e6a9ef
2 changed files with 46 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
components/config/gamesettings.cpp
View file

@ -55,7 +55,6 @@ void Config::GameSettings::validatePaths()
for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it) {
QString path = QString::fromUtf8(it->string().c_str());
path.remove(QChar('\"'));
QDir dir(path);
if (dir.exists())
@ -64,6 +63,11 @@ void Config::GameSettings::validatePaths()
// Do the same for data-local
QString local = mSettings.value(QString("data-local"));
if (local.at(0) == QChar('\"'))
{
local.remove(0, 1);
local.chop(1);
}
if (local.isEmpty())
return;
@ -76,7 +80,6 @@ void Config::GameSettings::validatePaths()
if (!dataDirs.empty()) {
QString path = QString::fromUtf8(dataDirs.front().string().c_str());
path.remove(QChar('\"'));
QDir dir(path);
if (dir.exists())
@ -120,6 +123,27 @@ bool Config::GameSettings::readFile(QTextStream &stream, QMap<QString, QString>
// Don't remove existing data entries
if (key != QLatin1String("data"))
settings.remove(key);
else
{
// 'data=...' line, so needs processing to deal with ampersands and quotes
QChar delim = '\"';
QChar escape = '&';
if (value.at(0) == delim)
{
QString valueOriginal = value;
value = "";
for (QString::const_iterator it = valueOriginal.begin() + 1; it != valueOriginal.end(); ++it)
{
if (*it == escape)
++it;
else if (*it == delim)
break;
value += *it;
}
}
}
QStringList values = cache.values(key);
values.append(settings.values(key));
@ -157,7 +181,7 @@ bool Config::GameSettings::writeFile(QTextStream &stream)
{
stream << i.key() << "=";
// The following is based on boost::io::detail::quoted_manip.hpp, but calling this function did not work as there are too may QStrings involved
// The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work as there are too may QStrings involved
QChar delim = '\"';
QChar escape = '&';
QString string = i.value();
@ -380,9 +404,26 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
{
it.previous();
if (it.key() == QLatin1String("data"))
{
settingLine = it.key() + "=";
// The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work as there are too may QStrings involved
QChar delim = '\"';
QChar escape = '&';
QString string = it.value();
settingLine += delim;
for (QString::const_iterator iter = string.begin(); iter != string.end(); ++iter)
{
if (*iter == delim || *iter == escape)
settingLine += escape;
settingLine += *iter;
}
settingLine += delim;
}
// Quote paths with spaces
if ((it.key() == QLatin1String("data")
|| it.key() == QLatin1String("data-local")
else if ((it.key() == QLatin1String("data-local")
|| it.key() == QLatin1String("resources")) && it.value().contains(QChar(' ')))
{
QString stripped = it.value();

2
components/files/configurationmanager.cpp
View file

@ -75,8 +75,6 @@ void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool cre
for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it)
{
path = it->string();
boost::erase_all(path, "\"");
*it = boost::filesystem::path(path);
// Check if path contains a token
if (!path.empty() && *path.begin() == '?')