diff --git a/app/rdn_application.cpp b/app/ic_application.cpp similarity index 75% rename from app/rdn_application.cpp rename to app/ic_application.cpp index 95aa232..1c4688b 100644 --- a/app/rdn_application.cpp +++ b/app/ic_application.cpp @@ -1,4 +1,4 @@ -#include "rdn_application.h" +#include "ic_application.h" #include #include @@ -13,7 +13,7 @@ #include "core/request.h" #include "core/utils.h" -void RDNApplication::index(Object *instance, Request *request) { +void ICApplication::index(Object *instance, Request *request) { if (FileCache::get_singleton()->wwwroot_has_file("/index.html")) { std::string fp = FileCache::get_singleton()->wwwroot + "/index.html"; @@ -25,7 +25,7 @@ void RDNApplication::index(Object *instance, Request *request) { request->send_error(404); } -void RDNApplication::get_sensor_data(Object *instance, Request *request) { +void ICApplication::get_sensor_data(Object *instance, Request *request) { std::string sql = "SELECT * FROM sensor_data;"; QueryResult *res = DatabaseManager::get_singleton()->ddb->query(sql); @@ -58,17 +58,17 @@ void RDNApplication::get_sensor_data(Object *instance, Request *request) { request->send(); } -void RDNApplication::app_docs_page(Object *instance, Request *request) { +void ICApplication::app_docs_page(Object *instance, Request *request) { request->response->setBody(app_docs); request->send(); } -void RDNApplication::engine_docs_page(Object *instance, Request *request) { +void ICApplication::engine_docs_page(Object *instance, Request *request) { request->response->setBody(engine_docs); request->send(); } -void RDNApplication::setup_routes() { +void ICApplication::setup_routes() { Application::setup_routes(); index_func = HandlerInstance(index); @@ -78,13 +78,13 @@ void RDNApplication::setup_routes() { main_route_map["engine_docs"] = HandlerInstance(engine_docs_page); } -void RDNApplication::setup_middleware() { +void ICApplication::setup_middleware() { Application::setup_middleware(); - //middlewares.push_back(RDNApplication::session_middleware_func); + //middlewares.push_back(ICApplication::session_middleware_func); } -void RDNApplication::migrate() { +void ICApplication::migrate() { std::string sql = "CREATE TABLE sensor_data(" "id INTEGER PRIMARY KEY AUTOINCREMENT," "client_id TEXT NOT NULL," @@ -93,7 +93,7 @@ void RDNApplication::migrate() { DatabaseManager::get_singleton()->ddb->query_run(sql); } -void RDNApplication::mqtt_sensor_callback(const std::string &client_id, const std::vector &data) { +void ICApplication::mqtt_sensor_callback(const std::string &client_id, const std::vector &data) { if (client_id != "1") { return; } @@ -117,11 +117,11 @@ void RDNApplication::mqtt_sensor_callback(const std::string &client_id, const st DatabaseManager::get_singleton()->ddb->query_run(sql); } -void RDNApplication::load_md(const std::string &file_name, std::string *str) { +void ICApplication::load_md(const std::string &file_name, std::string *str) { FILE *f = fopen(file_name.c_str(), "r"); if (!f) { - printf("RDNApplication::load_md: Error opening file!\n"); + printf("ICApplication::load_md: Error opening file!\n"); return; } @@ -137,15 +137,15 @@ void RDNApplication::load_md(const std::string &file_name, std::string *str) { Utils::markdown_to_html(str); } -RDNApplication::RDNApplication() : +ICApplication::ICApplication() : Application() { load_md("./engine/Readme.md", &engine_docs); load_md("./Readme.md", &app_docs); } -RDNApplication::~RDNApplication() { +ICApplication::~ICApplication() { } -std::string RDNApplication::engine_docs; -std::string RDNApplication::app_docs; \ No newline at end of file +std::string ICApplication::engine_docs; +std::string ICApplication::app_docs; \ No newline at end of file diff --git a/app/rdn_application.h b/app/ic_application.h similarity index 85% rename from app/rdn_application.h rename to app/ic_application.h index e4db6e6..ddc8d0f 100644 --- a/app/rdn_application.h +++ b/app/ic_application.h @@ -1,5 +1,5 @@ -#ifndef RDN_APPLICATION_H -#define RDN_APPLICATION_H +#ifndef IC_APPLICATION_H +#define IC_APPLICATION_H #include @@ -10,7 +10,7 @@ #include "modules/list_page/list_page.h" #include "modules/paged_article/paged_article.h" -class RDNApplication : public Application { +class ICApplication : public Application { public: static void index(Object *instance, Request *request); static void get_sensor_data(Object *instance, Request *request); @@ -27,8 +27,8 @@ public: void load_md(const std::string &file_name, std::string *str); - RDNApplication(); - ~RDNApplication(); + ICApplication(); + ~ICApplication(); static std::string engine_docs; static std::string app_docs; diff --git a/main.cpp b/main.cpp index 78f7ebf..42d7a62 100644 --- a/main.cpp +++ b/main.cpp @@ -6,7 +6,7 @@ #include "core/file_cache.h" #include "core/http_server.h" -#include "app/rdn_application.h" +#include "app/ic_application.h" #include "core/database_manager.h" @@ -16,7 +16,7 @@ #include "modules/mqtt_server/mqtt_server.h" -#define MAIN_CLASS RDNApplication +#define MAIN_CLASS ICApplication void create_databases() { @@ -86,7 +86,7 @@ int main(int argc, char **argv) { MQTTServer *mqtt_server = new MQTTServer(); mqtt_server->initialize(); - mqtt_server->add_local_session("a/b", [](const std::string &client_id, const std::vector &data, void* obj){ reinterpret_cast(obj)->mqtt_sensor_callback(client_id, data); }, app); + mqtt_server->add_local_session("a/b", [](const std::string &client_id, const std::vector &data, void* obj){ reinterpret_cast(obj)->mqtt_sensor_callback(client_id, data); }, app); if (!migrate) { printf("Initialized!\n");