poly-hammer-utils 0.0.27__py3-none-any.whl → 0.0.28__py3-none-any.whl

poly_hammer_utils/extension/meta_human_dna.py

@@ -2,6 +2,7 @@ import os
 import logging
 import zipfile
 import tempfile
+import shutil
 from pathlib import Path
 from poly_hammer_utils.constants import ENVIRONMENT
 from poly_hammer_utils.utilities import download_and_unzip_to_folder, download_release_file
@@ -121,18 +122,24 @@ def get_meta_human_dna_core(addon_version: str, auth_token: str) -> list[Path]:
         file_paths.append(save_path)
     return file_paths
 
-def create_release(addon_folder: Path, releases_folder: Path):
+def create_release(addon_folder: Path, releases_folder: Path, pro: bool = False):
     token = os.environ['GH_PAT']
 
     addon_version = get_addon_version(source_folder=addon_folder)
 
+    s3_prefix = BLENDER_EXTENSION_SERVER_S3_FOLDER
+    if pro:
+        s3_prefix = f'{s3_prefix}_pro'
+        releases_folder = releases_folder / 'pro'
+
     # First, sync existing extensions from S3
     sync_extensions_from_s3(
         repo_folder=releases_folder,
         bucket=BLENDER_EXTENSION_SERVER_S3_BUCKET,
-        s3_prefix=BLENDER_EXTENSION_SERVER_S3_FOLDER,
+        s3_prefix=s3_prefix,
     )
 
+
     # Create the new .zip files for the addon's various platforms
     addon_zip_files = package_extension(
         source_folder=addon_folder,
@@ -155,6 +162,28 @@ def create_release(addon_folder: Path, releases_folder: Path):
     for addon_zip_file in addon_zip_files:
         platform, arch = parse_blender_extension_zip_info(url=addon_zip_file)
         files_to_zip = rig_logic_files + core_files
+
+        # If pro version, remove the resources/dna folder from the zip before adding bindings
+        if not pro:
+            files_removed = []
+            dna_folder_prefix = 'resources/dna/'
+            temp_zip_path = Path(str(addon_zip_file) + '.tmp')
+            with zipfile.ZipFile(addon_zip_file, 'r') as zip_read:
+                with zipfile.ZipFile(temp_zip_path, 'w', compression=zipfile.ZIP_DEFLATED) as zip_write:
+                    for item in zip_read.infolist():
+                        if not item.filename.startswith(dna_folder_prefix):
+                            zip_write.writestr(item, zip_read.read(item.filename))
+                        else:
+                            logger.info(f"Removed {item.filename} from pro version")
+                            files_removed.append(item.filename)
+            
+            # Only replace the original zip if we removed files
+            if files_removed:
+                temp_zip_path.replace(addon_zip_file)
+            else:
+                temp_zip_path.unlink()
+
+        # Now add the bindings to the addon .zip
         with zipfile.ZipFile(addon_zip_file, mode="a", compression=zipfile.ZIP_DEFLATED) as zip_file_handle:
             for file_path in files_to_zip:
                 if file_path in rig_logic_files:
@@ -176,7 +205,7 @@ def create_release(addon_folder: Path, releases_folder: Path):
     update_extension_index(
         repo_folder=releases_folder,
         bucket=BLENDER_EXTENSION_SERVER_S3_BUCKET,
-        s3_folder=BLENDER_EXTENSION_SERVER_S3_FOLDER,
+        s3_folder=s3_prefix,
         blender_version=os.environ['BLENDER_VERSION'],
         docker=True
     )
@@ -192,13 +221,16 @@ if __name__ == '__main__':
 
     for addon_name in os.listdir(addons_folder):
         addon_folder = addons_folder / addon_name
+        # Create both the pro and free releases
+        create_release(
+            addon_folder=addon_folder,
+            releases_folder=releases_folder,
+            pro=True
+        )
         create_release(
             addon_folder=addon_folder,
             releases_folder=releases_folder
         )
 
     # Clean up the releases folder
-    for item in releases_folder.iterdir():
-        if item.is_file():
-            item.unlink()
-    releases_folder.rmdir()
+    shutil.rmtree(releases_folder, ignore_errors=True)

{poly_hammer_utils-0.0.27.dist-info → poly_hammer_utils-0.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: poly-hammer-utils
-Version: 0.0.27
+Version: 0.0.28
 Summary: 
 Author: Poly Hammer
 Author-email: info@polyhammer.com

{poly_hammer_utils-0.0.27.dist-info → poly_hammer_utils-0.0.28.dist-info}/RECORD

@@ -2,7 +2,7 @@ poly_hammer_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 poly_hammer_utils/addon/packager.py,sha256=apoZhQpd2QeRucFq53u-L1FPmN4MYuiNrjTETAE9NQg,8435
 poly_hammer_utils/addon/release.py,sha256=EZirS8_c9S1OEZoOHStgciu_C7vMxBc_-O5P1fM9Qu4,9074
 poly_hammer_utils/constants.py,sha256=4XGiwn7ip50V1zvmpVD9YZYmE6wPhj2Ark2AXQuJvSc,228
-poly_hammer_utils/extension/meta_human_dna.py,sha256=9DYV4evfFJz-UDDm-9fwegGKz3JHhhE6UaRr_cTlVD0,7894
+poly_hammer_utils/extension/meta_human_dna.py,sha256=fX2QoDTOVReFDusm2LYA0cDIepW3bRPgZyJpPogk4R4,9238
 poly_hammer_utils/extension/packager.py,sha256=LyThqLWgvlQOrcn9OSChrV675iiwHTvcMCeXwAab_vM,2365
 poly_hammer_utils/extension/server.py,sha256=vuDMqEehgFiFiUy-R28oKzijHo5wIJzW0l66wwPU6I8,8072
 poly_hammer_utils/github/release.py,sha256=P4vrNvdgWuzJI0mRye09BP6vL5b7kQ5fpuDDnEqJbwg,9951
@@ -11,6 +11,6 @@ poly_hammer_utils/launch.py,sha256=Nc9FlFuGtMSjgSLsk6MMMj-FECsOGtfUQlZaUZt_rGU,4
 poly_hammer_utils/resources/scripts/blender/startup.py,sha256=eUd0VwAHjTwIscVKCbk_0-F7p0jgIEsVYdzpIjlzOK0,2282
 poly_hammer_utils/resources/scripts/unreal/init_unreal.py,sha256=1-d9IU8ZSAIS3MUANrsGx4ZmqNJ5f8S2k8XJVg0Bghs,693
 poly_hammer_utils/utilities.py,sha256=7dmZo02HXbWhfmwDHkgVUE_gyq4e-gqb4OdBc2bokbs,6491
-poly_hammer_utils-0.0.27.dist-info/METADATA,sha256=mCH82DZKRLGP3hMdfgdYvpyP43tCcZXUq5udcWFGDsY,934
-poly_hammer_utils-0.0.27.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-poly_hammer_utils-0.0.27.dist-info/RECORD,,
+poly_hammer_utils-0.0.28.dist-info/METADATA,sha256=3fc4GpufAb8P2I45sdbhWFl4htIcMCbGshAEf28w91A,934
+poly_hammer_utils-0.0.28.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+poly_hammer_utils-0.0.28.dist-info/RECORD,,