smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly set the aria2 secret rpc.

This commit is contained in:
Matthieu Gautier 2018-10-16 17:29:41 +02:00
parent 996829e4d7
commit 18fc5cb4df
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aria2.cpp
View File

@ -34,6 +34,7 @@ Aria2::Aria2():
callCmd.push_back("aria2c"); callCmd.push_back("aria2c");
callCmd.push_back("--enable-rpc"); callCmd.push_back("--enable-rpc");
callCmd.push_back(rpc_secret.c_str());
callCmd.push_back(rpc_port.c_str()); callCmd.push_back(rpc_port.c_str());
callCmd.push_back(download_dir.c_str()); callCmd.push_back(download_dir.c_str());
// callCmd.push_back(log_dir.c_str()); // callCmd.push_back(log_dir.c_str());
@ -99,8 +100,7 @@ std::string Aria2::doRequest(const MethodCall& methodCall)
std::string Aria2::addUri(const std::vector<std::string>& uris) std::string Aria2::addUri(const std::vector<std::string>& uris)
{ {
MethodCall methodCall("aria2.addUri"); MethodCall methodCall("aria2.addUri", m_secret);
methodCall.getParams().addParam().getValue().set(m_secret);
auto uriParams = methodCall.getParams().addParam().getValue().getArray(); auto uriParams = methodCall.getParams().addParam().getValue().getArray();
for (auto& uri : uris) { for (auto& uri : uris) {
uriParams.addValue().set(uri); uriParams.addValue().set(uri);
@ -117,8 +117,7 @@ std::string Aria2::addUri(const std::vector<std::string>& uris)
std::string Aria2::tellStatus(const std::string& gid, const std::vector<std::string>& statusKey) std::string Aria2::tellStatus(const std::string& gid, const std::vector<std::string>& statusKey)
{ {
MethodCall methodCall("aria2.tellStatus"); MethodCall methodCall("aria2.tellStatus", m_secret);
methodCall.getParams().addParam().getValue().set(m_secret);
methodCall.getParams().addParam().getValue().set(gid); methodCall.getParams().addParam().getValue().set(gid);
if (!statusKey.empty()) { if (!statusKey.empty()) {
auto statusArray = methodCall.getParams().addParam().getValue().getArray(); auto statusArray = methodCall.getParams().addParam().getValue().getArray();

5
src/xmlrpc.h
View File

@ -202,10 +202,13 @@ class MethodCall {
pugi::xml_document m_doc; pugi::xml_document m_doc;
public: public:
MethodCall(const std::string& methodName) { MethodCall(const std::string& methodName, const std::string& secret) {
auto mCall = m_doc.append_child("methodCall"); auto mCall = m_doc.append_child("methodCall");
mCall.append_child("methodName").text().set(methodName.c_str()); mCall.append_child("methodName").text().set(methodName.c_str());
mCall.append_child("params"); mCall.append_child("params");
if (!secret.empty()) {
getParams().addParam().getValue().set(secret);
}
} }
Params getParams() const { Params getParams() const {