Initialize cpython on a separate thread, Rename include.hpp to pythoninclude.hpp, Catch exceptions in exprtkmodule.cpp module functions, Add thread state functions in interpreter.hpp

Author: vetux

CMakeLists.txt

@@ -12,6 +12,8 @@ message("Python_Development_FOUND:${Python_Development_FOUND}")
 message("Python_LIBRARIES:${Python_LIBRARIES}")
 message("Python_INCLUDE_DIRS:${Python_INCLUDE_DIRS}")
 
+find_package(Threads REQUIRED)
+
 if (WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 endif (WIN32)
@@ -64,3 +66,4 @@ target_link_libraries(qcalculator Qt5::Core Qt5::Widgets)
 target_link_libraries(qcalculator ${Python_LIBRARIES}) # Python
 target_link_libraries(qcalculator mpdec mpdec++) # mpdecimal
 target_link_libraries(qcalculator archive) # libarchive
+target_link_libraries(qcalculator Threads::Threads) # Threads

src/addon/addon.cpp

@@ -24,18 +24,24 @@
 
 #include "pycx/interpreter.hpp"
 
+#include "util/interpreterhandler.hpp"
+
 Addon::Addon(std::string moduleName, std::string displayName, std::string description)
         : loaded(false),
           moduleName(std::move(moduleName)),
           displayName(std::move(displayName)),
           description(std::move(description)) {}
 
 void Addon::callFunctionNoArgs(const std::string &name) {
+    if (!InterpreterHandler::waitForInitialization()) {
+        throw std::runtime_error("Python is not initialized");
+    }
     moduleLoaded = true;
     if (Interpreter::isInitialized()) {
         Interpreter::callFunctionNoArgs(moduleName + "." + moduleName, name);
     } else {
-        throw std::runtime_error("Python is not initialized (The console contains the error message), ensure that the correct path is configured in the settings.");
+        throw std::runtime_error(
+                "Python is not initialized (The console contains the error message), ensure that the correct path is configured in the settings.");
     }
 }
 
@@ -44,6 +50,10 @@ void Addon::reload() {
     if (l)
         unload();
 
+    if (!InterpreterHandler::waitForInitialization()) {
+        throw std::runtime_error("Python is not initialized");
+    }
+
     if (Interpreter::isInitialized()) {
         Interpreter::reloadModule(moduleName + "." + moduleName);
     }

src/addon/addonmanager.cpp

@@ -160,13 +160,13 @@ Archive AddonManager::createInstallableBundle(std::vector<InstallBundleEntry> en
     return archive;
 }
 
-AddonManager::AddonManager(const std::string &addonDirectory,
+AddonManager::AddonManager(std::string addonDirectory,
                            Listener onAddonLoadFail,
                            Listener onAddonUnloadFail)
-        : addonDir(addonDirectory),
+        : addonDir(std::move(addonDirectory)),
           onAddonLoadFail(std::move(onAddonLoadFail)),
           onAddonUnloadFail(std::move(onAddonUnloadFail)) {
-    reloadModules();
+    readAddons();
 }
 
 AddonManager::~AddonManager() {

src/addon/addonmanager.hpp

@@ -45,7 +45,9 @@ class AddonManager {
 
     typedef std::function<void(const std::string &, const std::string &)> Listener;
 
-    AddonManager(const std::string &addonDirectory,
+    AddonManager() = default;
+
+    AddonManager(std::string addonDirectory,
                  Listener onAddonLoadFail,
                  Listener onAddonUnloadFail);
 
@@ -93,8 +95,9 @@ class AddonManager {
      * @param sourceFile
      * @param questionDialog
      */
-    size_t installAddonBundle(std::istream &sourceFile, const std::function<bool(const std::string &, const std::string &,
-                                                                           std::vector<std::string> &)>& installDialog);
+    size_t installAddonBundle(std::istream &sourceFile,
+                              const std::function<bool(const std::string &, const std::string &,
+                                                       std::vector<std::string> &)> &installDialog);
 
 
     void uninstallAddon(const std::string &moduleName);

src/main.cpp

@@ -19,13 +19,9 @@
 
 #include <QApplication>
 #include <QMessageBox>
-#include <QProcess>
-
 #include "windows/calculatorwindow.hpp"
 
 #include "pycx/interpreter.hpp"
-#include "pycx/modules/stdredirmodule.hpp"
-#include "pycx/modules/exprtkmodule.hpp"
 
 #include "io/paths.hpp"
 #include "io/fileoperations.hpp"
@@ -41,54 +37,6 @@ std::vector<std::string> parseArgs(int argc, char *argv[]) {
     return ret;
 }
 
-std::wstring getUserPythonPath(Settings &settings) {
-    std::string str;
-
-    if (settings.check(SETTING_PYTHON_PATH.key)) {
-        str = settings.value(SETTING_PYTHON_PATH.key).toString();
-    }
-
-    if (str.empty()) {
-        return {};
-    } else {
-        std::wstring wret;
-        for (auto &c: str) {
-            wret += c;
-        }
-        return wret;
-    }
-}
-
-bool checkPythonInit(std::string &stdErr) {
-    QProcess proc;
-    proc.start(QApplication::applicationFilePath(), {"--run_python_init_check"}, QIODevice::ReadOnly);
-    proc.waitForFinished();
-    auto ret = proc.exitCode();
-    stdErr = proc.readAllStandardError().toStdString();
-    return !ret;
-}
-
-std::string configurePython() {
-    auto settings = Settings::readSettings();
-    auto pythonPath = getUserPythonPath(settings);
-
-    std::string stdErr;
-
-    if (checkPythonInit(stdErr)) {
-        if (!pythonPath.empty()) {
-            Interpreter::setPath(pythonPath);
-        }
-
-        StdRedirModule::initialize();
-        ExprtkModule::initialize();
-        Interpreter::initialize();
-        Interpreter::addModuleDir(Paths::getLibDirectory());
-        Interpreter::addModuleDir(Paths::getAddonDirectory());
-    }
-
-    return stdErr;
-}
-
 int runPythonInitCheck() {
     auto settings = Settings::readSettings();
     if (settings.check(SETTING_PYTHON_PATH.key)) {
@@ -123,8 +71,6 @@ int main(int argc, char *argv[]) {
         return runPythonInitCheck();
     }
 
-    auto err = configurePython();
-
     if (args.size() > 1) {
         if (args.at(1) == "--interpreter" || args.at(1) == "-i") {
             // Run the application as an interactive python interpreter
@@ -139,7 +85,7 @@ int main(int argc, char *argv[]) {
             return 0;
         }
     } else {
-        CalculatorWindow w((err).c_str());
+        CalculatorWindow w;
         w.show();
         return QApplication::exec();
     }

src/math/scripthandler.cpp

@@ -19,11 +19,17 @@
 
 #include "math/scripthandler.hpp"
 
-#include "pycx/include.hpp"
+#include "pycx/pythoninclude.hpp"
 #include "pycx/interpreter.hpp"
 
+#include "util/interpreterhandler.hpp"
+
 decimal::Decimal ScriptHandler::run(PyObject *c, const std::vector<decimal::Decimal> &a) {
-    if (!Interpreter::isInitialized()){
+    if (!InterpreterHandler::waitForInitialization()) {
+        throw std::runtime_error("Python is not initialized");
+    }
+
+    if (!Interpreter::isInitialized()) {
         throw std::runtime_error("Python is not initialized.");
     }