feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Lua: Change Process to directly use Async module

Browse Source 
Change-Id: Ie91a308d55b06f35b2f2114a46b347d83e779db2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-05-02 14:33:58 +02:00
parent bd99669503
commit a8d6dde8e3
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/lua/bindings/qtcprocess.cpp
View File

@@ -12,38 +12,30 @@ namespace Lua::Internal {
void addProcessModule()
{
LuaEngine::registerProvider("__process", [](sol::state_view lua) -> sol::object {
sol::table process = lua.create_table();
LuaEngine::registerProvider(
"Process", [](sol::state_view lua) -> sol::object {
sol::table async = lua.script("return require('async')", "_process_").get<sol::table>();
sol::function wrap = async["wrap"];
process["runInTerminal_cb"] = [](const QString &cmdline, const sol::function &cb) {
Process *p = new Process;
p->setTerminalMode(TerminalMode::Run);
p->setCommand(CommandLine::fromUserInput((cmdline)));
p->setEnvironment(Environment::systemEnvironment());
sol::table process = lua.create_table();
QObject::connect(p, &Process::done, [p, cb]() { cb(p->exitCode()); });
process["runInTerminal_cb"] = [](const QString &cmdline, const sol::function &cb) {
Process *p = new Process;
p->setTerminalMode(TerminalMode::Run);
p->setCommand(CommandLine::fromUserInput((cmdline)));
p->setEnvironment(Environment::systemEnvironment());
p->start();
};
QObject::connect(p, &Process::done, &LuaEngine::instance(), [p, cb]() {
cb(p->exitCode());
});
return process;
});
p->start();
};
LuaEngine::registerProvider("Process", [](sol::state_view lua) -> sol::object {
return lua
.script(
R"(
local p = require("__process")
local a = require("async")
process["runInTerminal"] = wrap(process["runInTerminal_cb"]);
return {
runInTerminal_cb = p.runInTerminal_cb,
runInTerminal = a.wrap(p.runInTerminal_cb)
}
)",
"_process_")
.get<sol::table>();
});
return process;
});
}
} // namespace Lua::Internal