pd4web 2.2.3__tar.gz → 2.2.4__tar.gz

{pd4web-2.2.3 → pd4web-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pd4web
-Version: 2.2.3
+Version: 2.2.4
 Summary: pd4web compiles PureData patches with external objects for Wasm, allowing to run entire patches in web browsers.
 Home-page: https://charlesneimog.github.io/pd4web
 Author: Charles K. Neimog

{pd4web-2.2.3 → pd4web-2.2.4}/Sources/pd4web/Compilers.py

@@ -37,14 +37,17 @@ class ExternalsCompiler:
             libRepo.set_head(commit.id)
             libRepo.checkout_tree(commit)
             libRepo.reset(commit.id, pygit2.GIT_RESET_HARD)
-            self.InstallEMCC()
+            self.Pd4Web.print(
+                f"Checking out emsdk to {tag_name}",
+                color="yellow",
+                silence=self.Pd4Web.SILENCE,
+                pd4web=self.Pd4Web.PD_EXTERNAL,
+            )
 
         # check if Cmake
         if not os.path.exists(self.EMCMAKE):
             self.InstallEMCC()
 
-        # self.InstallEMCC()
-
     def InitVariables(self):
         self.EMSDK = self.Pd4Web.APPDATA + "/emsdk/emsdk"
         self.EMSDK_PY = self.Pd4Web.APPDATA + "/emsdk/emsdk.py"
@@ -107,9 +110,15 @@ class ExternalsCompiler:
             result = subprocess.run(
                 ["chmod", "+x", self.EMSDK], env=self.Pd4Web.env, capture_output=not self.Pd4Web.verbose, text=True
             )
+                
             if result.returncode != 0:
                 self.Pd4Web.exception("Failed to make emsdk executable")
+            else:
+                self.Pd4Web.print(
+                    "emsdk is now executable", color="green", silence=self.Pd4Web.SILENCE, pd4web=self.Pd4Web.PD_EXTERNAL
+                )
 
+            self.Pd4Web.print("Installing emsdk, this will take a about 5 minutes, wait!!!", color="yellow", silence=self.Pd4Web.SILENCE, pd4web=self.Pd4Web.PD_EXTERNAL)
             # ──────────────────────────────────────
             result = subprocess.run(
                 [self.EMSDK, "install", "latest"],
@@ -121,6 +130,10 @@ class ExternalsCompiler:
                 self.Pd4Web.exception(
                     f"Failed to install emsdk, result {result.returncode}, cmd: " + " ".join(result.args)
                 )
+            else:
+                self.Pd4Web.print(
+                    "emsdk installed", color="green", silence=self.Pd4Web.SILENCE, pd4web=self.Pd4Web.PD_EXTERNAL
+                )
 
             # ──────────────────────────────────────
             result = subprocess.run(

{pd4web-2.2.3 → pd4web-2.2.4}/Sources/pd4web/Libraries.py

@@ -168,7 +168,7 @@ class ExternalLibraries:
 
         libLink = f"https://github.com/{libData.dev}/{libData.repo}"
         try:
-            self.Pd4Web.print(f"Cloning library {libData.repo}... This will take some time!", color="green")
+            self.Pd4Web.print(f"Cloning library {libData.repo}... This will take some time!", color="green", silence=self.Pd4Web.SILENCE, pd4web=self.Pd4Web.PD_EXTERNAL)
             pygit2.clone_repository(libLink, libPath)
         except Exception as e:
             self.Pd4Web.exception(f"Failed to clone repository: {str(e)}")
@@ -179,10 +179,10 @@ class ExternalLibraries:
         libRepo.set_head(commit.id)
         libRepo.checkout_tree(commit)
         libRepo.reset(commit.id, pygit2.GIT_RESET_HARD)
-        self.Pd4Web.print(f"Library {libData.repo} cloned successfully!", color="green")
-        self.Pd4Web.print(f"Using commit {commit.id}", color="green")
+        self.Pd4Web.print(f"Library {libData.repo} cloned successfully!", color="green", silence=self.Pd4Web.SILENCE, pd4web=self.Pd4Web.PD_EXTERNAL)
+        self.Pd4Web.print(f"Using commit {commit.id}", color="green", silence=self.Pd4Web.SILENCE, pd4web=self.Pd4Web.PD_EXTERNAL)
         try:
-            self.Pd4Web.print(f"Initializing submodules of {libData.repo}...", color="green")
+            self.Pd4Web.print(f"Initializing submodules of {libData.repo}...", color="green", silence=self.Pd4Web.SILENCE, pd4web=self.Pd4Web.PD_EXTERNAL)
             submodule_collection = pygit2.submodules.SubmoduleCollection(pygit2.Repository(libPath))
             submodule_collection.init()
             submodule_collection.update()

{pd4web-2.2.3 → pd4web-2.2.4}/Sources/pd4web/Pd4Web.py

@@ -67,6 +67,7 @@ class Pd4Web:
 
         self.Parser = parser
         self.Patch = os.path.abspath(self.Parser.patch_file)
+            
         if not os.path.isfile(self.Patch):
             self.exception("\n\nError: Patch file not found")
 
@@ -114,9 +115,16 @@ class Pd4Web:
 
         self.env = os.environ.copy()
         python_dir = os.path.dirname(sys.executable)
-        self.env["PATH"] = f"{python_dir};{self.env['PATH']}"
+        if "PATH" in self.env:
+            self.env["PATH"] = f"{python_dir};{self.env['PATH']}"
+        else:
+            self.env["PATH"] = python_dir
         self.env["PYTHON"] = sys.executable
         self.env["EMSDK_QUIET"] = "1"
+        # add /bin and /usr/bin to PATH on macOS
+        if sys.platform == "darwin":
+            self.env["PATH"] += ":/bin:/usr/bin"
+            
         
     def Execute(self):
         from .Builder import GetAndBuildExternals
@@ -191,38 +199,9 @@ class Pd4Web:
         if not os.path.exists(self.APPDATA):
             os.makedirs(self.APPDATA)
 
-    
-
-    def DownloadZip(self, url, filename, what=""):
-        self.print(f"Downloading {what}...", color="green", silence=self.SILENCE)
-        response = requests.get(url, stream=True)
-        if response.status_code != 200:
-            self.exception(f"Error: {response.status_code}")
-        total_size = response.headers.get("content-length")
-        total_size = int(total_size) if total_size is not None else None
-        chunk_size = 1024
-        num_bars = 40
-        with open(filename, "wb") as file:
-            downloaded_size = 0
-            for data in response.iter_content(chunk_size):
-                file.write(data)
-                downloaded_size += len(data)
-                if total_size:
-                    progress = downloaded_size / total_size
-                    num_hashes = int(progress * num_bars)
-                    progress_bar = "#" * num_hashes + "-" * (num_bars - num_hashes)
-                    sys.stdout.write(f"\r    🟢 |{progress_bar}| {progress:.2%}")
-                else:
-                    num_hashes = int(downloaded_size / chunk_size) % num_bars
-                    progress_bar = "#" * num_hashes + "-" * (num_bars - num_hashes)
-                    sys.stdout.write(f"\r    🟢 |{progress_bar}| {downloaded_size} bytes")
-                sys.stdout.flush()
-        print()
-        return True
-
     def GetPdSourceCode(self):
         if not os.path.exists(self.APPDATA + "/Pd"):
-            self.print("Cloning Pd", color="yellow")
+            self.print("Cloning Pd", color="yellow", silence=self.SILENCE, pd4web=self.PD_EXTERNAL)
             pd_path = self.APPDATA + "/Pd"
             pd_git = "https://github.com/pure-data/pure-data"
             ok = pygit2.clone_repository(pd_git, pd_path)
@@ -326,6 +305,14 @@ class Pd4Web:
             type=int,
             help="Initial memory size in MB",
         )
+        
+        parser.add_argument(
+            "--patch-file",
+            required=False,
+            default="",
+            type=str,
+            help="Patch file to compile",
+        )
 
         # GUI
         parser.add_argument(

{pd4web-2.2.3 → pd4web-2.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pd4web"
-version = "2.2.3"
+version = "2.2.4"
 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"