Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update FileCache to use QSaveFile for atomic writes

Browse source
This commit is contained in:
Ryan Huffman 2017-05-09 14:08:43 -07:00
parent d86071d783
commit 542001b14f
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/networking/src/FileCache.cpp
View file

@ -17,6 +17,7 @@
#include <unordered_set>
#include <QDir>
#include <QSaveFile>
#include <PathUtils.h>
@ -110,19 +111,13 @@ FilePointer FileCache::writeFile(const char* data, File::Metadata&& metadata) {
return file;
}
// write the data to a temporary file
std::string tmpFilepath = filepath + "_tmp";
FILE* saveFile = fopen(tmpFilepath.c_str(), "wb");
if (saveFile != nullptr && fwrite(data, metadata.length, 1, saveFile) && fclose(saveFile) == 0) {
int result = rename(tmpFilepath.c_str(), filepath.c_str());
if (result == 0) {
file = addFile(std::move(metadata), filepath);
} else {
qCWarning(file_cache, "[%s] Failed to rename %s to %s (%s)", tmpFilepath.c_str(), filepath.c_str(), strerror(errno));
}
QSaveFile saveFile(QString::fromStdString(filepath));
saveFile.open(QIODevice::WriteOnly);
saveFile.write(data, metadata.length);
if (saveFile.commit()) {
file = addFile(std::move(metadata), filepath);
} else {
qCWarning(file_cache, "[%s] Failed to write %s (%s)", _dirname.c_str(), metadata.key.c_str(), strerror(errno));
errno = 0;
qCWarning(file_cache, "[%s] Failed to write %s", _dirname.c_str(), metadata.key.c_str());
}
return file;