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

Utils: Make FileStreamer work with http{s) URLs

Browse Source 
Change-Id: I1b4ae903336db453933da7dfb8ca753eade256a8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2025-03-19 14:09:25 +01:00
parent 254a13fa17
commit d6e5ef56d5
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libs/utils/filestreamer.cpp
View File

@@ -7,11 +7,14 @@
#include "qtcprocess.h" #include "qtcprocess.h"
#include <solutions/tasking/barrier.h> #include <solutions/tasking/barrier.h>
#include <solutions/tasking/networkquery.h>
#include <solutions/tasking/tasktreerunner.h> #include <solutions/tasking/tasktreerunner.h>
#include <QFile> #include <QFile>
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QMutexLocker>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QWaitCondition> #include <QWaitCondition>
namespace Utils { namespace Utils {
@@ -82,7 +85,24 @@ signals:
void readyRead(const QByteArray &newData); void readyRead(const QByteArray &newData);
private: private:
GroupItem remoteTask() final { GroupItem remoteTask() final
{
const QStringView scheme = m_filePath.scheme();
if (scheme == u"http" || scheme == u"https") {
const auto onQuerySetup = [this](NetworkQuery &query) {
const QUrl url = m_filePath.toUrl();
query.setRequest(QNetworkRequest(url));
query.setNetworkAccessManager(new QNetworkAccessManager(&query));
connect(&query, &NetworkQuery::started, this, [this, &query] {
connect(query.reply(), &QNetworkReply::readyRead, this, [this, &query] {
const QByteArray response = query.reply()->readAll();
emit readyRead(response);
});
});
};
return NetworkQueryTask{onQuerySetup};
}
const auto setup = [this](Process &process) { const auto setup = [this](Process &process) {
const QStringList args = {"if=" + m_filePath.path()}; const QStringList args = {"if=" + m_filePath.path()};
const FilePath dd = m_filePath.withNewPath("dd"); const FilePath dd = m_filePath.withNewPath("dd");
@@ -94,7 +114,9 @@ private:
}; };
return ProcessTask(setup); return ProcessTask(setup);
} }
GroupItem localTask() final {
GroupItem localTask() final
{
const auto setup = [this](Async<QByteArray> &async) { const auto setup = [this](Async<QByteArray> &async) {
async.setConcurrentCallData(localRead, m_filePath); async.setConcurrentCallData(localRead, m_filePath);
Async<QByteArray> *asyncPtr = &async; Async<QByteArray> *asyncPtr = &async;
@@ -249,7 +271,8 @@ signals:
void started(); void started();
private: private:
GroupItem remoteTask() final { GroupItem remoteTask() final
{
const auto onSetup = [this](Process &process) { const auto onSetup = [this](Process &process) {
m_writeBuffer = new WriteBuffer(false, &process); m_writeBuffer = new WriteBuffer(false, &process);
connect(m_writeBuffer, &WriteBuffer::writeRequested, &process, &Process::writeRaw); connect(m_writeBuffer, &WriteBuffer::writeRequested, &process, &Process::writeRaw);