Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-02 05:07:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

DaemonManager: implement async sendCommand

Browse Source
This commit is contained in:
xiphon
2019-09-27 10:56:42 +00:00
parent d3b81cb6f8
commit 32257c8fab
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/daemon/DaemonManager.cpp
View File

@@ -150,7 +150,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
bool DaemonManager::stop(NetworkType::Type nettype)
{
QString message;
sendCommand("exit", nettype, message);
sendCommand({"exit"}, nettype, message);
qDebug() << message;
// Start stop watcher - Will kill if not shutting down
@@ -240,7 +240,7 @@ void DaemonManager::printError()
bool DaemonManager::running(NetworkType::Type nettype) const
{
QString status;
sendCommand("sync_info", nettype, status);
sendCommand({"sync_info"}, nettype, status);
qDebug() << status;
return status.contains("Height:");
}
@@ -257,17 +257,10 @@ void DaemonManager::runningAsync(NetworkType::Type nettype, const QJSValue& call
}, callback);
}
bool DaemonManager::sendCommand(const QString &cmd, NetworkType::Type nettype) const
{
QString message;
return sendCommand(cmd, nettype, message);
}
bool DaemonManager::sendCommand(const QString &cmd, NetworkType::Type nettype, QString &message) const
bool DaemonManager::sendCommand(const QStringList &cmd, NetworkType::Type nettype, QString &message) const
{
QProcess p;
QStringList external_cmd;
external_cmd << cmd;
QStringList external_cmd(cmd);
// Add network type flag if needed
if (nettype == NetworkType::TESTNET)
@@ -286,6 +279,14 @@ bool DaemonManager::sendCommand(const QString &cmd, NetworkType::Type nettype, Q
return started;
}
void DaemonManager::sendCommandAsync(const QStringList &cmd, NetworkType::Type nettype, const QJSValue& callback) const
{
m_scheduler.run([this, cmd, nettype] {
QString message;
return QJSValueList({sendCommand(cmd, nettype, message)});
}, callback);
}
void DaemonManager::exit()
{
qDebug("DaemonManager: exit()");