Syping/luaengineapp
1
0
Fork 0
mirror of https://gitlab.com/Syping/luaengineapp.git synced 2024-12-22 20:05:30 +01:00
Code Issues Projects Releases Wiki Activity

fix reading

Browse source
This commit is contained in:
Syping 2020-07-04 19:36:03 +02:00
parent 536ca5e539
commit 0fd63c62e3
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/luaengineio/luaengine/LuaEngineIO.cpp
View file

@ -100,7 +100,7 @@ int LuaEngineIO::eIORead(lua_State *L_p)
if (pointer != NULL) { if (pointer != NULL) {
if (((QObject*)pointer)->inherits("QIODevice")) { if (((QObject*)pointer)->inherits("QIODevice")) {
const QByteArray readData = ((QIODevice*)pointer)->read(getVariant(L_p, 2).toLongLong()); const QByteArray readData = ((QIODevice*)pointer)->read(getVariant(L_p, 2).toLongLong());
pushVariant(L_p, readData); pushVariant(L_p, QString::fromUtf8(readData));
return 1; return 1;
} }
} }
@ -115,7 +115,7 @@ int LuaEngineIO::eIOReadAll(lua_State *L_p)
if (pointer != NULL) { if (pointer != NULL) {
if (((QObject*)pointer)->inherits("QIODevice")) { if (((QObject*)pointer)->inherits("QIODevice")) {
const QByteArray readData = ((QIODevice*)pointer)->readAll(); const QByteArray readData = ((QIODevice*)pointer)->readAll();
pushVariant(L_p, readData); pushVariant(L_p, QString::fromUtf8(readData));
return 1; return 1;
} }
} }
@ -130,7 +130,7 @@ int LuaEngineIO::eIOReadLine(lua_State *L_p)
if (pointer != NULL) { if (pointer != NULL) {
if (((QObject*)pointer)->inherits("QIODevice")) { if (((QObject*)pointer)->inherits("QIODevice")) {
const QByteArray readData = ((QIODevice*)pointer)->readLine(); const QByteArray readData = ((QIODevice*)pointer)->readLine();
pushVariant(L_p, readData); pushVariant(L_p, QString::fromUtf8(readData));
return 1; return 1;
} }
} }

31
tests/network/network.lua Normal file
View file

@ -0,0 +1,31 @@
local globalLabel
function main()
-- Window
mainWindow = createMainWindow("LE TCP Test")
local mainLayout = createLayout(VerticalLayout, mainWindow)
local socket = createTcpSocket()
connect(socket, "connected()", "socketConnected")
connect(socket, "readyRead()", "socketReadyRead")
socketConnect(socket, "syping.de:80")
globalLabel = createLabel("<b>Connecting...</b>", mainLayout)
-- Show Window
setWidgetSize(mainWindow, 650, 450)
showWidget(mainWindow, ShowDefault)
return GuiExecuted
end
function socketConnected(socket)
setObjectText(globalLabel, "<b>Connected!</b>")
eIOWrite(socket, "GET /luaenginetest.html HTTP/1.1\r\nHost: www.syping.de\r\nUser-Agent: LuaEngine\r\nConnection: close\r\n\r\n")
socketFlush(socket)
end
function socketReadyRead(socket)
setObjectText(globalLabel, "<b>Reading...</b>")
local readData = eIOReadAll(socket)
setObjectText(globalLabel, "<!DOCTYPE html>" .. readData)
end