From 2c21ceb01efef207bae62b3cd3535b34ff394562 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 15 Feb 2016 11:44:38 +0300 Subject: server: curl_downloader: correct use of default download_path --- server/modules/downloaders/curl/main.cpp | 2 +- server/modules/downloaders/curl/src/curl_download.cpp | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/modules/downloaders/curl/main.cpp b/server/modules/downloaders/curl/main.cpp index 46b6ee7..41578d2 100644 --- a/server/modules/downloaders/curl/main.cpp +++ b/server/modules/downloaders/curl/main.cpp @@ -153,7 +153,7 @@ int downloader::add_download(std::map params) if(p1 != std::string::npos) d->name = params[0].substr(p1+1); else - d->name = params[0]; + d->name = params[0]; } int id = 0; if(!downloads.empty()) diff --git a/server/modules/downloaders/curl/src/curl_download.cpp b/server/modules/downloaders/curl/src/curl_download.cpp index 17629e5..57d4c0a 100644 --- a/server/modules/downloaders/curl/src/curl_download.cpp +++ b/server/modules/downloaders/curl/src/curl_download.cpp @@ -79,7 +79,17 @@ curl_download::curl_download(std::map params, core_api *a, mod if(!params[1].empty()) download_path = params[1]; else - download_path = api->get_core_settings()["download_dir"]; + { + download_path = api->get_core_settings()["default_download_directory"]; + //extract name from url + auto p1 = params[0].rfind("/"); + if(p1 != std::string::npos) + { + download_path += "/"; + download_path += params[0].substr(p1+1); + } + + } //curl_easy_setopt(h, CURLOPT_DEFAULT_PROTOCOL, "http"); //require curl >= 7.45 -- cgit v1.2.3