noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve chatterino.lua logs + remove . and .. from plugin search

Browse source
This commit is contained in:
Mm2PL 2023-02-07 21:39:37 +01:00
parent e9aa136bbe
commit 9b231dc3e9
No known key found for this signature in database
GPG key ID: 94AC9B80EFA15ED9
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/controllers/plugins/PluginController.cpp
View file

@ -60,8 +60,8 @@ void PluginController::actuallyInitialize()
return; return;
} }
auto dir = QDir(getPaths()->pluginsDirectory); auto dir = QDir(getPaths()->pluginsDirectory);
qCDebug(chatterinoLua) << "loading plugins from " << dir; qCDebug(chatterinoLua) << "Loading plugins in" << dir.path();
for (const auto &info : dir.entryInfoList()) for (const auto &info : dir.entryInfoList(QDir::NoDotAndDotDot))
{ {
if (info.isDir()) if (info.isDir())
{ {
@ -74,15 +74,15 @@ bool PluginController::tryLoadFromDir(const QDir &pluginDir)
{ {
// look for init.lua // look for init.lua
auto index = QFileInfo(pluginDir.filePath("init.lua")); auto index = QFileInfo(pluginDir.filePath("init.lua"));
qCDebug(chatterinoLua) << "looking for init.lua and info.json in" qCDebug(chatterinoLua) << "Looking for init.lua and info.json in"
<< pluginDir.path(); << pluginDir.path();
if (!index.exists()) if (!index.exists())
{ {
qCDebug(chatterinoLua) qCDebug(chatterinoLua)
<< "Missing init.lua in plugin directory" << pluginDir; << "Missing init.lua in plugin directory:" << pluginDir.path();
return false; return false;
} }
qCDebug(chatterinoLua) << "found init.lua, now looking for info.json!"; qCDebug(chatterinoLua) << "Found init.lua, now looking for info.json!";
auto infojson = QFileInfo(pluginDir.filePath("info.json")); auto infojson = QFileInfo(pluginDir.filePath("info.json"));
if (!infojson.exists()) if (!infojson.exists())
{ {
@ -201,7 +201,6 @@ void PluginController::openLibrariesFor(lua_State *L,
void PluginController::load(const QFileInfo &index, const QDir &pluginDir, void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
const PluginMeta &meta) const PluginMeta &meta)
{ {
qCDebug(chatterinoLua) << "Running lua file" << index;
lua_State *l = luaL_newstate(); lua_State *l = luaL_newstate();
PluginController::openLibrariesFor(l, meta); PluginController::openLibrariesFor(l, meta);
@ -223,7 +222,7 @@ void PluginController::load(const QFileInfo &index, const QDir &pluginDir,
<< meta.name << ") because it is disabled"; << meta.name << ") because it is disabled";
return; return;
} }
qCDebug(chatterinoLua) << "Running lua file:" << index;
int err = luaL_dofile(l, index.absoluteFilePath().toStdString().c_str()); int err = luaL_dofile(l, index.absoluteFilePath().toStdString().c_str());
if (err != 0) if (err != 0)
{ {