fix: separate common part for v2 zip and use that in git export

Author: marslanabdulrauf

cms/djangoapps/contentstore/git_export_utils.py

@@ -9,15 +9,11 @@
 import shutil
 import subprocess
 import zipfile
-from datetime import datetime
-from pathlib import Path
-from tempfile import mkdtemp
 from urllib.parse import urlparse
 
 from django.conf import settings
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.utils import timezone
-from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
 
@@ -84,32 +80,18 @@ def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
         library_key: LibraryLocatorV2 for the library to export
         root_dir: Root directory where library_dir will be created
         library_dir: Directory name for the exported library content
-        user: User object for the backup API (optional)
+        user: Username string for the backup API (optional)
 
     Raises:
         Exception: If backup creation or extraction fails
     """
-    from openedx_content.api import create_zip_file as create_lib_zip_file
+    from openedx.core.djangoapps.content_libraries.tasks import create_library_v2_zip
 
     # Get user object for backup API
     user_obj = User.objects.filter(username=user).first()
-    # Create temporary zip backup
-    temp_dir = Path(mkdtemp())
-    sanitized_lib_key = str(library_key).replace(":", "-")
-    sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
-    timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
-    zip_filename = f'{sanitized_lib_key}-{timestamp}.zip'
-    zip_path = os.path.join(temp_dir, zip_filename)
+    temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
 
     try:
-        origin_server = getattr(settings, 'CMS_BASE', None)
-        create_lib_zip_file(
-            lp_key=str(library_key),
-            path=zip_path,
-            user=user_obj,
-            origin_server=origin_server
-        )
-
         # Target directory for extraction
         target_dir = os.path.join(root_dir, library_dir)
 

openedx/core/djangoapps/content_libraries/tasks.py

@@ -508,6 +508,30 @@ def _copy_overrides(
     store.update_item(dest_block, user_id)
 
 
+def create_library_v2_zip(library_key: LibraryLocatorV2, user: User) -> tuple:
+    """
+    Create a zip backup of a v2 library and return ``(temp_dir, zip_file_path)``.
+
+    The caller is responsible for cleaning up ``temp_dir`` when done.
+
+    Args:
+        library_key: LibraryLocatorV2 identifying the library to export.
+        user: User object passed to the backup API.
+
+    Returns:
+        A tuple of ``(temp_dir as Path, zip_file_path as str)``.
+    """
+    root_dir = Path(mkdtemp())
+    sanitized_lib_key = str(library_key).replace(":", "-")
+    sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
+    timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
+    filename = f'{sanitized_lib_key}-{timestamp}.zip'
+    file_path = os.path.join(root_dir, filename)
+    origin_server = getattr(settings, 'CMS_BASE', None)
+    create_lib_zip_file(lp_key=str(library_key), path=file_path, user=user, origin_server=origin_server)
+    return root_dir, file_path
+
+
 class LibraryBackupTask(UserTask):  # pylint: disable=abstract-method
     """
     Base class for tasks related with Library backup functionality.
@@ -553,15 +577,8 @@ def backup_library(self, user_id: int, library_key_str: str) -> None:
         self.status.set_state('Exporting')
         set_custom_attribute("exporting_started", str(library_key))
 
-        root_dir = Path(mkdtemp())
-        sanitized_lib_key = str(library_key).replace(":", "-")
-        sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
-        timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
-        filename = f'{sanitized_lib_key}-{timestamp}.zip'
-        file_path = os.path.join(root_dir, filename)
         user = User.objects.get(id=user_id)
-        origin_server = getattr(settings, 'CMS_BASE', None)
-        create_lib_zip_file(lp_key=str(library_key), path=file_path, user=user, origin_server=origin_server)
+        _root_dir, file_path = create_library_v2_zip(library_key, user)
         set_custom_attribute("exporting_completed", str(library_key))
 
         with open(file_path, 'rb') as zipfile: