Make plugin export more reliable

Author: timothyschoen

CMakeLists.txt

@@ -147,7 +147,7 @@ endif()
 
 message(STATUS "Packaging resources")
 if(BUILD_CUSTOM_PLUGIN)
-    execute_process(COMMAND ${Python3_EXECUTABLE} package_custom_resources.py ${CUSTOM_PLUGIN_PATH} ${CMAKE_CURRENT_BINARY_DIR}/Resources WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Scripts RESULT_VARIABLE PACKAGE_RESOURCES_RESULT)
+    execute_process(COMMAND ${Python3_EXECUTABLE} package_custom_resources.py ${CUSTOM_PLUGIN_PATH} ${CUSTOM_PLUGIN_NAME} ${CMAKE_CURRENT_BINARY_DIR}/Resources WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Scripts RESULT_VARIABLE PACKAGE_RESOURCES_RESULT)
 else()
 execute_process(COMMAND ${Python3_EXECUTABLE} package_resources.py ${ENABLE_GEM} ${CMAKE_CURRENT_BINARY_DIR}/Resources WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Scripts RESULT_VARIABLE PACKAGE_RESOURCES_RESULT)
 endif()

Resources/Scripts/package_custom_resources.py

@@ -21,7 +21,8 @@
 }
 
 plugin_path = sys.argv[1];
-output_dir = sys.argv[2]
+plugin_name = sys.argv[2];
+output_dir = sys.argv[3]
 
 # Utility filesystem functions
 
@@ -83,6 +84,29 @@ def makeArchive(name, root_dir, base_dir):
             full_path = os.path.join(root_dir, base_dir)
             tar.add(full_path, arcname=base_dir)
 
+def extractWithName(zip_path, output_dir, new_root_name):
+    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+        members = zip_ref.namelist()
+        top_level = {member.split('/')[0] for member in members if member.strip('/')}
+        zip_ref.extractall(output_dir)
+
+    new_root_path = os.path.join(output_dir, new_root_name)
+
+    if os.path.exists(new_root_path):
+        shutil.rmtree(new_root_path)
+
+    if len(top_level) == 1 and os.path.isdir(os.path.join(output_dir, list(top_level)[0])):
+        # Case 1: Single folder at top level — rename it
+        original_root = os.path.join(output_dir, list(top_level)[0])
+        shutil.move(original_root, new_root_path)
+    else:
+        # Case 2: Multiple top-level items — create new folder and move them in
+        os.makedirs(new_root_path, exist_ok=True)
+        for name in top_level:
+            src_path = os.path.join(output_dir, name)
+            dst_path = os.path.join(new_root_path, name)
+            shutil.move(src_path, dst_path)
+
 def split(a, n):
     k, m = divmod(len(a), n)
     return (a[i*k+min(i, m):(i+1)*k+min(i+1, m)] for i in range(n))
@@ -249,10 +273,9 @@ def generate_binary_data(output_dir, file_list):
 # copyFile("../../Patches/beat.pd", "./Abstractions")
 
 if os.path.isfile(plugin_path):
-    with zipfile.ZipFile(plugin_path, 'r') as zip_ref:
-        zip_ref.extractall(os.path.join(output_dir, "plugdata_version"))
+    extractWithName(plugin_path, os.path.join(output_dir, "plugdata_version"), plugin_name)
 elif os.path.isdir(plugin_path):
-    copyDir(plugin_path, os.path.join(output_dir, "plugdata_version", os.path.basename(plugin_path)))
+    copyDir(plugin_path, os.path.join(output_dir, "plugdata_version", plugin_name))
 
 makeDir("Extra")
 copyDir(project_root + "/Libraries/pd-else/Documentation/Extra-files", "Extra/else")