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

Fixes and tests.

Browse Source
This commit is contained in:
Mikaël Capelle
2022-05-02 18:56:44 +02:00
parent 6ea9d92b26
commit 30a01cf783
15 changed files with 308 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runner/pythonrunner.cpp
+5 -6
View File
@@ -34,7 +34,7 @@ public:
QList<QObject*> load(const QString& identifier) override;
void unload(const QString& identifier) override;
bool initialize(std::filesystem::path const& libpath) override;
bool initialize(QStringList const& paths) override;
bool isInitialized() const override;
private:
@@ -58,7 +58,7 @@ IPythonRunner* CreatePythonRunner()
return new PythonRunner();
}
bool PythonRunner::initialize(std::filesystem::path const& libpath)
bool PythonRunner::initialize(QStringList const& paths)
{
// we only initialize Python once for the whole lifetime of the program, even if MO2
// is restarted and the proxy or PythonRunner objects are deleted and recreated,
@@ -81,10 +81,9 @@ bool PythonRunner::initialize(std::filesystem::path const& libpath)
// initialize the core Path of Python, this must be done before initialization
//
const QStringList paths{
QFileInfo(libpath / "pythoncore.zip").absoluteFilePath(),
QFileInfo(libpath).absoluteFilePath(), IOrganizer::getPluginDataPath()};
Py_SetPath(paths.join(';').toStdWString().c_str());
if (!paths.isEmpty()) {
Py_SetPath(paths.join(';').toStdWString().c_str());
}
Py_OptimizeFlag = 2;
Py_NoSiteFlag = 1;