From 6f3f670abe3d2d78a13cd3862e3a587dd4fe4e85 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 28 Aug 2015 21:21:02 +0300 Subject: protocol: typo fix added description to setting_info server: api: using structure with setting info instead of hust string for just value (a bit of necessary complication) renamed few structs to avoid collision with protobuf ones defined few module variables in api itself (a bit of simplification for module developer) modules: adapted to api changes --- server/modules/downloaders/curl/main.cpp | 8 ++++---- server/modules/downloaders/curl/main.h | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'server/modules/downloaders/curl') diff --git a/server/modules/downloaders/curl/main.cpp b/server/modules/downloaders/curl/main.cpp index 66f89b4..23c4591 100644 --- a/server/modules/downloaders/curl/main.cpp +++ b/server/modules/downloaders/curl/main.cpp @@ -57,21 +57,21 @@ void downloader::load(core_api *a) module_download_ui_element_info_s e; e.id = 0; e.name = "Url"; - e.type = MODULE_UI_ELEMENT_TYPE_e::UI_STR; + e.type = MODULE_UI_ELEMENT_TYPE_e::UI_STR_; info.download_creation_ui.push_back(e); e.id = 1; e.name = "Download path"; - e.type = MODULE_UI_ELEMENT_TYPE_e::UI_STR; + e.type = MODULE_UI_ELEMENT_TYPE_e::UI_STR_; info.download_creation_ui.push_back(e); info.on_modules_loaded = boost::bind(&downloader::on_modules_loaded, this); //optional definition of function which is called after all modules loaded } -const module_info &downloader::get_module_info() +const module_info_base &downloader::get_module_info() { return info; } -void downloader::set_module_settings(const std::map &settings) +void downloader::set_module_settings(const std::map &settings) { this->settings = settings; } diff --git a/server/modules/downloaders/curl/main.h b/server/modules/downloaders/curl/main.h index aff5cb3..d97e72e 100644 --- a/server/modules/downloaders/curl/main.h +++ b/server/modules/downloaders/curl/main.h @@ -37,8 +37,8 @@ public: //core module api downloader(); void load(core_api *a); - const module_info &get_module_info(); - void set_module_settings(const std::map &settings); //will called with settings stored in config + const module_info_base &get_module_info(); + void set_module_settings(const std::map &settings); //will called with settings stored in config ~downloader(); //downloader module api int add_download(std::map params); //add download, this function must return unique for current session and current downloader download id @@ -50,9 +50,7 @@ public: download_s get_download_info(int download_id, std::map params = std::map()); //same as above, except this one is for single download, not a complete list private: void on_modules_loaded(); - downloader_module_info info; - core_api *api = nullptr; - std::map settings; //settings name, val +// downloader_module_info info; std::map downloads; //map of id, download }; -- cgit v1.2.3