canvaslms 5.4__py3-none-any.whl → 5.6__py3-none-any.whl

canvaslms/cli/modules.nw

@@ -486,6 +486,14 @@ def get_item_modules(course, item_type, item_id):
   Returns:
       List of module names containing this item
   """
+  target_url = None
+  if item_type == 'Page':
+    try:
+      target_url = course.get_page(item_id).url
+    except Exception:
+      # If we can't resolve the target page, fall back to raw comparisons.
+      target_url = item_id
+
   modules = []
   for module in course.get_modules():
     try:
@@ -514,10 +522,10 @@ elif item_type == 'Page':
     if item.page_url == item_id:
       modules.append(module.name)
       break
-    # Check if URLs resolve to same page (handles redirects)
+    # Compare canonical URLs to avoid duplicates when Canvas redirects old slugs.
     try:
       resolved_page = course.get_page(item.page_url)
-      if resolved_page.url == item_id:
+      if resolved_page.url == target_url:
         modules.append(module.name)
         break
     except Exception:
@@ -598,11 +606,18 @@ with its new canonical URL.
 Without handling this, the direct comparison [[item.page_url == item_id]] would
 fail, causing the page to be added to the module again (creating duplicates).
 
-To detect this, we fetch the page using the module item's [[page_url]] and
-compare its canonical [[url]] attribute with [[item_id]]. This adds an API call
-per page item, but only when the direct comparison fails.
+To detect this, we fetch both the target page ([[item_id]]) and the module
+item's page ([[item.page_url]]) and compare canonical [[url]] values. This adds
+API calls, but only when the direct comparison fails.
 <<find current module item if present>>=
 current_item = None
+canonical_page_url = None
+if item_type == 'Page':
+  try:
+    canonical_page_url = course.get_page(item_id).url
+  except Exception:
+    canonical_page_url = item_id
+
 try:
   for item in module.get_module_items():
     if not hasattr(item, 'type') or item.type != item_type:
@@ -625,10 +640,10 @@ Canvas has created a redirect from an old URL to a new one.
 if item.page_url == item_id:
   current_item = item
   break
-# URLs don't match directly; check if they resolve to same page
+# URLs don't match directly; compare canonical URLs to avoid duplicates.
 try:
   resolved_page = course.get_page(item.page_url)
-  if resolved_page.url == item_id:
+  if resolved_page.url == canonical_page_url:
     current_item = item
     break
 except Exception:

canvaslms/cli/modules.py

@@ -198,6 +198,14 @@ def get_item_modules(course, item_type, item_id):
     Returns:
         List of module names containing this item
     """
+    target_url = None
+    if item_type == "Page":
+        try:
+            target_url = course.get_page(item_id).url
+        except Exception:
+            # If we can't resolve the target page, fall back to raw comparisons.
+            target_url = item_id
+
     modules = []
     for module in course.get_modules():
         try:
@@ -213,10 +221,10 @@ def get_item_modules(course, item_type, item_id):
                         if item.page_url == item_id:
                             modules.append(module.name)
                             break
-                        # Check if URLs resolve to same page (handles redirects)
+                        # Compare canonical URLs to avoid duplicates when Canvas redirects old slugs.
                         try:
                             resolved_page = course.get_page(item.page_url)
-                            if resolved_page.url == item_id:
+                            if resolved_page.url == target_url:
                                 modules.append(module.name)
                                 break
                         except Exception:
@@ -254,6 +262,13 @@ def update_item_modules(course, item_type, item_id, module_regexes):
 
     for module in all_modules:
         current_item = None
+        canonical_page_url = None
+        if item_type == "Page":
+            try:
+                canonical_page_url = course.get_page(item_id).url
+            except Exception:
+                canonical_page_url = item_id
+
         try:
             for item in module.get_module_items():
                 if not hasattr(item, "type") or item.type != item_type:
@@ -267,10 +282,10 @@ def update_item_modules(course, item_type, item_id, module_regexes):
                         if item.page_url == item_id:
                             current_item = item
                             break
-                        # URLs don't match directly; check if they resolve to same page
+                        # URLs don't match directly; compare canonical URLs to avoid duplicates.
                         try:
                             resolved_page = course.get_page(item.page_url)
-                            if resolved_page.url == item_id:
+                            if resolved_page.url == canonical_page_url:
                                 current_item = item
                                 break
                         except Exception: