From 12503d7743d4675460f72bab02f7e0eaafb611b8 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sat, 25 Nov 2017 20:05:53 +0900
Subject: [PATCH] WebSocket
---
app/src/websockets/websocketserver.cpp | 17 ++++++++---------
app/src/websockets/websocketserver.h | 6 +++---
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index 22f7c95..d6931ab 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -211,25 +211,24 @@ void WebSocketServer::updateCheckAllFinished()
sendMessage("", "ItemHandler::checkAllFinished", data);
}
-void WebSocketServer::updateUpdateStarted(QString path)
+void WebSocketServer::updateUpdateStarted(QString fileKey)
{
QJsonArray data;
- data.append(path);
+ data.append(fileKey);
sendMessage("", "UpdateHandler::updateStarted", data);
}
-void WebSocketServer::updateUpdateFinished(QString path, QString newPath)
+void WebSocketServer::updateUpdateFinished(QString fileKey)
{
QJsonArray data;
- data.append(path);
- data.append(newPath);
+ data.append(fileKey);
sendMessage("", "UpdateHandler::updateFinished", data);
}
-void WebSocketServer::updateUpdateProgress(QString path, int progress)
+void WebSocketServer::updateUpdateProgress(QString fileKey, int progress)
{
QJsonArray data;
- data.append(path);
+ data.append(fileKey);
data.append(progress);
sendMessage("", "UpdateHandler::updateProgress", data);
}
@@ -358,10 +357,10 @@ void WebSocketServer::receiveMessage(const QString &id, const QString &func, con
}
// UpdateHandler
else if (func == "UpdateHandler::checkAll") {
- resultData.append(updateHandler_->checkAll());
+ updateHandler_->checkAll();
}
else if (func == "UpdateHandler::update") {
- resultData.append(updateHandler_->update(data.at(0).toString()));
+ updateHandler_->update(data.at(0).toString());
}
// DesktopThemeHandler
else if (func == "DesktopThemeHandler::desktopEnvironment") {
diff --git a/app/src/websockets/websocketserver.h b/app/src/websockets/websocketserver.h
index 51ccffe..e4b9ba6 100644
--- a/app/src/websockets/websocketserver.h
+++ b/app/src/websockets/websocketserver.h
@@ -53,9 +53,9 @@ private slots:
void updateCheckAllStarted();
void updateCheckAllFinished();
- void updateUpdateStarted(QString path);
- void updateUpdateFinished(QString path, QString newPath);
- void updateUpdateProgress(QString path, int progress);
+ void updateUpdateStarted(QString fileKey);
+ void updateUpdateFinished(QString fileKey);
+ void updateUpdateProgress(QString fileKey, int progress);
private:
void receiveMessage(const QString &id, const QString &func, const QJsonArray &data);
--
GitLab