pd4web 2.0.0__tar.gz → 2.0.2__tar.gz

{pd4web-2.0.0 → pd4web-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pd4web
-Version: 2.0.0
+Version: 2.0.2
 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
@@ -42,40 +42,14 @@ Description-Content-Type: text/markdown
 </p>
 
 <p align="center">
-  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/pd4web-tests.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/pd4web-tests.yml/badge.svg" alt="Tests"></a>
+  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/pd4web-tests.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/Tests.yml/badge.svg" alt="Tests"></a>
 </p>
 
 `pd4web` lets you run PureData patches directly in web browsers. It stands out from alternatives like [hvcc](https://github.com/Wasted-Audio/hvcc) and [WebPd](https://github.com/sebpiq/WebPd) by compiling the source code of [libpd](https://github.com/libpd/libpd), thanks to the work of [claudeha](https://github.com/claudeha). With `pd4web`, you can compile any PureData Vanilla patch, along with a list of more than 800 externals and abstractions.
 
 <h3 align="center">Examples</h3>
-<p align="center">Click to Expand!</p>
 
-<details>
-  <summary><b>1. Simple Patch</b></summary>
-  <p align="center">
-    <img src="https://github.com/charlesneimog/pd4web/blob/main/docs/img/Simple-patch.png" width="80%" alt="Logo">
-  </p>
-</details>
-
-<details>
-  <summary><b>2. Interaction with p5js</b></summary>
-<p align="center">
-    <img src="https://github.com/charlesneimog/pd4web/blob/main/docs/img/Compiled-I.png" width="70%" alt="Logo">
-</p>
-<p align="center">
-    <a href="https://charlesneimog.github.io/Projeto/">WebSite</a>
-</p>
-</details>
-
-<details>
-  <summary><b>3. Live Score (VexFlow) </b></summary>
-<p align="center">
-    <img src="https://github.com/charlesneimog/pd4web/blob/main/docs/img/Canticos.png" width="70%" alt="Logo">
-</p>
-<p align="center">
-    <a href="https://charlesneimog.github.io/Canticos-de-Silicio-I/webpatch/">WebSite</a>
-</p>
-</details>
+* Check some examples [here](https://charlesneimog.github.io/pd4web/tests/).
 
 -----
 <h3 align="center">Questions, doubts, help</h3>

{pd4web-2.0.0 → pd4web-2.0.2}/README.md

@@ -20,40 +20,14 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/pd4web-tests.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/pd4web-tests.yml/badge.svg" alt="Tests"></a>
+  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/pd4web-tests.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/Tests.yml/badge.svg" alt="Tests"></a>
 </p>
 
 `pd4web` lets you run PureData patches directly in web browsers. It stands out from alternatives like [hvcc](https://github.com/Wasted-Audio/hvcc) and [WebPd](https://github.com/sebpiq/WebPd) by compiling the source code of [libpd](https://github.com/libpd/libpd), thanks to the work of [claudeha](https://github.com/claudeha). With `pd4web`, you can compile any PureData Vanilla patch, along with a list of more than 800 externals and abstractions.
 
 <h3 align="center">Examples</h3>
-<p align="center">Click to Expand!</p>
 
-<details>
-  <summary><b>1. Simple Patch</b></summary>
-  <p align="center">
-    <img src="https://github.com/charlesneimog/pd4web/blob/main/docs/img/Simple-patch.png" width="80%" alt="Logo">
-  </p>
-</details>
-
-<details>
-  <summary><b>2. Interaction with p5js</b></summary>
-<p align="center">
-    <img src="https://github.com/charlesneimog/pd4web/blob/main/docs/img/Compiled-I.png" width="70%" alt="Logo">
-</p>
-<p align="center">
-    <a href="https://charlesneimog.github.io/Projeto/">WebSite</a>
-</p>
-</details>
-
-<details>
-  <summary><b>3. Live Score (VexFlow) </b></summary>
-<p align="center">
-    <img src="https://github.com/charlesneimog/pd4web/blob/main/docs/img/Canticos.png" width="70%" alt="Logo">
-</p>
-<p align="center">
-    <a href="https://charlesneimog.github.io/Canticos-de-Silicio-I/webpatch/">WebSite</a>
-</p>
-</details>
+* Check some examples [here](https://charlesneimog.github.io/pd4web/tests/).
 
 -----
 <h3 align="center">Questions, doubts, help</h3>

{pd4web-2.0.0 → pd4web-2.0.2}/Sources/Libraries/else.cmake

@@ -461,14 +461,15 @@ file(GLOB BTF_SRC "${CIRCUIT_ROOT}/Libraries/BTF/*.c")
 file(GLOB COLAMD_SRC "${CIRCUIT_ROOT}/Libraries/COLAMD/*.c")
 file(GLOB COLAMD_SRC "${CIRCUIT_ROOT}/Libraries/COLAMD/*.c")
 file(GLOB KLU_SRC "${CIRCUIT_ROOT}/Libraries/KLU/*.c")
-file(GLOB SAMPLERATE_SRC "${CIRCUIT_ROOT}/Libraries/libsamplerate/*.c")
+file(GLOB SR_SRC "${LIB_DIR}/Source/Shared/libsamplerate/*.c")
 set(SUITE_SRC "${CIRCUIT_ROOT}/Libraries/SuiteSparse_config/SuiteSparse_config.c")
+
 set(SIMULATOR_SRC "${CIRCUIT_ROOT}/Source/Simulator.cpp")
 set(CIRCUIT_SRC "${CIRCUIT_ROOT}/Source/circuit~.c")
 
 pd_add_external(
     circuit~
-    "${CIRCUIT_SRC};${AMD_SRC};${BTF_SRC};${COLAMD_SRC};${KLU_SRC};${SAMPLERATE_SRC};${SUITE_SRC};${SIMULATOR_SRC}"
+    "${CIRCUIT_SRC};${AMD_SRC};${BTF_SRC};${COLAMD_SRC};${KLU_SRC};${SR_SRC};${SUITE_SRC};${SIMULATOR_SRC}"
     TARGET
     circuit_tilde)
 

{pd4web-2.0.0 → pd4web-2.0.2}/Sources/pd4web/Libraries.py

@@ -156,8 +156,8 @@ class ExternalLibraries:
             path (str): The path to the repository containing submodules.
         """
         libPath = self.Pd4Web.APPDATA + "/Externals/" + libData.name
-        libRepo: pygit2.Repository = pygit2.Repository(libPath)
         if os.path.exists(libPath):
+            libRepo: pygit2.Repository = pygit2.Repository(libPath)
             curr_commit: pygit2.Commit = libRepo.head.peel()
             lib_commit: pygit2.Commit = self.getLibCommitVersion(libRepo, libData.version)
             if curr_commit.id == lib_commit.id:
@@ -174,8 +174,9 @@ class ExternalLibraries:
         except Exception as e:
             raise Exception(f"Failed to clone repository: {str(e)}")
 
-        tag_name = libData.version  # Assuming libData.version contains either a tag or a commit hash
-        commit = self.getLibCommitVersion(libRepo, tag_name)
+        libRepo: pygit2.Repository = pygit2.Repository(libPath)
+        tagName = libData.version  # Assuming libData.version contains either a tag or a commit hash
+        commit = self.getLibCommitVersion(libRepo, tagName)
         libRepo.set_head(commit.id)
         libRepo.checkout_tree(commit)
         libRepo.reset(commit.id, pygit2.GIT_RESET_HARD)
@@ -186,19 +187,16 @@ class ExternalLibraries:
             submodule_collection = pygit2.submodules.SubmoduleCollection(pygit2.Repository(libPath))
             submodule_collection.init()
             submodule_collection.update()
-            libName = libData.name
-            libFolder = self.Pd4Web.PROJECT_ROOT + "/Pd4Web/Externals/" + libName
-            self.Pd4Web.Objects.GetLibraryObjects(libFolder, libName)
         except:
             raise Exception("Failed to initialize submodules.")
 
         # TODO: Try to merge commits from submodules
-        try:
-            main_repo = pygit2.Repository(self.Pd4Web.PROJECT_ROOT)
-            submodule_repo = pygit2.Repository(libPath)
-
-        except Exception as e:
-            raise Exception(f"Failed to merge submodule commits: {str(e)}")
+        # try:
+        #     main_repo = pygit2.Repository(self.Pd4Web.PROJECT_ROOT)
+        #     submodule_repo = pygit2.Repository(libPath)
+        #
+        # except Exception as e:
+        #     raise Exception(f"Failed to merge submodule commits: {str(e)}")
 
     def GetLibrarySourceCode(
         self,
@@ -218,7 +216,19 @@ class ExternalLibraries:
         libFolder = self.Pd4Web.APPDATA + f"/Externals/{libData.name}"
         self.CloneLibrary(libFolder, libData)
         if not os.path.exists(self.PROJECT_ROOT + f"/Pd4Web/Externals/{libData.name}"):
-            shutil.copytree(libFolder, self.PROJECT_ROOT + "/Pd4Web/Externals/" + libData.name, symlinks=False)
+
+            def ignore_symlinks(src, names):
+                return [name for name in names if os.path.islink(os.path.join(src, name))]
+
+            shutil.copytree(
+                libFolder,
+                self.PROJECT_ROOT + "/Pd4Web/Externals/" + libData.name,
+                symlinks=False,
+                ignore=ignore_symlinks,
+                dirs_exist_ok=True,
+                ignore_dangling_symlinks=True,
+            )
+
         return True
 
     def GetLibrarySourceCodeOld(

{pd4web-2.0.0 → pd4web-2.0.2}/Sources/pd4web/Patch.py

@@ -192,6 +192,8 @@ class Patch:
             externalsJson = os.path.join(self.PROJECT_ROOT, "Pd4Web/Externals/Objects.json")
             if not os.path.exists(externalsJson):
                 self.Pd4Web.Libraries.GetLibrarySourceCode(line.library)
+                libFolder = self.Pd4Web.PROJECT_ROOT + "/Pd4Web/Externals/" + line.library
+                self.Pd4Web.Objects.GetLibraryObjects(libFolder, line.library)
 
             libAbs = []
             with open(externalsJson, "r") as file:

{pd4web-2.0.0 → pd4web-2.0.2}/pyproject.toml

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