feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FilePath: Return optional bytearray for file contents

Browse Source 
For differentiating between "error" and "empty file".

Change-Id: I2c019ceac625e7be3180afa4d47ae3a24df91c1d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2022-09-09 13:48:08 +02:00
parent 28349c1b08
commit 2c51e4bc17
22 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/utils/filepath.cpp
View File

@@ -538,10 +538,11 @@ void FilePath::iterateDirectories(const FilePaths &dirs,
dir.iterateDirectory(callBack, filter);
}
QByteArray FilePath::fileContents(qint64 maxSize, qint64 offset) const
std::optional<QByteArray> FilePath::fileContents(qint64 maxSize, qint64 offset) const
{
if (needsDevice()) {
QTC_ASSERT(s_deviceHooks.fileContents, return {});
// TODO change hooks to return optional byte array
return s_deviceHooks.fileContents(*this, maxSize, offset);
}
@@ -562,12 +563,14 @@ QByteArray FilePath::fileContents(qint64 maxSize, qint64 offset) const
return f.readAll();
}
void FilePath::asyncFileContents(const Continuation<const QByteArray &> &cont,
qint64 maxSize, qint64 offset) const
void FilePath::asyncFileContents(const Continuation<const std::optional<QByteArray> &> &cont,
qint64 maxSize,
qint64 offset) const
{
if (needsDevice()) {
QTC_ASSERT(s_deviceHooks.asyncFileContents, return);
return s_deviceHooks.asyncFileContents(cont, *this, maxSize, offset);
s_deviceHooks.asyncFileContents(cont, *this, maxSize, offset);
return;
}
cont(fileContents(maxSize, offset));
@@ -1363,8 +1366,10 @@ bool FilePath::copyFile(const FilePath &target) const
{
if (host() != target.host()) {
// FIXME: This does not scale.
const QByteArray ba = fileContents();
return target.writeFileContents(ba);
const std::optional<QByteArray> ba = fileContents();
if (!ba)
return false;
return target.writeFileContents(*ba);
}
if (needsDevice()) {
QTC_ASSERT(s_deviceHooks.copyFile, return false);
@@ -1376,8 +1381,9 @@ bool FilePath::copyFile(const FilePath &target) const
void FilePath::asyncCopyFile(const std::function<void(bool)> &cont, const FilePath &target) const
{
if (host() != target.host()) {
asyncFileContents([cont, target](const QByteArray &ba) {
target.asyncWriteFileContents(cont, ba);
asyncFileContents([cont, target](const std::optional<QByteArray> &ba) {
if (ba)
target.asyncWriteFileContents(cont, *ba);
});
} else if (needsDevice()) {
s_deviceHooks.asyncCopyFile(cont, *this, target);