canvaslms 5.10__py3-none-any.whl → 6.1__py3-none-any.whl

canvaslms/cli/quizzes.nw

@@ -3204,6 +3204,11 @@ def _parse_quiz_full_format(data, format_type):
 
     if 'settings' in data:
         settings = data['settings'].copy()
+        # Allow metadata (like id/regex) at the top level.
+        # This makes the format more forgiving for hand-edited files.
+        for k in ('id', 'regex', 'title'):
+            if k in data and k not in settings:
+                settings[k] = data[k]
     else:
         # Simple format: entire dict is settings (excluding metadata keys)
         settings = {k: v for k, v in data.items()
@@ -3252,6 +3257,13 @@ FILE MODE (-f):
   The JSON/YAML format is the same as 'quizzes export' output, enabling
   a round-trip workflow: export, modify, edit.
 
+  When using -f, the -a/--assignment selector is optional if the file provides
+  enough information to identify the quiz. We use the first available of:
+    - settings.id (exact ID match)
+    - settings.regex (regex matching title or ID)
+    - settings.title (exact title match; errors if duplicate titles exist
+      within a course)
+
 ITEM HANDLING:
   By default, items/questions in the file are ignored to protect student
   submissions. Use --replace-items to replace all questions (with confirmation
@@ -3266,7 +3278,13 @@ try:
 except argparse.ArgumentError:
   pass
 
-add_quiz_option(edit_parser, required=True)
+# NOTE: We intentionally do not call add_quiz_option(required=False) here.
+# That helper defaults to '.*', which would select all quizzes if -a is
+# omitted. For quizzes edit, -a is required only in interactive mode.
+edit_parser.add_argument("-a", "--assignment",
+    required=False,
+    default=None,
+    help="Regex matching quiz title or Canvas ID")
 
 edit_parser.add_argument("-f", "--file",
     help="Read content from file (format auto-detected: .json, .yaml, .yml, .md)",
@@ -3299,12 +3317,14 @@ In file mode, we read the content from the specified file.
 <<functions>>=
 def edit_command(config, canvas, args):
   """Edits quiz settings and instructions"""
-  quiz_list = process_quiz_option(canvas, args)
   requester = canvas._Canvas__requester
 
   if args.file:
     <<edit quiz from file>>
   else:
+    if not getattr(args, 'assignment', None):
+      canvaslms.cli.err(1, "-a/--assignment is required unless -f/--file is used")
+    quiz_list = process_quiz_option(canvas, args)
     <<edit quiz interactively>>
 @
 
@@ -3329,21 +3349,80 @@ except ValueError as e:
 <<apply settings from file>>
 @
 
-We extract [[id]] from either the top level or the settings:
+We can identify the target quiz in two ways:
+\begin{description}
+\item[By command-line selector] If [[-a/--assignment]] is provided, we select
+  quizzes using that regex (matching quiz title or ID), just like interactive
+  mode.
+\item[By file metadata] If [[-a]] is omitted, the file must provide one of
+  [[settings.id]], [[settings.regex]], or [[settings.title]].  This is the same
+  idea as the [[regex]] field used by [[pages]] and [[assignments]]: we preserve
+  the user's selection expression so scripted edits stay stable.
+\end{description}
 
 <<identify target quiz from file data>>=
-settings = quiz_data['settings']
-quiz_id = settings.get('id')
+settings = quiz_data.get('settings') or {}
+course_list = courses.process_course_option(canvas, args)
+
+if getattr(args, 'assignment', None):
+  quiz_list = list(filter_quizzes(course_list, args.assignment))
+  if not quiz_list:
+    canvaslms.cli.err(1, f"No quiz found matching: {args.assignment}")
+else:
+  quiz_id = settings.get('id')
+  quiz_regex = settings.get('regex')
+  quiz_title = settings.get('title')
+
+  if quiz_id is not None and str(quiz_id).strip() != "":
+    quiz_list = []
+    for course in course_list:
+      for quiz in fetch_all_quizzes(course):
+        if str(quiz.id) == str(quiz_id):
+          quiz.course = course
+          quiz_list.append(quiz)
+    if not quiz_list:
+      canvaslms.cli.err(1, f"Quiz with ID {quiz_id} not found")
+    if len(quiz_list) > 1:
+      canvaslms.cli.err(1, f"Multiple quizzes match ID {quiz_id}")
+  elif quiz_regex is not None and str(quiz_regex).strip() != "":
+    quiz_list = list(filter_quizzes(course_list, str(quiz_regex)))
+    if not quiz_list:
+      canvaslms.cli.err(1, f"No quiz found matching file regex: {quiz_regex}")
+  elif quiz_title is not None and str(quiz_title).strip() != "":
+    quiz_list = []
+    title = str(quiz_title)
+    for course in course_list:
+      matches = [q for q in fetch_all_quizzes(course)
+                 if getattr(q, 'title', None) == title]
+      for q in matches:
+        q.course = course
+      if len(matches) > 1:
+        canvaslms.cli.err(
+          1,
+          f"Multiple quizzes titled '{title}' in course {course.course_code}. "
+          "Use settings.regex (or -a) to disambiguate."
+        )
+      if matches:
+        quiz_list.extend(matches)
+
+    if not quiz_list:
+      canvaslms.cli.err(1, f"No quiz found with title: {title}")
+  else:
+    canvaslms.cli.err(
+      1,
+      "File mode without -a requires one of settings.id, settings.regex, "
+      "or settings.title"
+    )
 
-if quiz_id:
-  target_quiz = None
+if len(quiz_list) > 1:
+  print(f"Found {len(quiz_list)} quizzes to update:")
   for quiz in quiz_list:
-    if str(quiz.id) == str(quiz_id):
-      target_quiz = quiz
-      break
-  if not target_quiz:
-    canvaslms.cli.err(1, f"Quiz with ID {quiz_id} not found")
-  quiz_list = [target_quiz]
+    course_code = quiz.course.course_code if hasattr(quiz, 'course') else "?"
+    print(f"  - {course_code}: {quiz.title} (ID: {quiz.id})")
+  response = input("\nEdit all? [y/N] ").strip().lower()
+  if response != 'y':
+    print("Aborted.")
+    return
 @
 
 If [[--replace-items]] is specified and the file contains items, we replace
@@ -4056,7 +4135,7 @@ def quiz_attributes_to_api_params(attributes, is_new, html_body):
   params = {}
 
   for key, value in attributes.items():
-    if key == 'id':
+    if key in ('id', 'regex', 'modules'):
       # Don't send ID as an update parameter
       continue
 
@@ -4374,6 +4453,10 @@ def export_command(config, canvas, args):
   if not quiz_list:
     canvaslms.cli.err(1, f"No quiz found matching: {args.assignment}")
 
+  if len(quiz_list) > 1:
+    canvaslms.cli.err(1, f"Multiple quizzes match '{args.assignment}'. "
+                         "Please use a more specific pattern.")
+
   quiz = quiz_list[0]
   requester = canvas._Canvas__requester
   include_banks = args.include_banks and not args.no_banks
@@ -4385,6 +4468,9 @@ def export_command(config, canvas, args):
   else:
     export = export_full_classic_quiz(quiz, importable)
 
+  # Preserve the user's selection expression for round-trip syncing.
+  export.setdefault('settings', {})['regex'] = args.assignment
+
   # Output as JSON
   print(json.dumps(export, indent=2, ensure_ascii=False))
 @

canvaslms/cli/quizzes.py

@@ -2380,6 +2380,11 @@ def _parse_quiz_full_format(data, format_type):
 
     if "settings" in data:
         settings = data["settings"].copy()
+        # Allow metadata (like id/regex) at the top level.
+        # This makes the format more forgiving for hand-edited files.
+        for k in ("id", "regex", "title"):
+            if k in data and k not in settings:
+                settings[k] = data[k]
     else:
         # Simple format: entire dict is settings (excluding metadata keys)
         settings = {
@@ -2402,7 +2407,6 @@ def _parse_quiz_full_format(data, format_type):
 
 def edit_command(config, canvas, args):
     """Edits quiz settings and instructions"""
-    quiz_list = process_quiz_option(canvas, args)
     requester = canvas._Canvas__requester
 
     if args.file:
@@ -2413,18 +2417,75 @@ def edit_command(config, canvas, args):
         except ValueError as e:
             canvaslms.cli.err(1, f"Invalid file format: {e}")
 
-        settings = quiz_data["settings"]
-        quiz_id = settings.get("id")
+        settings = quiz_data.get("settings") or {}
+        course_list = courses.process_course_option(canvas, args)
+
+        if getattr(args, "assignment", None):
+            quiz_list = list(filter_quizzes(course_list, args.assignment))
+            if not quiz_list:
+                canvaslms.cli.err(1, f"No quiz found matching: {args.assignment}")
+        else:
+            quiz_id = settings.get("id")
+            quiz_regex = settings.get("regex")
+            quiz_title = settings.get("title")
+
+            if quiz_id is not None and str(quiz_id).strip() != "":
+                quiz_list = []
+                for course in course_list:
+                    for quiz in fetch_all_quizzes(course):
+                        if str(quiz.id) == str(quiz_id):
+                            quiz.course = course
+                            quiz_list.append(quiz)
+                if not quiz_list:
+                    canvaslms.cli.err(1, f"Quiz with ID {quiz_id} not found")
+                if len(quiz_list) > 1:
+                    canvaslms.cli.err(1, f"Multiple quizzes match ID {quiz_id}")
+            elif quiz_regex is not None and str(quiz_regex).strip() != "":
+                quiz_list = list(filter_quizzes(course_list, str(quiz_regex)))
+                if not quiz_list:
+                    canvaslms.cli.err(
+                        1, f"No quiz found matching file regex: {quiz_regex}"
+                    )
+            elif quiz_title is not None and str(quiz_title).strip() != "":
+                quiz_list = []
+                title = str(quiz_title)
+                for course in course_list:
+                    matches = [
+                        q
+                        for q in fetch_all_quizzes(course)
+                        if getattr(q, "title", None) == title
+                    ]
+                    for q in matches:
+                        q.course = course
+                    if len(matches) > 1:
+                        canvaslms.cli.err(
+                            1,
+                            f"Multiple quizzes titled '{title}' in course {course.course_code}. "
+                            "Use settings.regex (or -a) to disambiguate.",
+                        )
+                    if matches:
+                        quiz_list.extend(matches)
+
+                if not quiz_list:
+                    canvaslms.cli.err(1, f"No quiz found with title: {title}")
+            else:
+                canvaslms.cli.err(
+                    1,
+                    "File mode without -a requires one of settings.id, settings.regex, "
+                    "or settings.title",
+                )
 
-        if quiz_id:
-            target_quiz = None
+        if len(quiz_list) > 1:
+            print(f"Found {len(quiz_list)} quizzes to update:")
             for quiz in quiz_list:
-                if str(quiz.id) == str(quiz_id):
-                    target_quiz = quiz
-                    break
-            if not target_quiz:
-                canvaslms.cli.err(1, f"Quiz with ID {quiz_id} not found")
-            quiz_list = [target_quiz]
+                course_code = (
+                    quiz.course.course_code if hasattr(quiz, "course") else "?"
+                )
+                print(f"  - {course_code}: {quiz.title} (ID: {quiz.id})")
+            response = input("\nEdit all? [y/N] ").strip().lower()
+            if response != "y":
+                print("Aborted.")
+                return
         items = quiz_data.get("items")
         if args.replace_items and items:
             for quiz in quiz_list:
@@ -2455,6 +2516,9 @@ def edit_command(config, canvas, args):
             else:
                 canvaslms.cli.warn(f"Failed to update quiz: {quiz.title}")
     else:
+        if not getattr(args, "assignment", None):
+            canvaslms.cli.err(1, "-a/--assignment is required unless -f/--file is used")
+        quiz_list = process_quiz_option(canvas, args)
         # Confirm if multiple quizzes match
         if len(quiz_list) > 1:
             print(f"Found {len(quiz_list)} quizzes matching the pattern:")
@@ -3008,7 +3072,7 @@ def quiz_attributes_to_api_params(attributes, is_new, html_body):
     params = {}
 
     for key, value in attributes.items():
-        if key == "id":
+        if key in ("id", "regex", "modules"):
             # Don't send ID as an update parameter
             continue
 
@@ -3189,6 +3253,13 @@ def export_command(config, canvas, args):
     if not quiz_list:
         canvaslms.cli.err(1, f"No quiz found matching: {args.assignment}")
 
+    if len(quiz_list) > 1:
+        canvaslms.cli.err(
+            1,
+            f"Multiple quizzes match '{args.assignment}'. "
+            "Please use a more specific pattern.",
+        )
+
     quiz = quiz_list[0]
     requester = canvas._Canvas__requester
     include_banks = args.include_banks and not args.no_banks
@@ -3200,6 +3271,9 @@ def export_command(config, canvas, args):
     else:
         export = export_full_classic_quiz(quiz, importable)
 
+    # Preserve the user's selection expression for round-trip syncing.
+    export.setdefault("settings", {})["regex"] = args.assignment
+
     # Output as JSON
     print(json.dumps(export, indent=2, ensure_ascii=False))
 
@@ -5423,6 +5497,13 @@ def add_edit_command(subp):
     The JSON/YAML format is the same as 'quizzes export' output, enabling
     a round-trip workflow: export, modify, edit.
 
+    When using -f, the -a/--assignment selector is optional if the file provides
+    enough information to identify the quiz. We use the first available of:
+      - settings.id (exact ID match)
+      - settings.regex (regex matching title or ID)
+      - settings.title (exact title match; errors if duplicate titles exist
+        within a course)
+
   ITEM HANDLING:
     By default, items/questions in the file are ignored to protect student
     submissions. Use --replace-items to replace all questions (with confirmation
@@ -5438,7 +5519,16 @@ def add_edit_command(subp):
     except argparse.ArgumentError:
         pass
 
-    add_quiz_option(edit_parser, required=True)
+    # NOTE: We intentionally do not call add_quiz_option(required=False) here.
+    # That helper defaults to '.*', which would select all quizzes if -a is
+    # omitted. For quizzes edit, -a is required only in interactive mode.
+    edit_parser.add_argument(
+        "-a",
+        "--assignment",
+        required=False,
+        default=None,
+        help="Regex matching quiz title or Canvas ID",
+    )
 
     edit_parser.add_argument(
         "-f",

{canvaslms-5.10.dist-info → canvaslms-6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: canvaslms
-Version: 5.10
+Version: 6.1
 Summary: Command-line interface to Canvas LMS
 License-Expression: MIT
 License-File: LICENSE

{canvaslms-5.10.dist-info → canvaslms-6.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
 canvaslms/Makefile,sha256=9zE09HzyU-S2B1RI72UV1S9mmqXKiE9gIn-NuhyQP08,119
 canvaslms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 canvaslms/cli/Makefile,sha256=8uQf6xKYRr_4mrYA-FnYYh7xAq7CcBvF3rbqDTNLUyY,820
-canvaslms/cli/__init__.py,sha256=AI7_1x4LfsQxpBX10_MMNn6Mlraw02Q2zcrk-erVK-U,6759
-canvaslms/cli/assignments.nw,sha256=bgKytV48ya0cGJsuur6sIZ_V7ZvuNR1qF7qPvg1xf2U,54781
-canvaslms/cli/assignments.py,sha256=gphQuMgB0H_y-w4flidu9QRPREheBtuLF8zg70-9gZs,38754
+canvaslms/cli/__init__.py,sha256=uIL-Urx6Spw1qSEZDYw2yTA54cAt9UYEIti25csjTno,7050
+canvaslms/cli/assignments.nw,sha256=gJj0_FEEMHkatLRtdZp7VrAD8Y0YPYH7v-LqnPzvuBc,59127
+canvaslms/cli/assignments.py,sha256=y4_jWUFKFhcjkmxvBmVXJ3hF9gDMb8yLLJHvqKXc7YU,47393
 canvaslms/cli/cache.nw,sha256=TV9nUkwSUrFyltH98uUJ-3BLXT_-yNGsilaFlbByaxU,13350
 canvaslms/cli/cache.py,sha256=EBD2YLYa7Efq_RWsDgZOf44SaUemsyPWgeYVS-eW1uk,8217
 canvaslms/cli/calendar.nw,sha256=-dN8Sx9LWGBwhq2wc3w0GjQL3ywwPKfvi9gjsRJ6qVg,22887
 canvaslms/cli/calendar.py,sha256=f8af6McSxg5G2Etf6TAxwp1cnYodlcyw7SJgcJJLBks,20898
 canvaslms/cli/canvas_calendar.py,sha256=AbA6nOZ7e-zACfAqwK1utBjuShVGsaERxIJ4xRKEUZc,22196
-canvaslms/cli/cli.nw,sha256=JrPmqzm-0E4Jyk58U5XFGb7ArYGiu7SN6G7xRtTEerQ,24348
-canvaslms/cli/content.nw,sha256=hg_KBHAPXTGyZFMV2Y96oE3VUHaVxsY2hvJBQDDHvOA,36995
-canvaslms/cli/content.py,sha256=OQiyhtwNenOZ1V0665f7p9VE9P3Zz3AX6vIzz0VqpKo,17362
+canvaslms/cli/cli.nw,sha256=S7cq2H-4LirgQIr8UlsOA2u7jDFurw5q1VY8xt3jjHc,24916
+canvaslms/cli/content.nw,sha256=C0hIYuEfMHI4z2Q0FquWpga3Nrr3Auo8GCR3ptfht9M,46917
+canvaslms/cli/content.py,sha256=KlwTrcC7ILZoTWXvSAjInoFguN31VqZrzSX12g32Cxs,20077
 canvaslms/cli/courses.nw,sha256=W8hNE8wQYPoSRDbqdU_qFvmOFWF6mRap0NLaz-edHH0,14569
 canvaslms/cli/courses.py,sha256=XKeV43xNT1or_qv40_IATJgey2zbVEg8qHqnz-Z7qUo,3743
 canvaslms/cli/discussions.nw,sha256=woTvzURp10kimseuYTZs2RTFpCKnpxCsCnDTFK_4jNI,46687
@@ -22,10 +22,10 @@ canvaslms/cli/login.nw,sha256=93LyHO_LXL1WdEvMg3OLhWulgkdoO8pfjYZVLwUbX4I,4419
 canvaslms/cli/login.py,sha256=wbA5Q9fTsW1J-vraRcdq2kG4h_LFtvH_MTEay6h8GcE,2737
 canvaslms/cli/modules.nw,sha256=rvrZe4AU_ok955GZ_ZwwFNFIHIKzft1LR9zTVLW_gic,24122
 canvaslms/cli/modules.py,sha256=8fZpW_x7eUMUgcn8JrvbGuwtrmHsbVdNvqfcRgfF4x8,12953
-canvaslms/cli/pages.nw,sha256=ZCv1NAwwXRzSy27ePJ3CI1ET1BBZJsM2scnoZxCW4n4,28959
-canvaslms/cli/pages.py,sha256=7E6gjEfs3L6A9_c84gRHvx7auDDV7MQWUXDwQ2-dkz4,27750
-canvaslms/cli/quizzes.nw,sha256=Jwne15UNJeumvNQZ9Su1nXBp7w54sI5K5MEZmZYWWh4,265048
-canvaslms/cli/quizzes.py,sha256=qLkLHpKpwbn4B_TpuaemQ6gwXQP1Gnho6zmWUMvX69k,199089
+canvaslms/cli/pages.nw,sha256=_6f1X4kh1MqDZRxhtXSWPHx4i6GkpjvSKFqE8NA7Njk,31223
+canvaslms/cli/pages.py,sha256=5FGb3iXhF3GgvA9DqA_kGTLEUaT4r3fUgjSo4Zvb4jg,28922
+canvaslms/cli/quizzes.nw,sha256=0_21aFzNPjQBYXHrPQeWWXzWO638zlGfnWM09sLiScE,268816
+canvaslms/cli/quizzes.py,sha256=gH4HnDvM2YBVIaleQ5iR1JFybM1iM3fDF5sZ-3QoJIo,203234
 canvaslms/cli/results.nw,sha256=6i2tfIOZ86WpEfx4OmJrk8aJyXl8gGh86bLX3pscFXA,28563
 canvaslms/cli/results.py,sha256=a-Xy5Z0OMCRwA08nX8RkCyCjipGkKJqtljjo7YIKFh0,17049
 canvaslms/cli/results.py.broken,sha256=njHu8mKfPHqH4daxy-4LMpO6FdUBLPHiVKFFmyH8aJQ,13047
@@ -59,8 +59,8 @@ canvaslms/hacks/attachment_cache.py,sha256=LcOZqaa6jPrEJWUD-JYN5GTc3bxCbv2fr_vqu
 canvaslms/hacks/canvasapi.nw,sha256=ixmIHn4tgy-ZKtQ1rqWSw97hfY2m0qtGX0de2x89lwA,136470
 canvaslms/hacks/canvasapi.py,sha256=A-r48x7gO6143_QkuZ8n6EW66i-a2AXXr7X7oeehOAU,31868
 canvaslms/hacks/test_hacks.py,sha256=JSJNvZqHu1E_s51HsPD7yr1gC-R-xVe-tuMMAKU9Gj8,66709
-canvaslms-5.10.dist-info/METADATA,sha256=Gob4TKBlMmIZ0rAP2bZ6HYYpkguKio11OJJTB7IaOVY,6079
-canvaslms-5.10.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-canvaslms-5.10.dist-info/entry_points.txt,sha256=lyblfkLbodN5yb7q1c6-rwIoJPV-ygXrB9PYb5boHXM,48
-canvaslms-5.10.dist-info/licenses/LICENSE,sha256=N_TKsbzzD5Ax5fWJqEQk9bkwtf394MJkNeFld4HV6-E,1074
-canvaslms-5.10.dist-info/RECORD,,
+canvaslms-6.1.dist-info/METADATA,sha256=Ae-_3M9DEoiXGx5dBZ2fPIxT2dZ4_NF2Udi-cg-THYQ,6078
+canvaslms-6.1.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+canvaslms-6.1.dist-info/entry_points.txt,sha256=lyblfkLbodN5yb7q1c6-rwIoJPV-ygXrB9PYb5boHXM,48
+canvaslms-6.1.dist-info/licenses/LICENSE,sha256=N_TKsbzzD5Ax5fWJqEQk9bkwtf394MJkNeFld4HV6-E,1074
+canvaslms-6.1.dist-info/RECORD,,