fix Pd object

charlesneimog · Nov 29, 2024 · e7aa503 · e7aa503
1 parent 14fead9
commit e7aa503
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/Resources/Pd/pd4web.cpp b/Resources/Pd/pd4web.cpp
@@ -17,7 +17,7 @@
 static bool global_pd4web_check = false;
 static t_class *pd4web_class;
 
-#define PD4WEB_EXTERNAL_VERSION "2.2.4"
+#define PD4WEB_EXTERNAL_VERSION "2.2.5"
 
 // ─────────────────────────────────────
 class Pd4Web {
@@ -102,6 +102,7 @@ bool pd4web_terminal(Pd4Web *x, std::string cmd, bool detached = false,
         return false;
     }
     x->running = true;
+    x->result = false;
 
 #if defined(_WIN32) || defined(_WIN64)
     std::thread t([x, cmd, sucessMsg, showMessage, clearNewline]() {
@@ -179,11 +180,13 @@ bool pd4web_terminal(Pd4Web *x, std::string cmd, bool detached = false,
         }
         if (sucessMsg && exitCode == 0) {
             post("[pd4web] Command executed successfully.");
-        } else if (exitCode != 0  && showMessage) {
+        } else if (exitCode != 0) {
             x->running = false;
             x->result = false;
-            pd_error(x, "[pd4web] Command failed with exit code %d", exitCode);
-            post("Try to run the command '%s' in the terminal to see the error", cmd.c_str());
+            if (showMessage) {
+                pd_error(x, "[pd4web] Command failed with exit code %d", exitCode);
+                post("Try to run the command '%s' in the terminal to see the error", cmd.c_str());
+            }
         }
         CloseHandle(hRead);
         CloseHandle(pi.hProcess);
@@ -239,11 +242,13 @@ bool pd4web_terminal(Pd4Web *x, std::string cmd, bool detached = false,
         }
 
         int exitCode = pclose(Pipe);
-        if (exitCode != 0 && showMessage) {
+        if (exitCode != 0) {
             x->running = false;
             x->result = false;
-            pd_error(x, "[pd4web] Command failed with exit code %d", exitCode);
-            post("Try to run the command '%s' in the terminal to see the error", cmd.c_str());
+            if (showMessage){
+                pd_error(x, "[pd4web] Command failed with exit code %d", exitCode);
+                post("Try to run the command '%s' in the terminal to see the error", cmd.c_str());
+            }
         } else {
             x->running = false;
             if (sucessMsg) {
@@ -294,27 +299,18 @@ static bool pd4web_check(Pd4Web *x) {
         pd4web_version(x);
         return true;
     } else{
-        pd_error(x, "[pd4web] pd4web is not installed. Installing...");
-    }
-    std::string python_cmd = x->pythonGlobal + " --version";
-    result = pd4web_terminal(x, python_cmd, false, false, false, false);
-    if (!result) {
-        pd_error(nullptr, "[pd4web] Python 3 is not installed. Trying to install...");
-        return false;
+        post("[pd4web] Installing pd4web, wait...");
     }
-#if defined(_WIN32) || defined(_WIN64)
-    std::string venv_cmd = x->pythonGlobal + " -m venv \"" + x->objRoot + "\\.venv\"";
-#else
+
     std::string venv_cmd = x->pythonGlobal + " -m venv \"" + x->objRoot + "/.venv\"";
-#endif
     post("[pd4web] Creating virtual environment...");
     result = pd4web_terminal(x, venv_cmd, false, false, false, false);
     if (!result) {
         pd_error(nullptr, "[pd4web] Failed to create virtual environment");
         return false;
     }
     // install pd4web
-    post("[pd4web] Installing pd4web...");
+    post("[pd4web] Downloading pd4web...");
     std::string pip_cmd = x->pip + " install pd4web";
     result = pd4web_terminal(x, pip_cmd, false, false, false, false);
     if (!result) {
@@ -326,8 +322,7 @@ static bool pd4web_check(Pd4Web *x) {
     std::string cmd = x->pd4web + " --version";
     pd4web_terminal(x, cmd.c_str(), false, false, true, true);
     global_pd4web_check = true;
-    pd_error(x, "[pd4web] pd4web is ready, please restart Pd");
-
+    post("[pd4web] pd4web is ready, please restart Pd!");
     return true;
 }
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pd4web"
-version = "2.2.4"
+version = "2.2.5"
 description = "pd4web compiles PureData patches with external objects for Wasm, allowing to run entire patches in web browsers."
 authors = ["Charles K. Neimog <charlesneimog@outlook.com>"]
 readme = "README.md"