Skip to content
Snippets Groups Projects
Commit ce26cad7 authored by akiraohgaki's avatar akiraohgaki
Browse files

Add arguments for provider key and content id

parent 678eae72
No related branches found
No related tags found
No related merge requests found
...@@ -70,7 +70,7 @@ void ItemHandler::getItem(const QString &command, const QString &url, const QStr ...@@ -70,7 +70,7 @@ void ItemHandler::getItem(const QString &command, const QString &url, const QStr
emit downloadStarted(result); emit downloadStarted(result);
} }
void ItemHandler::getItemByOcsUrl(const QString &ocsUrl) void ItemHandler::getItemByOcsUrl(const QString &ocsUrl, const QString &providerKey, const QString &contentId)
{ {
QUrl ocsUrlObj(ocsUrl); QUrl ocsUrlObj(ocsUrl);
QUrlQuery query(ocsUrlObj); QUrlQuery query(ocsUrlObj);
...@@ -111,7 +111,7 @@ void ItemHandler::getItemByOcsUrl(const QString &ocsUrl) ...@@ -111,7 +111,7 @@ void ItemHandler::getItemByOcsUrl(const QString &ocsUrl)
&& QUrl(url).isValid() && QUrl(url).isValid()
&& configHandler_->getAppConfigInstallTypes().contains(type) && configHandler_->getAppConfigInstallTypes().contains(type)
&& !filename.isEmpty()) { && !filename.isEmpty()) {
getItem(command, url, type, filename); getItem(command, url, type, filename, providerKey, contentId);
} }
else { else {
QJsonObject result; QJsonObject result;
......
...@@ -33,7 +33,7 @@ public slots: ...@@ -33,7 +33,7 @@ public slots:
void getItem(const QString &command, const QString &url, const QString &installType, const QString &filename = "", void getItem(const QString &command, const QString &url, const QString &installType, const QString &filename = "",
const QString &providerKey = "", const QString &contentId = ""); 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); void uninstall(const QString &itemKey);
private slots: private slots:
......
...@@ -315,7 +315,7 @@ void WebSocketServer::receiveMessage(const QString &id, const QString &func, con ...@@ -315,7 +315,7 @@ void WebSocketServer::receiveMessage(const QString &id, const QString &func, con
data.at(4).toString(), data.at(5).toString()); data.at(4).toString(), data.at(5).toString());
} }
else if (func == "ItemHandler::getItemByOcsUrl") { 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") { else if (func == "ItemHandler::uninstall") {
itemHandler_->uninstall(data.at(0).toString()); itemHandler_->uninstall(data.at(0).toString());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment