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

canvaslms/cli/modules.nw

@@ -501,16 +501,27 @@ def get_item_modules(course, item_type, item_id):
 
 The matching logic differs by item type.
 For assignments, Canvas stores the assignment ID in [[content_id]].
-For pages, Canvas stores the URL slug in [[page_url]].
+For pages, Canvas stores the URL slug in [[page_url]]. However, Canvas may
+redirect old URLs to new ones, so we need to resolve the URL before comparing
+(see [[<<check if page item matches by resolving url>>]]).
 <<check if item matches and add module to list>>=
 if item_type == 'Assignment':
   if hasattr(item, 'content_id') and item.content_id == item_id:
     modules.append(module.name)
     break
 elif item_type == 'Page':
-  if hasattr(item, 'page_url') and item.page_url == item_id:
-    modules.append(module.name)
-    break
+  if hasattr(item, 'page_url'):
+    if item.page_url == item_id:
+      modules.append(module.name)
+      break
+    # Check if URLs resolve to same page (handles redirects)
+    try:
+      resolved_page = course.get_page(item.page_url)
+      if resolved_page.url == item_id:
+        modules.append(module.name)
+        break
+    except Exception:
+      pass
 @
 
 \subsection{Updating module membership based on patterns}
@@ -575,6 +586,21 @@ for module in all_modules:
 @
 
 We search the module's items to find if our item is currently present.
+
+For pages, we need to handle URL redirects. Canvas may store an old URL in the
+module item that redirects to the canonical URL we're checking against. For
+example, a page might have been added to a module with URL
+\enquote{page-on-campus+zoom}, but Canvas later changed the canonical URL to
+\enquote{page-on-zoom+campus}. The module item still stores the old URL, but
+when we fetch the page using [[course.get_page()]], Canvas returns the page
+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.
 <<find current module item if present>>=
 current_item = None
 try:
@@ -586,13 +612,29 @@ try:
         current_item = item
         break
     elif item_type == 'Page':
-      if hasattr(item, 'page_url') and item.page_url == item_id:
-        current_item = item
-        break
+      if hasattr(item, 'page_url'):
+        <<check if page item matches by resolving url>>
 except Exception:
   pass
 @
 
+When comparing page URLs, we first try a direct match. If that fails, we fetch
+the page to get its canonical URL and compare that. This handles the case where
+Canvas has created a redirect from an old URL to a new one.
+<<check if page item matches by resolving url>>=
+if item.page_url == item_id:
+  current_item = item
+  break
+# URLs don't match directly; check if they resolve to same page
+try:
+  resolved_page = course.get_page(item.page_url)
+  if resolved_page.url == item_id:
+    current_item = item
+    break
+except Exception:
+  pass  # Page doesn't exist or can't be fetched
+@
+
 Finally, we add or remove based on comparing current vs desired state.
 When adding, we use [[create_module_item]] with the appropriate type and ID.
 When removing, we call [[delete()]] on the module item object.

canvaslms/cli/modules.py

@@ -209,9 +209,18 @@ def get_item_modules(course, item_type, item_id):
                         modules.append(module.name)
                         break
                 elif item_type == "Page":
-                    if hasattr(item, "page_url") and item.page_url == item_id:
-                        modules.append(module.name)
-                        break
+                    if hasattr(item, "page_url"):
+                        if item.page_url == item_id:
+                            modules.append(module.name)
+                            break
+                        # Check if URLs resolve to same page (handles redirects)
+                        try:
+                            resolved_page = course.get_page(item.page_url)
+                            if resolved_page.url == item_id:
+                                modules.append(module.name)
+                                break
+                        except Exception:
+                            pass
         except Exception:
             # Skip modules we can't access
             pass
@@ -254,9 +263,18 @@ def update_item_modules(course, item_type, item_id, module_regexes):
                         current_item = item
                         break
                 elif item_type == "Page":
-                    if hasattr(item, "page_url") and item.page_url == item_id:
-                        current_item = item
-                        break
+                    if hasattr(item, "page_url"):
+                        if item.page_url == item_id:
+                            current_item = item
+                            break
+                        # URLs don't match directly; check if they resolve to same page
+                        try:
+                            resolved_page = course.get_page(item.page_url)
+                            if resolved_page.url == item_id:
+                                current_item = item
+                                break
+                        except Exception:
+                            pass  # Page doesn't exist or can't be fetched
         except Exception:
             pass
         should_be_in = module.id in matching_module_ids

canvaslms/cli/pages.nw

@@ -523,6 +523,11 @@ title to find the page. This is the most common case when creating or updating
 pages from Markdown files: the user specifies a title in the front matter and
 expects the command to find or create a page with that title.
 
+This behavior is critical for safety. Without it, the command would fall back to
+filter-based matching with the default [[-p '.*']] pattern, which matches
+\emph{all} pages in the course. The result would be catastrophic: every page
+would be overwritten with the content from the file.
+
 We use exact title matching (not regex) to avoid accidentally updating multiple
 pages. If exactly one page matches, we update it. If no pages match and
 [[--create]] is specified, we create a new page. If multiple pages match, we