flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #581, #592, #545 CAtomicFile can support ReadWrite mode by first copying the file.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-02-06 18:25:04 +00:00
parent 3bc145cc0c
commit 3175e640bb
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/atomicfile.cpp
View File

@@ -22,14 +22,18 @@ namespace BlackMisc
bool CAtomicFile::open(CAtomicFile::OpenMode mode)
{
Q_ASSERT_X(!(mode & (ReadOnly | Append)), Q_FUNC_INFO, "ReadOnly and Append flags are incompatible with CAtomicFile");
m_originalFilename = fileName();
QFileInfo fileInfo(fileName());
setFileName(QFileInfo(fileInfo.dir(), ".tmp." + fileInfo.fileName() + "." + randomSuffix()).filePath());
if (exists()) { remove(); }
bool ok = QFile::open(mode);
bool ok = true;
if (mode & ReadOnly)
{
if (exists(m_originalFilename) && ! copy(m_originalFilename, fileName())) { ok = false; }
}
if (ok && ! QFile::open(mode)) { ok = false; }
if (! ok) { setFileName(m_originalFilename); }
return ok;
}

17
src/blackmisc/valuecache.cpp
View File

@@ -241,25 +241,24 @@ namespace BlackMisc
}
for (auto it = namespaces.cbegin(); it != namespaces.cend(); ++it)
{
QFile readFile(dir + "/" + it.key() + ".json");
if (! readFile.open(QFile::ReadWrite | QFile::Text))
CAtomicFile file(dir + "/" + it.key() + ".json");
if (! file.open(QFile::ReadWrite | QFile::Text))
{
return CLogMessage(this).error("Failed to open %1: %2") << readFile.fileName() << readFile.errorString();
return CLogMessage(this).error("Failed to open %1: %2") << file.fileName() << file.errorString();
}
auto json = QJsonDocument::fromJson(readFile.readAll());
auto json = QJsonDocument::fromJson(file.readAll());
if (json.isArray() || (json.isNull() && ! json.isEmpty()))
{
return CLogMessage(this).error("Invalid JSON format in %1") << readFile.fileName();
return CLogMessage(this).error("Invalid JSON format in %1") << file.fileName();
}
CVariantMap storedValues;
storedValues.convertFromJson(json.object());
storedValues.insert(*it);
json.setObject(storedValues.toJson());
readFile.close();
CAtomicFile writeFile(readFile.fileName());
if (! (writeFile.open(QFile::WriteOnly | QFile::Text) && writeFile.write(json.toJson()) > 0 && writeFile.checkedClose()))
if (! (file.seek(0) && file.resize(0) && file.write(json.toJson()) > 0 && file.checkedClose()))
{
return CLogMessage(this).error("Failed to write to %1: %2") << writeFile.fileName() << writeFile.errorString();
return CLogMessage(this).error("Failed to write to %1: %2") << file.fileName() << file.errorString();
}
}
return {};