Syping/xmppbot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

LuaEngine: Support for Binary Content

Browse source
This commit is contained in:
Syping 2021-08-09 15:18:57 +02:00
parent 37a047012b
commit d0fb7eea96
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 3.7)
project(xmppbot VERSION 0.6 LANGUAGES CXX) project(xmppbot VERSION 0.6.1 LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)

2
src/xmppbot/main.cpp
View file

@ -39,7 +39,7 @@ int main(int argc, char *argv[])
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
app.setApplicationName(QLatin1String("xmppbot")); app.setApplicationName(QLatin1String("xmppbot"));
app.setApplicationVersion(QLatin1String("0.6")); app.setApplicationVersion(QLatin1String("0.6.1"));
QCommandLineParser commandLineParser; QCommandLineParser commandLineParser;
commandLineParser.addPositionalArgument(QLatin1String("config"), QCoreApplication::translate("xmppbot", "Configuration file.")); commandLineParser.addPositionalArgument(QLatin1String("config"), QCoreApplication::translate("xmppbot", "Configuration file."));

21
src/xmppbot/xmppbotlua.cpp
View file

@ -188,8 +188,13 @@ void XmppBotLua::pushVariant(lua_State *L_p, const QVariant &variant)
else if (variant.type() == QVariant::Double) { else if (variant.type() == QVariant::Double) {
lua_pushnumber(L_p, variant.toDouble()); lua_pushnumber(L_p, variant.toDouble());
} }
else if (variant.type() == QVariant::ByteArray) {
const QByteArray luaBArray = variant.toByteArray();
lua_pushlstring(L_p, luaBArray.data(), luaBArray.size());
}
else if (variant.type() == QVariant::String) { else if (variant.type() == QVariant::String) {
lua_pushstring(L_p, variant.toString().toUtf8().data()); const QByteArray luaBArray = variant.toString().toUtf8();
lua_pushlstring(L_p, luaBArray.data(), luaBArray.size());
} }
else if (variant.type() == QVariant::StringList) { else if (variant.type() == QVariant::StringList) {
const QStringList stringList = variant.toStringList(); const QStringList stringList = variant.toStringList();
@ -197,7 +202,8 @@ void XmppBotLua::pushVariant(lua_State *L_p, const QVariant &variant)
int currentId = 1; int currentId = 1;
for (const QString &string : stringList) { for (const QString &string : stringList) {
lua_pushinteger(L_p, currentId); lua_pushinteger(L_p, currentId);
lua_pushstring(L_p, string.toUtf8().data()); const QByteArray luaBArray = string.toUtf8();
lua_pushlstring(L_p, luaBArray.data(), luaBArray.size());
lua_settable(L_p, -3); lua_settable(L_p, -3);
currentId++; currentId++;
} }
@ -217,7 +223,8 @@ void XmppBotLua::pushVariant(lua_State *L_p, const QVariant &variant)
const QVariantMap variantMap = variant.toMap(); const QVariantMap variantMap = variant.toMap();
lua_createtable(L_p, 0, variantMap.count()); lua_createtable(L_p, 0, variantMap.count());
for (auto it = variantMap.constBegin(); it != variantMap.constEnd(); it++) { for (auto it = variantMap.constBegin(); it != variantMap.constEnd(); it++) {
lua_pushstring(L_p, it.key().toUtf8().data()); const QByteArray luaBArray = it.key().toUtf8();
lua_pushlstring(L_p, luaBArray.data(), luaBArray.size());
pushVariant(L_p, it.value()); pushVariant(L_p, it.value());
lua_settable(L_p, -3); lua_settable(L_p, -3);
} }
@ -259,7 +266,9 @@ QVariant XmppBotLua::getVariant(lua_State *L_p, int index)
return QVariant::fromValue(lua_tonumber(L_p, index)); return QVariant::fromValue(lua_tonumber(L_p, index));
} }
else if (lua_isstring(L_p, index)) { else if (lua_isstring(L_p, index)) {
return QVariant::fromValue(QString(lua_tostring(L_p, index))); size_t size;
const char* str = lua_tolstring(L_p, index, &size);
return QVariant::fromValue(QByteArray(str, size));
} }
else if (lua_istable(L_p, index)) { else if (lua_istable(L_p, index)) {
QVariantMap variantMap; QVariantMap variantMap;
@ -267,7 +276,9 @@ QVariant XmppBotLua::getVariant(lua_State *L_p, int index)
lua_pushnil(L_p); lua_pushnil(L_p);
while (lua_next(L_p, -2) != 0) { while (lua_next(L_p, -2) != 0) {
lua_pushvalue(L_p, -2); lua_pushvalue(L_p, -2);
const QString key = QString(lua_tostring(L_p, -1)); size_t size;
const char* str = lua_tolstring(L_p, -1, &size);
const QString key = QString::fromUtf8(str, size);
const QVariant value = getVariant(L_p, -2); const QVariant value = getVariant(L_p, -2);
variantMap.insert(key, value); variantMap.insert(key, value);
lua_pop(L_p, 2); lua_pop(L_p, 2);