fix: move export_library_v2_to_zip to backup file as well

Author: marslanabdulrauf

cms/djangoapps/contentstore/git_export_utils.py

@@ -6,9 +6,7 @@
 
 import logging
 import os
-import shutil
 import subprocess
-import zipfile
 from urllib.parse import urlparse
 
 from django.conf import settings
@@ -69,47 +67,6 @@ def cmd_log(cmd, cwd):
     return output
 
 
-def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
-    """
-    Export a v2 library using the backup API.
-
-    V2 libraries are stored in Learning Core and use a zip-based backup mechanism.
-    This function creates a zip backup and extracts it to the specified directory.
-
-    Args:
-        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: Username string for the backup API (optional)
-
-    Raises:
-        Exception: If backup creation or extraction fails
-    """
-    from openedx.core.djangoapps.content_libraries.api import create_library_v2_zip
-
-    # Get user object for backup API
-    user_obj = User.objects.filter(username=user).first()
-    temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
-
-    try:
-        # Target directory for extraction
-        target_dir = os.path.join(root_dir, library_dir)
-
-        # Create target directory if it doesn't exist
-        os.makedirs(target_dir, exist_ok=True)
-
-        # Extract zip contents (will overwrite existing files)
-        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-            zip_ref.extractall(target_dir)
-
-        log.info('Extracted library v2 backup to %s', target_dir)
-
-    finally:
-        # Cleanup temporary files
-        if temp_dir.exists():
-            shutil.rmtree(temp_dir)
-
-
 def export_to_git(content_key, repo, user='', rdir=None):
     """
     Export a course or library to git.

openedx/core/djangoapps/content_libraries/api/backup.py

@@ -5,11 +5,14 @@
 
 import os
 from datetime import datetime
+import shutil
 from tempfile import mkdtemp
+import zipfile
 
 from django.conf import settings
 from django.utils.text import slugify
-from opaque_keys.edx.locator import LibraryLocatorV2
+from opaque_keys.edx.locator import LibraryLocatorV2, log
+from cms.djangoapps.contentstore.exams import User
 from path import Path
 
 from openedx_content.api import create_zip_file as create_lib_zip_file
@@ -39,3 +42,42 @@ def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
     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
+
+
+def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
+    """
+    Export a v2 library using the backup API.
+
+    V2 libraries are stored in Learning Core and use a zip-based backup mechanism.
+    This function creates a zip backup and extracts it to the specified directory.
+
+    Args:
+        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: Username string for the backup API (optional)
+
+    Raises:
+        Exception: If backup creation or extraction fails
+    """
+    # Get user object for backup API
+    user_obj = User.objects.filter(username=user).first()
+    temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
+
+    try:
+        # Target directory for extraction
+        target_dir = os.path.join(root_dir, library_dir)
+
+        # Create target directory if it doesn't exist
+        os.makedirs(target_dir, exist_ok=True)
+
+        # Extract zip contents (will overwrite existing files)
+        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+            zip_ref.extractall(target_dir)
+
+        log.info('Extracted library v2 backup to %s', target_dir)
+
+    finally:
+        # Cleanup temporary files
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)

openedx/core/djangoapps/content_libraries/tasks.py

@@ -71,7 +71,6 @@
 from cms.djangoapps.contentstore.storage import course_import_export_storage
 
 from . import api
-from .api import create_library_v2_zip
 from .models import ContentLibraryBlockImportTask
 
 log = logging.getLogger(__name__)
@@ -550,7 +549,7 @@ def backup_library(self, user_id: int, library_key_str: str) -> None:
         set_custom_attribute("exporting_started", str(library_key))
 
         user = User.objects.get(id=user_id)
-        _root_dir, file_path = create_library_v2_zip(library_key, user)
+        _root_dir, file_path = api.create_library_v2_zip(library_key, user)
         set_custom_attribute("exporting_completed", str(library_key))
 
         with open(file_path, 'rb') as zipfile: