Fix resource path parsing on Windows and fix empty/null messages list (…

…#176)
NTNU-IHB · May 2, 2023 · 4935fca · 4935fca
1 parent 3a00eb4
commit 4935fca
Showing 1 changed file with 32 additions and 29 deletions.
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp b/pythonfmu/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp
@@ -104,39 +104,41 @@ void PySlaveInstance::clearLogBuffer() const
     PyObject* categoryField = Py_BuildValue("s", "category");
     PyObject* statusField = Py_BuildValue("s", "status");
 
-    auto size = PyList_Size(pMessages_);
-    for (auto i = 0; i < size; i++) {
-        PyObject* msg = PyList_GetItem(pMessages_, i);
-
-        auto debugAttr = PyObject_GetAttr(msg, debugField);
-        auto msgAttr = PyObject_GetAttr(msg, msgField);
-        auto categoryAttr = PyObject_GetAttr(msg, categoryField);
-        auto statusAttr = PyObject_GetAttr(msg, statusField);
-
-        auto statusValue = static_cast<cppfmu::FMIStatus>(PyLong_AsLong(statusAttr));
-
-        PyObject* msgValue = PyUnicode_AsEncodedString(msgAttr, "utf-8", nullptr);
-        char* msgStr = PyBytes_AsString(msgValue);
-        logStrBuffer.emplace_back(msgValue);
-
-        const char* categoryStr = "";
-        if (categoryAttr != Py_None) {
-            PyObject* categoryValue = PyUnicode_AsEncodedString(categoryAttr, "utf-8", nullptr);
-            categoryStr = PyBytes_AsString(categoryValue);
-            logStrBuffer.emplace_back(categoryValue);
-        }
-
-        if (PyObject_IsTrue(debugAttr)) {
-            const_cast<cppfmu::Logger&>(logger_).DebugLog(statusValue, categoryStr, msgStr);
-        } else {
-            const_cast<cppfmu::Logger&>(logger_).Log(statusValue, categoryStr, msgStr);
-        }
+    if ( pMessages_ != NULL && PyList_Check(pMessages_) ) {
+        auto size = PyList_Size(pMessages_);
+        for (auto i = 0; i < size; i++) {
+            PyObject* msg = PyList_GetItem(pMessages_, i);
+
+            auto debugAttr = PyObject_GetAttr(msg, debugField);
+            auto msgAttr = PyObject_GetAttr(msg, msgField);
+            auto categoryAttr = PyObject_GetAttr(msg, categoryField);
+            auto statusAttr = PyObject_GetAttr(msg, statusField);
+
+            auto statusValue = static_cast<cppfmu::FMIStatus>(PyLong_AsLong(statusAttr));
+
+            PyObject* msgValue = PyUnicode_AsEncodedString(msgAttr, "utf-8", nullptr);
+            char* msgStr = PyBytes_AsString(msgValue);
+            logStrBuffer.emplace_back(msgValue);
+
+            const char* categoryStr = "";
+            if (categoryAttr != Py_None) {
+                PyObject* categoryValue = PyUnicode_AsEncodedString(categoryAttr, "utf-8", nullptr);
+                categoryStr = PyBytes_AsString(categoryValue);
+                logStrBuffer.emplace_back(categoryValue);
+            }
+
+            if (PyObject_IsTrue(debugAttr)) {
+                const_cast<cppfmu::Logger&>(logger_).DebugLog(statusValue, categoryStr, msgStr);
+            } else {
+                const_cast<cppfmu::Logger&>(logger_).Log(statusValue, categoryStr, msgStr);
+            }
+        }
+        PyList_SetSlice(pMessages_, 0, size, nullptr);
     }
     Py_DECREF(debugField);
     Py_DECREF(msgField);
     Py_DECREF(categoryField);
     Py_DECREF(statusField);
-    PyList_SetSlice(pMessages_, 0, size, nullptr);
 }
 
 void PySlaveInstance::initialize(PyGILState_STATE gilState)
@@ -548,7 +550,8 @@ cppfmu::UniquePtr<cppfmu::SlaveInstance> CppfmuInstantiateSlave(
     const cppfmu::Logger& logger)
 {
 
-    auto resources = std::string(fmuResourceLocation);
+    // Convert URI %20 to space
+    auto resources = std::regex_replace(std::string(fmuResourceLocation), std::regex("%20"), " ");
     auto find = resources.find("file://");
 
     if (find != std::string::npos) {