diff --git a/app/app.pri b/app/app.pri
index 21388a6a3eab19e9f25988883e0f9348f2d16a11..737e3eba34ea71dcc522e3e8a1f466a72023b313 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -9,7 +9,7 @@ HEADERS += \
$${PWD}/src/websockets/websocketserver.h \
$${PWD}/src/handlers/confighandler.h \
$${PWD}/src/handlers/systemhandler.h \
- $${PWD}/src/handlers/ocshandler.h \
+ $${PWD}/src/handlers/ocsapihandler.h \
$${PWD}/src/handlers/itemhandler.h
SOURCES += \
@@ -17,7 +17,7 @@ SOURCES += \
$${PWD}/src/websockets/websocketserver.cpp \
$${PWD}/src/handlers/confighandler.cpp \
$${PWD}/src/handlers/systemhandler.cpp \
- $${PWD}/src/handlers/ocshandler.cpp \
+ $${PWD}/src/handlers/ocsapihandler.cpp \
$${PWD}/src/handlers/itemhandler.cpp
RESOURCES += $${PWD}/configs/configs.qrc
diff --git a/app/src/handlers/ocshandler.cpp b/app/src/handlers/ocsapihandler.cpp
similarity index 92%
rename from app/src/handlers/ocshandler.cpp
rename to app/src/handlers/ocsapihandler.cpp
index d82a900705c51128149039ec1555ecaa65534825..5d1be986f702e1235f19a884aa7cbe00f47eef16 100644
--- a/app/src/handlers/ocshandler.cpp
+++ b/app/src/handlers/ocsapihandler.cpp
@@ -1,4 +1,4 @@
-#include "ocshandler.h"
+#include "ocsapihandler.h"
#include <QJsonValue>
@@ -6,11 +6,11 @@
#include "handlers/confighandler.h"
-OcsHandler::OcsHandler(ConfigHandler *configHandler, QObject *parent)
+OcsApiHandler::OcsApiHandler(ConfigHandler *configHandler, QObject *parent)
: QObject(parent), configHandler_(configHandler)
{}
-bool OcsHandler::addProviders(const QString &providerFileUrl)
+bool OcsApiHandler::addProviders(const QString &providerFileUrl)
{
QJsonArray providers = qtlib::OcsApi::getProviderFile(QUrl(providerFileUrl));
if (!providers.isEmpty()) {
@@ -29,7 +29,7 @@ bool OcsHandler::addProviders(const QString &providerFileUrl)
return false;
}
-bool OcsHandler::removeProvider(const QString &providerKey)
+bool OcsApiHandler::removeProvider(const QString &providerKey)
{
if (configHandler_->removeUsrConfigProvidersProvider(providerKey)) {
configHandler_->removeUsrConfigCategoriesProvider(providerKey);
@@ -38,7 +38,7 @@ bool OcsHandler::removeProvider(const QString &providerKey)
return false;
}
-bool OcsHandler::updateAllCategories(bool force)
+bool OcsApiHandler::updateAllCategories(bool force)
{
QJsonObject providers = configHandler_->getUsrConfigProviders();
if (!providers.isEmpty()) {
@@ -50,7 +50,7 @@ bool OcsHandler::updateAllCategories(bool force)
return false;
}
-bool OcsHandler::updateCategories(const QString &providerKey, bool force)
+bool OcsApiHandler::updateCategories(const QString &providerKey, bool force)
{
QJsonObject providers = configHandler_->getUsrConfigProviders();
@@ -133,7 +133,7 @@ bool OcsHandler::updateCategories(const QString &providerKey, bool force)
return configHandler_->setUsrConfigCategoriesProvider(providerKey, newProviderCategories);
}
-QJsonObject OcsHandler::getContents(const QString &providerKeys, const QString &categoryKeys,
+QJsonObject OcsApiHandler::getContents(const QString &providerKeys, const QString &categoryKeys,
const QString &xdgTypes, const QString &packageTypes,
const QString &search, const QString &sortmode, int pagesize, int page)
{
@@ -191,7 +191,7 @@ QJsonObject OcsHandler::getContents(const QString &providerKeys, const QString &
return responseSet;
}
-QJsonObject OcsHandler::getContent(const QString &providerKey, const QString &contentId)
+QJsonObject OcsApiHandler::getContent(const QString &providerKey, const QString &contentId)
{
QJsonObject response;
QJsonObject providers = configHandler_->getUsrConfigProviders();
diff --git a/app/src/handlers/ocshandler.h b/app/src/handlers/ocsapihandler.h
similarity index 87%
rename from app/src/handlers/ocshandler.h
rename to app/src/handlers/ocsapihandler.h
index 72b4853817297bab6a71309a1384fdebe2b1fbf3..4e4d3095e50f985c7c39f392eaccc85bdc719e5a 100644
--- a/app/src/handlers/ocshandler.h
+++ b/app/src/handlers/ocsapihandler.h
@@ -5,12 +5,12 @@
class ConfigHandler;
-class OcsHandler : public QObject
+class OcsApiHandler : public QObject
{
Q_OBJECT
public:
- explicit OcsHandler(ConfigHandler *configHandler, QObject *parent = 0);
+ explicit OcsApiHandler(ConfigHandler *configHandler, QObject *parent = 0);
public slots:
bool addProviders(const QString &providerFileUrl);
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index 793ac1f8952c43827cde1f67ef388aad838db4be..a5e7398f0aa00a3906f9e4d0f20f40868e1c399c 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -8,7 +8,7 @@
#include "handlers/confighandler.h"
#include "handlers/systemhandler.h"
-#include "handlers/ocshandler.h"
+#include "handlers/ocsapihandler.h"
#include "handlers/itemhandler.h"
WebSocketServer::WebSocketServer(ConfigHandler *configHandler, const QString &serverName, quint16 serverPort, QObject *parent)
@@ -20,7 +20,7 @@ WebSocketServer::WebSocketServer(ConfigHandler *configHandler, const QString &se
configHandler_->setParent(this);
systemHandler_ = new SystemHandler(this);
- ocsHandler_ = new OcsHandler(configHandler_, this);
+ ocsApiHandler_ = new OcsApiHandler(configHandler_, this);
itemHandler_ = new ItemHandler(configHandler_, this);
connect(itemHandler_, &ItemHandler::metadataSetChanged, this, &WebSocketServer::itemMetadataSetChanged);
connect(itemHandler_, &ItemHandler::downloadStarted, this, &WebSocketServer::itemDownloadStarted);
@@ -263,26 +263,26 @@ void WebSocketServer::receiveMessage(const QString &id, const QString &func, con
resultData.append(false);
#endif
}
- // OcsHandler
- else if (func == "OcsHandler::addProviders") {
- resultData.append(ocsHandler_->addProviders(data.at(0).toString()));
+ // OcsApiHandler
+ else if (func == "OcsApiHandler::addProviders") {
+ resultData.append(ocsApiHandler_->addProviders(data.at(0).toString()));
}
- else if (func == "OcsHandler::removeProvider") {
- resultData.append(ocsHandler_->removeProvider(data.at(0).toString()));
+ else if (func == "OcsApiHandler::removeProvider") {
+ resultData.append(ocsApiHandler_->removeProvider(data.at(0).toString()));
}
- else if (func == "OcsHandler::updateAllCategories") {
- resultData.append(ocsHandler_->updateAllCategories(data.at(0).toBool()));
+ else if (func == "OcsApiHandler::updateAllCategories") {
+ resultData.append(ocsApiHandler_->updateAllCategories(data.at(0).toBool()));
}
- else if (func == "OcsHandler::updateCategories") {
- resultData.append(ocsHandler_->updateCategories(data.at(0).toString(), data.at(1).toBool()));
+ else if (func == "OcsApiHandler::updateCategories") {
+ resultData.append(ocsApiHandler_->updateCategories(data.at(0).toString(), data.at(1).toBool()));
}
- else if (func == "OcsHandler::getContents") {
- resultData.append(ocsHandler_->getContents(data.at(0).toString(), data.at(1).toString(),
+ else if (func == "OcsApiHandler::getContents") {
+ resultData.append(ocsApiHandler_->getContents(data.at(0).toString(), data.at(1).toString(),
data.at(2).toString(), data.at(3).toString(),
data.at(4).toString(), data.at(5).toString(), data.at(6).toInt(), data.at(7).toInt()));
}
- else if (func == "OcsHandler::getContent") {
- resultData.append(ocsHandler_->getContent(data.at(0).toString(), data.at(1).toString()));
+ else if (func == "OcsApiHandler::getContent") {
+ resultData.append(ocsApiHandler_->getContent(data.at(0).toString(), data.at(1).toString()));
}
// ItemHandler
else if (func == "ItemHandler::metadataSet") {
diff --git a/app/src/websockets/websocketserver.h b/app/src/websockets/websocketserver.h
index 698bd5c2b1fdd2794d35bfe501ff864ff2494ba7..77e3837e1d1e1261c766299149ef5de9b1adfb07 100644
--- a/app/src/websockets/websocketserver.h
+++ b/app/src/websockets/websocketserver.h
@@ -10,7 +10,7 @@ class QWebSocket;
class ConfigHandler;
class SystemHandler;
-class OcsHandler;
+class OcsApiHandler;
class ItemHandler;
class WebSocketServer : public QObject
@@ -53,7 +53,7 @@ private:
ConfigHandler *configHandler_;
SystemHandler *systemHandler_;
- OcsHandler *ocsHandler_;
+ OcsApiHandler *ocsApiHandler_;
ItemHandler *itemHandler_;
QString serverName_;