mo2/modorganizer-plugin_python
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-plugin_python.git synced 2026-07-27 14:03:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Restore logging of historically-logged Python exceptions.

Browse Source
This commit is contained in:
AnyOldName3
2019-07-22 00:08:35 +01:00
parent 19dcdd95c0
commit 63a6c504b0
3 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runner/pythonrunner.cpp
+11 -18
View File
@@ -1306,7 +1306,9 @@ struct PrintWrapper
buffer << message;
if (buffer.tellp() != 0 && buffer.str().back() == '\n')
{
qDebug().nospace().noquote() << buffer.str().substr(0, buffer.str().length() - 1).c_str();
// actually put the string in a variable so it doesn't get destroyed as soon as we get a pointer to its data
std::string string = buffer.str().substr(0, buffer.str().length() - 1);
qDebug().nospace().noquote() << string.c_str();
buffer = std::stringstream();
}
}
@@ -1314,27 +1316,18 @@ struct PrintWrapper
std::stringstream buffer;
};
struct ErrWrapper
{
void write(const char * message)
{
buffer << message;
if (buffer.tellp() != 0 && buffer.str().back() == '\n')
{
qCritical().nospace().noquote() << buffer.str().substr(0, buffer.str().length() - 1).c_str();
buffer = std::stringstream();
}
}
std::stringstream buffer;
};
// ErrWrapper is in error.h
BOOST_PYTHON_MODULE(moprivate)
{
bpy::class_<PrintWrapper, boost::noncopyable>("PrintWrapper", bpy::init<>())
.def("write", &PrintWrapper::write);
bpy::class_<ErrWrapper, boost::noncopyable>("ErrWrapper", bpy::init<>())
.def("write", &ErrWrapper::write);
.def("instance", &ErrWrapper::instance, bpy::return_value_policy<bpy::reference_existing_object>()).staticmethod("instance")
.def("write", &ErrWrapper::write)
.def("startRecordingExceptionMessage", &ErrWrapper::startRecordingExceptionMessage)
.def("stopRecordingExceptionMessage", &ErrWrapper::stopRecordingExceptionMessage)
.def("getLastExceptionMessage", &ErrWrapper::getLastExceptionMessage);
}
bool PythonRunner::initPython(const QString &pythonPath)
@@ -1372,8 +1365,8 @@ bool PythonRunner::initPython(const QString &pythonPath)
mainNamespace["moprivate"] = bpy::import("moprivate");
bpy::import("site");
bpy::exec("sys.stdout = moprivate.PrintWrapper()\n"
"sys.stderr = moprivate.ErrWrapper()\n"
"sys.excepthook = lambda x, y, z: sys.__excepthook__(x, y, z)",
"sys.stderr = moprivate.ErrWrapper.instance()\n"
"sys.excepthook = lambda x, y, z: sys.__excepthook__(x, y, z)\n",
mainNamespace);
return true;