squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 23:17:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15419 from Chocobo1/file

Browse Source 
Improve error detection when saving files
This commit is contained in:
Chocobo1
2021-09-19 13:28:47 +08:00
committed by GitHub
parent 8518333406 9673be17cb
commit 010d1b5ff8
17 changed files with 2610 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/base/torrentfileswatcher.cpp
View File

@@ -40,7 +40,6 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonValue>
#include <QSaveFile>
#include <QSet>
#include <QTextStream>
#include <QThread>
@@ -60,6 +59,7 @@
#include "base/settingsstorage.h"
#include "base/tagset.h"
#include "base/utils/fs.h"
#include "base/utils/io.h"
#include "base/utils/string.h"
using namespace std::chrono_literals;
@@ -373,13 +373,13 @@ void TorrentFilesWatcher::store() const
jsonObj[watchedFolder] = serializeWatchedFolderOptions(options);
}
const QString path = QDir(specialFolderLocation(SpecialFolder::Config)).absoluteFilePath(CONF_FILE_NAME);
const QByteArray data = QJsonDocument(jsonObj).toJson();
QSaveFile confFile {QDir(specialFolderLocation(SpecialFolder::Config)).absoluteFilePath(CONF_FILE_NAME)};
if (!confFile.open(QIODevice::WriteOnly) || (confFile.write(data) != data.size()) || !confFile.commit())
const nonstd::expected<void, QString> result = Utils::IO::saveToFile(path, data);
if (!result)
{
LogMsg(tr("Couldn't store Watched Folders configuration to %1. Error: %2")
.arg(confFile.fileName(), confFile.errorString()), Log::WARNING);
.arg(path, result.error()), Log::WARNING);
}
}