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

FilePath: Integrate FileStreamerManager for async i-face

Browse Source 
Change-Id: I3371471e3c23b86a62b5e4056b343941ab46e191
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-03-03 01:04:45 +01:00
parent ae2690e4b1
commit 69fa8f3f3c
9 changed files with 27 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@
#include "algorithm.h"
#include "devicefileaccess.h"
#include "environment.h"
#include "filestreamermanager.h"
#include "fileutils.h"
#include "hostosinfo.h"
#include "qtcassert.h"
@@ -626,13 +627,6 @@ bool FilePath::ensureReachable(const FilePath &other) const
return false;
}
void FilePath::asyncFileContents(const Continuation<const expected_str<QByteArray> &> &cont,
qint64 maxSize,
qint64 offset) const
{
return fileAccess()->asyncFileContents(*this, cont, maxSize, offset);
}
expected_str<qint64> FilePath::writeFileContents(const QByteArray &data, qint64 offset) const
{
return fileAccess()->writeFileContents(*this, data, offset);
@@ -643,11 +637,19 @@ FilePathInfo FilePath::filePathInfo() const
return fileAccess()->filePathInfo(*this);
}
void FilePath::asyncWriteFileContents(const Continuation<const expected_str<qint64> &> &cont,
const QByteArray &data,
qint64 offset) const
FileStreamHandle FilePath::asyncCopy(const FilePath &target, const CopyContinuation &cont) const
{
return fileAccess()->asyncWriteFileContents(*this, cont, data, offset);
return FileStreamerManager::copy(*this, target, cont);
}
FileStreamHandle FilePath::asyncRead(const ReadContinuation &cont) const
{
return FileStreamerManager::read(*this, cont);
}
FileStreamHandle FilePath::asyncWrite(const QByteArray &data, const WriteContinuation &cont) const
{
return FileStreamerManager::write(*this, data, cont);
}
bool FilePath::needsDevice() const
@@ -1614,26 +1616,6 @@ expected_str<void> FilePath::copyFile(const FilePath &target) const
return fileAccess()->copyFile(*this, target);
}
void FilePath::asyncCopyFile(const Continuation<const expected_str<void> &> &cont,
const FilePath &target) const
{
if (host() != target.host()) {
asyncFileContents([cont, target](const expected_str<QByteArray> &contents) {
if (contents)
target.asyncWriteFileContents(
[cont](const expected_str<qint64> &result) {
if (result)
cont({});
else
cont(make_unexpected(result.error()));
},
*contents);
});
return;
}
return fileAccess()->asyncCopyFile(*this, cont, target);
}
bool FilePath::renameFile(const FilePath &target) const
{
return fileAccess()->renameFile(*this, target);