Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-28 10:56:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Log more script errors

Browse Source
This commit is contained in:
GriffinR
2021-11-19 22:32:14 -05:00
committed by huderlem
parent a6b490cf15
commit beb1f6ef27
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainwindow_scriptapi.cpp
View File

@@ -507,7 +507,7 @@ void MainWindow::setTimeout(QJSValue callback, int milliseconds) {
}
void MainWindow::invokeCallback(QJSValue callback) {
callback.call();
Scripting::tryErrorJS(callback.call());
}
void MainWindow::log(QString message) {

37
src/scripting.cpp
View File

@@ -51,23 +51,25 @@ void Scripting::loadModules(QStringList moduleFiles) {
}
}
bool Scripting::tryErrorJS(QJSValue js) {
if (!js.isError()) return false;
QFileInfo file(js.property("fileName").toString());
logError(QString("Error in custom script '%1' at line %2: '%3'")
.arg(file.fileName())
.arg(js.property("lineNumber").toString())
.arg(js.toString()));
return true;
}
void Scripting::invokeCallback(CallbackType type, QJSValueList args) {
for (QJSValue module : this->modules) {
QString functionName = callbackFunctions[type];
QJSValue callbackFunction = module.property(functionName);
if (callbackFunction.isError()) {
continue;
}
if (tryErrorJS(callbackFunction)) continue;
QJSValue result = callbackFunction.call(args);
if (result.isError()) {
QFileInfo file(result.property("fileName").toString());
logError(QString("Error in custom script '%1' at line %2: '%3'")
.arg(file.fileName())
.arg(result.property("lineNumber").toString())
.arg(result.toString()));
continue;
}
if (tryErrorJS(result)) continue;
}
}
@@ -88,19 +90,14 @@ void Scripting::invokeAction(QString actionName) {
QString functionName = instance->registeredActions.value(actionName);
for (QJSValue module : instance->modules) {
QJSValue callbackFunction = module.property(functionName);
if (callbackFunction.isError()) {
if (callbackFunction.isUndefined() || !callbackFunction.isCallable()) {
logError(QString("Unknown custom script function '%1'").arg(functionName));
continue;
}
if (tryErrorJS(callbackFunction)) continue;
QJSValue result = callbackFunction.call(QJSValueList());
if (result.isError()) {
QFileInfo file(result.property("fileName").toString());
logError(QString("Error in custom script '%1' at line %2: '%3'")
.arg(file.fileName())
.arg(result.property("lineNumber").toString())
.arg(result.toString()));
continue;
}
if (tryErrorJS(result)) continue;
}
}