From ce26cad7fc3b04731debc5463e4e5a70e9f3193b Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Thu, 8 Jun 2017 16:20:11 +0900
Subject: [PATCH] Add arguments for provider key and content id
---
app/src/handlers/itemhandler.cpp | 4 ++--
app/src/handlers/itemhandler.h | 2 +-
app/src/websockets/websocketserver.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/src/handlers/itemhandler.cpp b/app/src/handlers/itemhandler.cpp
index d8c731a..d7e46bc 100644
--- a/app/src/handlers/itemhandler.cpp
+++ b/app/src/handlers/itemhandler.cpp
@@ -70,7 +70,7 @@ void ItemHandler::getItem(const QString &command, const QString &url, const QStr
emit downloadStarted(result);
}
-void ItemHandler::getItemByOcsUrl(const QString &ocsUrl)
+void ItemHandler::getItemByOcsUrl(const QString &ocsUrl, const QString &providerKey, const QString &contentId)
{
QUrl ocsUrlObj(ocsUrl);
QUrlQuery query(ocsUrlObj);
@@ -111,7 +111,7 @@ void ItemHandler::getItemByOcsUrl(const QString &ocsUrl)
&& QUrl(url).isValid()
&& configHandler_->getAppConfigInstallTypes().contains(type)
&& !filename.isEmpty()) {
- getItem(command, url, type, filename);
+ getItem(command, url, type, filename, providerKey, contentId);
}
else {
QJsonObject result;
diff --git a/app/src/handlers/itemhandler.h b/app/src/handlers/itemhandler.h
index a780a7b..43d5068 100644
--- a/app/src/handlers/itemhandler.h
+++ b/app/src/handlers/itemhandler.h
@@ -33,7 +33,7 @@ public slots:
void getItem(const QString &command, const QString &url, const QString &installType, const QString &filename = "",
const QString &providerKey = "", const QString &contentId = "");
- void getItemByOcsUrl(const QString &ocsUrl);
+ void getItemByOcsUrl(const QString &ocsUrl, const QString &providerKey = "", const QString &contentId = "");
void uninstall(const QString &itemKey);
private slots:
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index 14e6dc3..8eb69e9 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -315,7 +315,7 @@ void WebSocketServer::receiveMessage(const QString &id, const QString &func, con
data.at(4).toString(), data.at(5).toString());
}
else if (func == "ItemHandler::getItemByOcsUrl") {
- itemHandler_->getItemByOcsUrl(data.at(0).toString());
+ itemHandler_->getItemByOcsUrl(data.at(0).toString(), data.at(1).toString(), data.at(2).toString());
}
else if (func == "ItemHandler::uninstall") {
itemHandler_->uninstall(data.at(0).toString());
--
GitLab