protocol:

	more download related structures (synced with api)
server:
	api:
		get_download instead of get_download_info
	core:
		added settings values to SERVER_CORE_INFO_REPLY
	curl_module:
		sync with api changes

2 files changed, 2 insertions, 2 deletions

diff --git a/server/modules/downloaders/curl/main.cpp b/server/modules/downloaders/curl/main.cpp
index 23c4591..b3a2f36 100644
--- a/server/modules/downloaders/curl/main.cpp
+++ b/server/modules/downloaders/curl/main.cpp
@@ -159,7 +159,7 @@ std::list<download_s> downloader::get_downloads(std::map<int, std::string> param
 	return l;
 }
 
-download_s downloader::get_download_info(int download_id, std::map<int, std::string> params)
+download_s downloader::get_download(int download_id, std::map<int, std::string> params)
 {
 	download_s d = downloads[download_id];
 	//TODO: fill additional data fields
diff --git a/server/modules/downloaders/curl/main.h b/server/modules/downloaders/curl/main.h
index d97e72e..12d427a 100644
--- a/server/modules/downloaders/curl/main.h
+++ b/server/modules/downloaders/curl/main.h
@@ -47,7 +47,7 @@ public:
 		bool delete_download(int download_id, bool delete_data = false); //delete download by id received via add_download, if "delete_data" is set, also remove all downloaded data from storage, return true on success, false otherwise
 		bool execute_action_on_download(int download_id, int action_id); //execute module defined action on download, by id received via add_download
 		std::list<download_s> get_downloads(std::map<int, std::string> params = std::map<int, std::string>()); //this function must return list of downloads, additional options may be passed via params map
-		download_s get_download_info(int download_id, std::map<int, std::string> params = std::map<int, std::string>()); //same as above, except this one is for single download, not a complete list
+		download_s get_download(int download_id, std::map<int, std::string> params = std::map<int, std::string>()); //same as above, except this one is for single download, not a complete list
 private:
 		void on_modules_loaded();
 //		downloader_module_info info;