From 20a2c78733cb69fba9dfa9b7addaff135008c6d3 Mon Sep 17 00:00:00 2001 From: luddens Date: Fri, 1 Nov 2019 11:04:23 +0200 Subject: [PATCH] add get aria2 launch cmd method --- include/downloader.h | 1 + src/aria2.cpp | 3 +++ src/aria2.h | 2 ++ src/downloader.cpp | 5 +++++ 4 files changed, 11 insertions(+) diff --git a/include/downloader.h b/include/downloader.h index b60e48136..35d44f62c 100644 --- a/include/downloader.h +++ b/include/downloader.h @@ -97,6 +97,7 @@ class Downloader size_t getNbDownload() { return m_knownDownloads.size(); } std::vector getDownloadIds(); + const std::string &getAria2LaunchCmd(); private: std::map> m_knownDownloads; diff --git a/src/aria2.cpp b/src/aria2.cpp index 420797aa8..07dfbdb03 100644 --- a/src/aria2.cpp +++ b/src/aria2.cpp @@ -78,6 +78,9 @@ Aria2::Aria2(): callCmd.push_back("--max-concurrent-downloads=42"); callCmd.push_back("--rpc-max-request-size=6M"); callCmd.push_back("--file-allocation=none"); + for (auto &cmd : callCmd) { + m_launchCmd.append(cmd).append(" "); + } mp_aria = Subprocess::run(callCmd); mp_curl = curl_easy_init(); char errbuf[CURL_ERROR_SIZE]; diff --git a/src/aria2.h b/src/aria2.h index 898904a5d..6d7262479 100644 --- a/src/aria2.h +++ b/src/aria2.h @@ -26,6 +26,7 @@ class Aria2 std::string m_downloadDir; CURL* mp_curl; pthread_mutex_t m_lock; + std::string m_launchCmd; std::string doRequest(const MethodCall& methodCall); @@ -43,6 +44,7 @@ class Aria2 void pause(const std::string& gid); void unpause(const std::string& gid); void remove(const std::string& gid); + const std::string &getLaunchCmd() { return m_launchCmd; }; }; }; //end namespace kiwix diff --git a/src/downloader.cpp b/src/downloader.cpp index 393810d2a..580445343 100644 --- a/src/downloader.cpp +++ b/src/downloader.cpp @@ -163,6 +163,11 @@ std::vector Downloader::getDownloadIds() { return ret; } +const std::string &Downloader::getAria2LaunchCmd() +{ + return mp_aria->getLaunchCmd(); +} + Download* Downloader::startDownload(const std::string& uri) { for (auto& p: m_knownDownloads) {