0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1268 simplify and fix instance group file IO

Browse Source
This commit is contained in:
Petr Mrázek 2015-10-05 23:48:38 +02:00
parent db926a546e
commit 439c6b43a3
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
logic/InstanceList.cpp
View File

@ -135,16 +135,6 @@ QStringList InstanceList::getGroups()
void InstanceList::saveGroupList()
{
QString groupFileName = m_instDir + "/instgroups.json";
QFile groupFile(groupFileName);
// if you can't open the file, fail
if (!groupFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
{
// An error occurred. Ignore it.
qCritical() << "Failed to save instance group file.";
return;
}
QTextStream out(&groupFile);
QMap<QString, QSet<QString>> groupMap;
for (auto instance : m_instances)
{
@ -187,8 +177,7 @@ void InstanceList::saveGroupList()
}
toplevel.insert("groups", groupsArr);
QJsonDocument doc(toplevel);
groupFile.write(doc.toJson());
groupFile.close();
FS::write(groupFileName, doc.toJson());
}
void InstanceList::loadGroupList(QMap<QString, QString> &groupMap)
@ -199,22 +188,19 @@ void InstanceList::loadGroupList(QMap<QString, QString> &groupMap)
if (!QFileInfo(groupFileName).exists())
return;
QFile groupFile(groupFileName);
// if you can't open the file, fail
if (!groupFile.open(QIODevice::ReadOnly))
QByteArray jsonData;
try
{
// An error occurred. Ignore it.
qCritical() << "Failed to read instance group file.";
jsonData = FS::read(groupFileName);
}
catch (FS::FileSystemException & e)
{
qCritical() << "Failed to read instance group file :" << e.cause();
return;
}
QTextStream in(&groupFile);
QString jsonStr = in.readAll();
groupFile.close();
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonStr.toUtf8(), &error);
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &error);
// if the json was bad, fail
if (error.error != QJsonParseError::NoError)