Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F85951548
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Authored By
Unknown
Size
10 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/src/kazv-io-manager.cpp b/src/kazv-io-manager.cpp
index b3aa09b..528cf2c 100644
--- a/src/kazv-io-manager.cpp
+++ b/src/kazv-io-manager.cpp
@@ -1,105 +1,77 @@
/*
* This file is part of kazv.
* SPDX-FileCopyrightText: 2022 nannanko <nannanko@kazv.moe>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
#include "kazv-io-manager.hpp"
#include <QObject>
#include <QVector>
#include <KIO/TransferJob>
#include <QSaveFile>
#include <QPointer>
#include <QUrl>
#include <QIODevice>
+#include <QSharedPointer>
#include <algorithm>
#include <execution>
struct KazvIOJob {
QPointer<KIO::TransferJob> job;
- QString eventId;
-
- KazvIOJob(const QString &eventId, const QUrl &serverUrl)
- {
- this->job = KIO::get(serverUrl);
- this->eventId = eventId;
- }
-};
-
-struct KazvIODownloadJob : public KazvIOJob {
- QPointer<QSaveFile> localFile;
-
- KazvIODownloadJob(const QString &eventId, const QUrl &serverUrl, const QUrl &localFileUrl)
- : KazvIOJob(eventId, serverUrl)
- {
- this->localFile = new QSaveFile(localFileUrl.path());
- this->localFile->open(QIODevice::WriteOnly);
- }
+ QSharedPointer<QSaveFile> file;
};
struct KazvIOManagerPrivate {
- QVector<KazvIODownloadJob> jobs;
+ QMap<QString, KazvIOJob> jobs;
};
KazvIOManager::KazvIOManager(QObject *parent)
: QObject(parent)
, m_d(new KazvIOManagerPrivate)
{
}
KazvIOManager::~KazvIOManager() = default;
-QPointer<KIO::TransferJob> KazvIOManager::startNewDownloadJob(const QString &eventId, const QUrl &serverUrl, const QUrl &localFileUrl)
+QPointer<KIO::TransferJob> KazvIOManager::startNewDownloadJob(const QUrl &serverUrl, const QString &localFileName, const QString &jobId)
{
- m_d->jobs.push_back(KazvIODownloadJob(eventId, serverUrl, localFileUrl));
- connect(m_d->jobs.last().job, &KIO::TransferJob::data, this, &KazvIOManager::writeFile);
- connect(m_d->jobs.last().job, &KJob::result, this, &KazvIOManager::cleanJob);
- return m_d->jobs.last().job;
+ KazvIOJob job;
+ job.job = KIO::get(serverUrl);
+ job.file = QSharedPointer<QSaveFile>(new QSaveFile(localFileName));
+ job.file->open(QIODevice::WriteOnly);
+
+ connect(job.job, &KIO::TransferJob::data, this, [job](KJob* /*job*/, const QByteArray data) {
+ job.file->write(data);
+ });
+ connect(job.job, &KJob::result, this, [this, jobId](KJob* /*job*/) {
+ m_d->jobs[jobId].file->commit();
+ m_d->jobs.remove(jobId);
+ });
+
+ m_d->jobs[jobId] = job;
+ return m_d->jobs[jobId].job;
}
/*
QPointer<KIO::TransferJob> KazvIOManager::startNewUploadJob(QFile &file, const QUrl &serverUrl, const QString &token)
{
// TODO: Upload File
auto job = KIO::http_post(serverUrl, &file);
// connect(job, &KJob::result, this, &KazvIOManager::cleanJob);
// connect(job, &KIO::TransferJob::data, this, &KazvIOManager::displayResponse);
// job->addMetaData(QString("Authorization"), token);
job->start();
return job;
}
*/
-KIO::TransferJob *KazvIOManager::getDownloadJob(const QString &eventId)
+KIO::TransferJob *KazvIOManager::getDownloadJob(const QString &jobId)
{
- auto targetJob = std::find_if(std::execution::seq,
- m_d->jobs.begin(),
- m_d->jobs.end(),
- [&eventId](auto it) { return it.eventId == eventId; });
+ auto targetJob = m_d->jobs.find(jobId);
if (targetJob == m_d->jobs.end()) {
- return QPointer<KIO::TransferJob>();
+ return nullptr;
}
- return targetJob->job;
-}
-
-void KazvIOManager::writeFile(KJob *job, const QByteArray &data)
-{
- auto targetJob = std::find_if(std::execution::seq,
- m_d->jobs.begin(),
- m_d->jobs.end(),
- [job](auto it) { return it.job == job; });
- targetJob->localFile->write(data);
-}
-
-void KazvIOManager::cleanJob(KJob *job)
-{
- auto targetJob = std::find_if(std::execution::seq,
- m_d->jobs.begin(),
- m_d->jobs.end(),
- [job](auto it) { return it.job == job; });
- targetJob->localFile->commit();
- targetJob->localFile->deleteLater();
- m_d->jobs.erase(targetJob);
+ return targetJob.value().job;
}
diff --git a/src/kazv-io-manager.hpp b/src/kazv-io-manager.hpp
index 9945a42..f942756 100644
--- a/src/kazv-io-manager.hpp
+++ b/src/kazv-io-manager.hpp
@@ -1,36 +1,32 @@
/*
* This file is part of kazv.
* SPDX-FileCopyrightText: 2022 nannanko <nannanko@kazv.moe>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
#pragma once
#include <QObject>
#include <QtQml>
#include <QUrl>
-#include <KIO/Job>
-#include <QByteArray>
+#include <QString>
+#include <KIO/TransferJob>
#include <QPointer>
#include <memory>
struct KazvIOManagerPrivate;
class KazvIOManager : public QObject {
Q_OBJECT
QML_ELEMENT
std::unique_ptr<KazvIOManagerPrivate> m_d;
public:
explicit KazvIOManager(QObject *parent = 0);
~KazvIOManager() override;
- QPointer<KIO::TransferJob> startNewDownloadJob(const QString &eventId, const QUrl &serverUrl, const QUrl &localFileUrl);
+ QPointer<KIO::TransferJob> startNewDownloadJob(const QUrl &serverUrl, const QString &localFileName, const QString &jobId);
// QPointer<KIO::TransferJob> startNewUploadJob(QFile &file, const QUrl &serverUrl, const QString &token);
- Q_INVOKABLE KIO::TransferJob *getDownloadJob(const QString &eventId);
-
-private Q_SLOTS:
- void writeFile(KJob *job, const QByteArray &data);
- void cleanJob(KJob *job);
+ Q_INVOKABLE KIO::TransferJob *getDownloadJob(const QString &jobId);
};
diff --git a/src/kazv-io.cpp b/src/kazv-io.cpp
index 736aad2..f34f6dc 100644
--- a/src/kazv-io.cpp
+++ b/src/kazv-io.cpp
@@ -1,206 +1,205 @@
/*
* This file is part of kazv.
* SPDX-FileCopyrightText: 2022 nannanko <nannanko@kazv.moe>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
#include "kazv-io.hpp"
#include "kazv-io-manager.hpp"
#include <QUrl>
#include <QObject>
struct KazvIOPrivate {
QPointer<KazvIOManager> manager;
QString roomId;
QString eventId;
QUrl localFileUrl;
QString serverUrl;
QString mxcUri;
float progress;
QPointer<KIO::TransferJob> job;
};
KazvIO::KazvIO(QObject *parent)
: QObject(parent)
, m_d(new KazvIOPrivate)
{
connect(this, &KazvIO::jobChanged, this, &KazvIO::checkJob);
connect(this, &KazvIO::success, this, &KazvIO::result);
connect(this, &KazvIO::failure, this, &KazvIO::result);
connect(this, &KazvIO::result, this, &KazvIO::clearPercent);
}
KazvIO::~KazvIO() = default;
void KazvIO::connectJob(QPointer<KJob> job)
{
connect(job, &KJob::percentChanged, this, &KazvIO::updateProgress);
connect(job, &KJob::result, this, &KazvIO::checkResult);
}
/*
* This function is only applicable to a single thread,
* if the manager is located in other threads, please modify this function appropriately
*/
void KazvIO::download()
{
- m_d->job = m_d->manager->startNewDownloadJob(m_d->eventId, m_d->serverUrl, m_d->localFileUrl);
+ m_d->job = m_d->manager->startNewDownloadJob(m_d->serverUrl, m_d->localFileUrl.path(), m_d->eventId);
connectJob(qobject_cast<KJob*>(m_d->job));
m_d->job->start();
}
/*
* This function is only applicable to a single thread,
* if the manager is located in other threads, please modify this function appropriately
*/
void KazvIO::upload()
{
// TODO: Get mxcUri form response
// auto file = QFile(m_d->url.toLocalFile());
// auto job = m_d->manager->startNewUploadJob(file, m_d->serverUrl, m_d->token);
// connectJob(qobject_cast<KJob*>(job));
// connectJob(job, &KJob::result, this, &KazvIO::setMxcUri);
}
/*
* This function is only applicable to a single thread,
* if the manager is located in other threads, please modify this function appropriately
*/
void KazvIO::suspend()
{
m_d->job->suspend();
}
/*
* This function is only applicable to a single thread,
* if the manager is located in other threads, please modify this function appropriately
*/
void KazvIO::resume()
{
m_d->job->resume();
}
/*
* This function is only applicable to a single thread,
* if the manager is located in other threads, please modify this function appropriately
*/
void KazvIO::cancel()
{
m_d->job->kill();
Q_EMIT failure();
}
void KazvIO::checkJob()
{
- qDebug() << "check Job";
if (!m_d->job.isNull()) {
updateProgress(m_d->job, m_d->job->percent());
Q_EMIT processing();
if (m_d->job->isSuspended()) {
Q_EMIT suspended();
}
connectJob(qobject_cast<KJob*>(m_d->job));
}
}
KazvIOManager *KazvIO::manager()
{
return m_d->manager;
}
void KazvIO::setManager(KazvIOManager *manager)
{
m_d->manager = manager;
Q_EMIT managerChanged();
}
QString KazvIO::roomId()
{
return m_d->roomId;
}
void KazvIO::setRoomId(QString roomId)
{
m_d->roomId = roomId;
Q_EMIT roomIdChanged();
}
QString KazvIO::eventId()
{
return m_d->eventId;
}
void KazvIO::setEventId(QString eventId)
{
m_d->eventId = eventId;
Q_EMIT eventIdChanged();
}
QUrl KazvIO::localFileUrl()
{
return m_d->localFileUrl;
}
void KazvIO::setLocalFileUrl(QUrl localFileUrl)
{
m_d->localFileUrl = localFileUrl;
Q_EMIT localFileUrlChanged();
}
QString KazvIO::serverUrl()
{
return m_d->serverUrl;
}
void KazvIO::setServerUrl(QString serverUrl)
{
m_d->serverUrl = serverUrl;
Q_EMIT serverUrlChanged();
}
QString KazvIO::mxcUri()
{
return m_d->mxcUri;
}
float KazvIO::progress()
{
return m_d->progress;
}
void KazvIO::updateProgress(KJob * /* job */, unsigned long percent)
{
m_d->progress = 1.0 * percent / 100;
Q_EMIT progressChanged();
}
void KazvIO::checkResult(KJob *job)
{
if (job->error()) {
Q_EMIT failure();
} else {
Q_EMIT success();
}
}
void KazvIO::clearPercent()
{
m_d->progress = 0;
Q_EMIT progressChanged();
}
void KazvIO::setMxcUri(KJob * /* job */)
{
/* TODO: get the mxcUri from the response, which requires me to understand how to get the response */
}
KIO::TransferJob *KazvIO::job()
{
return m_d->job;
}
void KazvIO::setJob(KIO::TransferJob *job)
{
m_d->job = job;
Q_EMIT jobChanged();
}
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Thu, Nov 19, 3:48 PM (1 d, 23 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1841314
Default Alt Text
(10 KB)
Attached To
Mode
rK kazv
Attached
Detach File
Event Timeline