Add Qt version info to API

pull/250/head
Michael Zanetti 2020-01-21 20:11:05 +01:00
parent 6cdcd47f9b
commit f44b4906a5
3 changed files with 27 additions and 0 deletions

View File

@ -123,6 +123,8 @@ JsonRPCServerImplementation::JsonRPCServerImplementation(const QSslConfiguration
description = "Version of this nymea/JSONRPC interface.";
returns.insert("version", enumValueName(String));
returns.insert("protocol version", enumValueName(String));
returns.insert("qtVersion", enumValueName(String));
returns.insert("qtBuildVersion", enumValueName(String));
registerMethod("Version", description, params, returns);
params.clear(); returns.clear();
@ -278,6 +280,8 @@ JsonReply* JsonRPCServerImplementation::Version(const QVariantMap &params) const
QVariantMap data;
data.insert("version", NYMEA_VERSION_STRING);
data.insert("protocol version", JSON_PROTOCOL_VERSION);
data.insert("qtVersion", qVersion());
data.insert("qtBuildVersion", QT_VERSION_STR);
return createReply(data);
}

View File

@ -974,6 +974,8 @@
},
"returns": {
"protocol version": "String",
"qtBuildVersion": "String",
"qtVersion": "String",
"version": "String"
}
},

21
tests/scripts/version.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/bash
if [ -z $1 ]; then
echo "usage: $0 host [token]"
exit 1
fi
if [ -z $2 ]; then
cat <<EOD | nc $1 2222
{"id":0, "method":"JSONRPC.Hello"}
{"id":1, "method":"JSONRPC.Version"}
EOD
exit 0
fi
cat <<EOD | nc $1 2222
{"id":0, "method":"JSONRPC.Hello"}
{"id":1, "token": "$2", "method":"JSONRPC.Version"}
EOD