logos-storage/logos-storage-app-skeleton
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-app-skeleton.git synced 2026-06-15 12:59:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add progress

Browse Source
This commit is contained in:
Arnaud 2026-02-15 20:14:44 +04:00
parent 5409e13ea3
commit 855a07ba46
No known key found for this signature in database
GPG Key ID: 20E40A5D3110766F
2 changed files with 70 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/StorageBackend.cpp
View File

@ -38,14 +38,14 @@ StorageBackend::~StorageBackend()
LogosResult StorageBackend::init(const QString& configJson = "{}") {
qDebug() << "StorageBackend::initStorage called";
LogosResult result = m_logos->storage_module.init(m_configJson);
bool result = m_logos->storage_module.init(m_configJson);
qDebug() << "StorageBackend::initStorage: init result =" << result.success;
qDebug() << "StorageBackend::initStorage: init";
if (!result.success) {
if (!result) {
setStatus(Destroyed);
debug(result.getError());
return result;
debug("Failed to init storage");
return {false, "", "Filed to init storage"};
}
setStatus(Stopped);
@ -101,10 +101,26 @@ LogosResult StorageBackend::init(const QString& configJson = "{}") {
if (!success) {
QString message = data[1].toString();
debug("Failure during upload progress: " + message);
m_uploadStatus = "Error: " + message;
emit uploadStatusChanged();
} else {
QString sessionId = data[1].toString();
int len = data[2].toInt();
// debug("Uploaded " + QString::number(len) + " bytes for session " + sessionId);
qint64 len = data[2].toLongLong();
m_uploadedBytes += len;
// Calcule le pourcentage
if (m_uploadTotalBytes > 0) {
m_uploadProgress = (m_uploadedBytes * 100) / m_uploadTotalBytes;
}
m_uploadStatus = QString("Uploading: %1 / %2 bytes (%3%)")
.arg(m_uploadedBytes)
.arg(m_uploadTotalBytes)
.arg(m_uploadProgress);
emit uploadProgressChanged();
emit uploadStatusChanged();
}
})) {
qWarning() << "StorageWidget: failed to subscribe to storageUploadProgress events";
@ -116,11 +132,21 @@ LogosResult StorageBackend::init(const QString& configJson = "{}") {
if (!success) {
QString message = data[1].toString();
debug("Failed to upload: " + message);
m_uploadProgress = 0;
m_uploadStatus = "Upload failed";
emit uploadProgressChanged();
emit uploadStatusChanged();
} else {
QString sessionId = data[1].toString();
m_cid = data[2].toString();
emit cidChanged();
debug("Upload completed for session " + sessionId + " with CID " + m_cid);
// Complète la progress bar
m_uploadProgress = 100;
m_uploadStatus = "Upload completed!";
emit uploadProgressChanged();
emit uploadStatusChanged();
}
})) {
qWarning() << "StorageWidget: failed to subscribe to storageUploadProgress events";
@ -162,7 +188,7 @@ LogosResult StorageBackend::init(const QString& configJson = "{}") {
debug("config.json content is: " + m_configJson);
return result;
return {true, ""};
}
void StorageBackend::setStatus(StorageStatus newStatus) {
@ -181,12 +207,12 @@ LogosResult StorageBackend::start(const QString& newConfigJson) {
if (m_status != Stopped) {
debug("The Storage Module is not initialised properly.");
return {false, "The Storage Module is not initialised properly."};
return {false, "", "The Storage Module is not initialised properly."};
}
if (m_status == Running) {
debug("The Storage Module is already started.");
return {false, "The Storage Module is already started."};
return {false, "", "The Storage Module is already started."};
}
setStatus(Starting);
@ -194,15 +220,15 @@ LogosResult StorageBackend::start(const QString& newConfigJson) {
auto result = m_logos->storage_module.start();
if (!result.success) {
if (!result) {
setStatus(Stopped);
debug(result.getError());
return result;
debug("Failed to start storage");
return {false, "", "Failed to start storage"};
}
qDebug() << "StorageBackend: start command sent, waiting for events.";
return result;
return {true, ""};
}
void StorageBackend::stop() {
@ -343,6 +369,16 @@ void StorageBackend::tryUploadFile(const QUrl& url) {
return;
}
// Reset and initialize progress tracking
m_uploadProgress = 0;
m_uploadedBytes = 0;
m_uploadTotalBytes = QFileInfo(url.toLocalFile()).size();
m_uploadStatus = "Starting upload...";
emit uploadProgressChanged();
emit uploadStatusChanged();
debug(QString("Starting upload of file: %1 bytes").arg(m_uploadTotalBytes));
// QString filename = url.toLocalFile();
// // QString filename = "/home/arnaud/Work/logos/logos-storage-ui/README.md";
@ -656,6 +692,10 @@ QString StorageBackend::cid() const { return m_cid; }
QString StorageBackend::configJson() const { return m_configJson; }
int StorageBackend::uploadProgress() const { return m_uploadProgress; }
QString StorageBackend::uploadStatus() const { return m_uploadStatus; }
void StorageBackend::reloadIfChanged(const QString& configJson) {
if (configJson == m_configJson) {
return;
@ -690,15 +730,15 @@ void StorageBackend::reloadIfChanged(const QString& configJson) {
}
}
LogosResult result = m_logos->storage_module.init(configJson);
bool result = m_logos->storage_module.init(configJson);
if (!result.success) {
debug("Failed to init context with new config, will rollback, error=" + result.getError());
if (!result) {
debug("Failed to init context with new config, will rollback.");
LogosResult result = m_logos->storage_module.init(m_configJson);
bool result = m_logos->storage_module.init(m_configJson);
if (!result.success) {
debug("Failed to init context with old config, that's a serious issue, error=" + result.getError());
if (!result) {
debug("Failed to init context with old config, that's a serious issue.");
} else {
debug("Old config restored");
setStatus(StorageStatus::Stopped);

10
src/StorageBackend.h
View File

@ -17,6 +17,8 @@ class StorageBackend : public QObject {
Q_PROPERTY(StorageStatus status READ status NOTIFY statusChanged)
Q_PROPERTY(QString cid READ cid NOTIFY cidChanged)
Q_PROPERTY(QString configJson READ configJson NOTIFY configJsonChanged)
Q_PROPERTY(int uploadProgress READ uploadProgress NOTIFY uploadProgressChanged)
Q_PROPERTY(QString uploadStatus READ uploadStatus NOTIFY uploadStatusChanged)
public:
enum StorageStatus { Stopped = 0, Starting, Running, Stopping, Destroyed };
@ -26,6 +28,8 @@ class StorageBackend : public QObject {
QString debugLogs() const;
StorageStatus status() const;
QString configJson() const;
int uploadProgress() const;
QString uploadStatus() const;
explicit StorageBackend(LogosAPI* logosAPI = nullptr, QObject* parent = nullptr);
~StorageBackend();
@ -59,6 +63,8 @@ class StorageBackend : public QObject {
void stopped();
void cidChanged();
void configJsonChanged();
void uploadProgressChanged();
void uploadStatusChanged();
private slots:
@ -74,4 +80,8 @@ class StorageBackend : public QObject {
QString m_debugLogs;
QString m_cid;
QString m_configJson;
int m_uploadProgress = 0;
QString m_uploadStatus = "";
qint64 m_uploadTotalBytes = 0;
qint64 m_uploadedBytes = 0;
};