pd4web 2.1.2__tar.gz → 2.2.0__tar.gz

{pd4web-2.1.2 → pd4web-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pd4web
-Version: 2.1.2
+Version: 2.2.0
 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.1.2 → pd4web-2.2.0}/Sources/pd4web/Builder.py

@@ -3,6 +3,7 @@ import re
 import shutil
 import subprocess
 import importlib.metadata as importlib_metadata
+import yaml
 
 # from .Patch import PatchLine
 from .Pd4Web import Pd4Web
@@ -42,6 +43,9 @@ class GetAndBuildExternals:
         self.ConfigureProject()
         self.CompileProject()
         self.CopyExtraJsFiles()
+        
+        # Save the project versions
+        self.SaveProjectVersions()
 
     def InitVariables(self):
         self.cmakeFile = []
@@ -498,8 +502,14 @@ class GetAndBuildExternals:
             for file in files:
                 if not os.path.exists(self.Pd4Web.PROJECT_ROOT + "/WebPatch/" + file):
                     shutil.copy(os.path.join(root, file), self.Pd4Web.PROJECT_ROOT + "/WebPatch/")
-
         os.chdir(cwd)
+        
+    def SaveProjectVersions(self):
+        # check if file exists
+        if not os.path.exists(self.Pd4Web.PROJECT_ROOT + "/Pd4Web/versions.yaml"):
+            with open(self.Pd4Web.PROJECT_ROOT + "/Pd4Web/versions.yaml", "w") as f:
+                yaml.dump(self.Pd4Web.Version, f)
+                return       
 
     def __repr__(self) -> str:
         return f"< GetCode Object >"

{pd4web-2.1.2 → pd4web-2.2.0}/Sources/pd4web/Libraries.py

@@ -145,7 +145,7 @@ class ExternalLibraries:
             commit = libRepo.head.peel()
         return commit
 
-    def CloneLibrary(self, libsPath, libData):
+    def CloneLibrary(self, libData):
         """
         Initializes submodules in the specified repository path.
 
@@ -158,11 +158,12 @@ class ExternalLibraries:
             curr_commit: pygit2.Commit = libRepo.head.peel()
             lib_commit: pygit2.Commit = self.getLibCommitVersion(libRepo, libData.version)
             if curr_commit.id == lib_commit.id:
-                # print(f"Library {libData.repo} is in the right commit", color="green")
-                return  # library up-to-date
+                self.Pd4Web.Version["externals"][libData.name] = str(lib_commit.id)
+                return  
             libRepo.set_head(lib_commit.id)
             libRepo.checkout_tree(lib_commit)
             libRepo.reset(lib_commit.id, pygit2.GIT_RESET_HARD)
+            self.Pd4Web.Version["externals"][libData.name] = str(lib_commit.id)
             return
 
         libLink = f"https://github.com/{libData.dev}/{libData.repo}"
@@ -187,6 +188,8 @@ class ExternalLibraries:
             submodule_collection.update()
         except:
             self.Pd4Web.exception("Failed to initialize submodules.")
+            
+        self.Pd4Web.Version["externals"][libData.name] = str(commit.id)
 
         # TODO: Try to merge commits from submodules
         # try:
@@ -212,7 +215,7 @@ class ExternalLibraries:
             os.mkdir(self.Pd4Web.APPDATA + "/Externals")
 
         libFolder = self.Pd4Web.APPDATA + f"/Externals/{libData.name}"
-        self.CloneLibrary(libFolder, libData)
+        self.CloneLibrary(libData)
         if not os.path.exists(self.PROJECT_ROOT + f"/Pd4Web/Externals/{libData.name}"):
             self.Pd4Web.print(
                 f"Copying {libData.name} to Pd4Web/Externals...",

{pd4web-2.1.2 → pd4web-2.2.0}/Sources/pd4web/Pd4Web.py

@@ -83,6 +83,41 @@ class Pd4Web:
 
         self.Execute()
 
+    def InitVariables(self):
+        from .Objects import Objects
+        from .Libraries import ExternalLibraries
+
+        self.cpuCores = os.cpu_count()
+        self.usedObjects = []
+        self.patchLinesProcessed = []
+        self.uiReceiversSymbol = []
+        self.externalsSourceCode = []
+        self.externalsLinkLibraries = []
+        self.externalsLinkLibrariesFolders = []
+        self.externalsSetupFunctions = []
+
+        self.declaredLocalAbs = []
+        self.declaredLibsObjs = []
+        self.declaredPaths = []
+        self.processedAbs = []
+        
+        # Versions
+        self.Version = {}
+        self.Version["python"] = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+        self.Version["pure-data"] = self.PD_VERSION
+        self.Version["emsdk"] = self.EMSDK_VERSION
+        self.Version["pd4web"] = importlib_metadata.version("pd4web")
+        self.Version["externals"] = {}
+
+        self.Libraries: ExternalLibraries = ExternalLibraries(self)
+        self.Objects: Objects = Objects(self)
+
+        self.env = os.environ.copy()
+        python_dir = os.path.dirname(sys.executable)
+        self.env["PATH"] = f"{python_dir};{self.env['PATH']}"
+        self.env["PYTHON"] = sys.executable
+        self.env["EMSDK_QUIET"] = "1"
+        
     def Execute(self):
         from .Builder import GetAndBuildExternals
         from .Compilers import ExternalsCompiler
@@ -156,32 +191,7 @@ class Pd4Web:
         if not os.path.exists(self.APPDATA):
             os.makedirs(self.APPDATA)
 
-    def InitVariables(self):
-        from .Objects import Objects
-        from .Libraries import ExternalLibraries
-
-        self.cpuCores = os.cpu_count()
-        self.usedObjects = []
-        self.patchLinesProcessed = []
-        self.uiReceiversSymbol = []
-        self.externalsSourceCode = []
-        self.externalsLinkLibraries = []
-        self.externalsLinkLibrariesFolders = []
-        self.externalsSetupFunctions = []
-
-        self.declaredLocalAbs = []
-        self.declaredLibsObjs = []
-        self.declaredPaths = []
-        self.processedAbs = []
-
-        self.Libraries = ExternalLibraries(self)
-        self.Objects: Objects = Objects(self)
-
-        self.env = os.environ.copy()
-        python_dir = os.path.dirname(sys.executable)
-        self.env["PATH"] = f"{python_dir};{self.env['PATH']}"
-        self.env["PYTHON"] = sys.executable
-        self.env["EMSDK_QUIET"] = "1"
+    
 
     def DownloadZip(self, url, filename, what=""):
         self.print(f"Downloading {what}...", color="green", silence=self.SILENCE)

{pd4web-2.1.2 → pd4web-2.2.0}/pyproject.toml

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