bbbctl 0.4.2__tar.gz → 0.5.0__tar.gz

{bbbctl-0.4.2 → bbbctl-0.5.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: bbbctl
-Version: 0.4.2
+Version: 0.5.0
 Summary: BigBlueButton API command-line client
 Author-email: Marcel Hellkamp <marc@gsites.de>
-Requires-Python: >=3.6
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-Expression: MIT
 Classifier: Programming Language :: Python :: 3
@@ -92,7 +92,7 @@ for meeting in client.getMeetings():
 
 # License
 
-Copyright (c) 2020-2062, Marcel Hellkamp.
+Copyright (c) 2020-2026, Marcel Hellkamp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{bbbctl-0.4.2 → bbbctl-0.5.0}/README.md

@@ -78,7 +78,7 @@ for meeting in client.getMeetings():
 
 # License
 
-Copyright (c) 2020-2062, Marcel Hellkamp.
+Copyright (c) 2020-2026, Marcel Hellkamp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{bbbctl-0.4.2 → bbbctl-0.5.0}/pyproject.toml

@@ -6,10 +6,10 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "bbbctl"
-version = "0.4.2"
+version = "0.5.0"
 description = "BigBlueButton API command-line client"
 readme = "README.md"
-requires-python = ">=3.6"
+requires-python = ">=3.10"
 license = "MIT"
 authors = [
     { name = "Marcel Hellkamp", email = "marc@gsites.de" },

{bbbctl-0.4.2 → bbbctl-0.5.0}/src/bbbctl.py

@@ -319,8 +319,8 @@ CREATE_LOCKS = {
     "cam": "lockSettingsDisableCam",
     "mic": "lockSettingsDisableMic",
     "chat": "lockSettingsDisablePublicChat",
-    "pm": "lockSettingDisablePrivateChat",
-    "notes": "lockSettingDisableNotes",
+    "pm": "lockSettingsDisablePrivateChat",
+    "notes": "lockSettingsDisableNotes",
     "userlist": "lockSettingsHideUserList",
     "cursor": "lockSettingsHideViewersCursor",
 }
@@ -346,7 +346,7 @@ class BBBApiClient:
         self.api = api.rstrip("/")
         self.secret = secret
         self.ssl = ssl_context or ssl.create_default_context()
-        self.debug = max(0, debug)
+        self.debug = max(0, debug or 0)
 
     def makeurl(self, command, **query):
         query = urllib.parse.urlencode(
@@ -367,7 +367,7 @@ class BBBApiClient:
         with urllib.request.urlopen(url, context=self.ssl) as f:
             xml = f.read().decode("utf8")
         if self.debug >= 2:
-            for line in xml:
+            for line in xml.splitlines():
                 print(f"<<< {line}", file=sys.stderr)
         root = ET.fromstring(xml)
         if (status := root.find("./returncode")) is None or status.text != "SUCCESS":
@@ -412,8 +412,20 @@ class BBBApiClient:
 
 def build_parser():
 
-    def csv_type(value):
-        return value.split(",")
+    def csv_choice(choices):
+        choices = set(choices)
+
+        def parse(value):
+            items = [item.strip() for item in value.split(",") if item.strip()]
+            unknown = [item for item in items if item not in choices]
+            if unknown:
+                raise argparse.ArgumentTypeError(
+                    "invalid choice: %s (choose from %s)"
+                    % (", ".join(unknown), ", ".join(sorted(choices)))
+                )
+            return items
+
+        return parse
 
     def kv_type(value):
         k, _, v = value.partition("=")
@@ -422,7 +434,7 @@ def build_parser():
         return (k, v)
 
     parser = argparse.ArgumentParser()
-    main_sub = parser.add_subparsers(title="Commands")
+    main_sub = parser.add_subparsers(title="Commands", required=True)
 
     parser.add_argument(
         "--server",
@@ -456,7 +468,7 @@ def build_parser():
         "record",
         help="List, show, publish, unpublish or delete recordings",
     )
-    rec_sub = rec.add_subparsers(title="Manage recordings")
+    rec_sub = rec.add_subparsers(title="Manage recordings", required=True)
 
     cmd = rec_sub.add_parser("list", help="List all recordings")
     cmd.add_argument("--meeting", help="Filter by external meetingID")
@@ -481,7 +493,7 @@ def build_parser():
     meet = main_sub.add_parser(
         "meeting", help="List, inspect, create, join or end meetings"
     )
-    meet_sub = meet.add_subparsers()
+    meet_sub = meet.add_subparsers(required=True)
 
     cmd = meet_sub.add_parser("list", help="List meetings")
     cmd.add_argument("--sort", help="Sort by a specific key")
@@ -513,8 +525,7 @@ def build_parser():
     cmd.add_argument(
         "--lock",
         help="Shortcuts for --lockSettingsDisable... parameters.",
-        choices=list(CREATE_LOCKS.keys()),
-        type=csv_type,
+        type=csv_choice(CREATE_LOCKS.keys()),
     )
 
     cmd.add_argument(
@@ -528,15 +539,13 @@ def build_parser():
     cmd.add_argument(
         "--disabledFeatures",
         help="Disable features for this meeting. Set multiple values as comma-separated list.",
-        choices=CREATE_FEATURES,
-        type=csv_type,
+        type=csv_choice(CREATE_FEATURES),
     )
 
     cmd.add_argument(
         "--disabledFeaturesExclude",
         help="Remove featres from the --disabledFeatures list. Set multiple values as comma-separated list.",
-        choices=CREATE_FEATURES,
-        type=csv_type,
+        type=csv_choice(CREATE_FEATURES),
     )
 
     for name, (type_, help) in CREATE_PARAMS.items():
@@ -635,8 +644,6 @@ def find_bbb_property(name):
 def main():
     parser = build_parser()
     args = parser.parse_args()
-    if not hasattr(args, "cmd"):
-        parser.parse_args(sys.argv[1:] + ["-h"])
 
     server = (
         args.server
@@ -799,8 +806,8 @@ def cmd_meet_create(api, args):
     params = {"meetingID": args.id, "name": args.name}
 
     # Process --lock first so it can be overridden by explicit --no-lockSettingsBlaBla
-    for k, v in CREATE_LOCKS:
-        if k in args.lock:
+    for k, v in CREATE_LOCKS.items():
+        if k in (args.lock or []):
             params[v] = "true"
 
     # Apply all CREATE_PARAMS
@@ -814,25 +821,29 @@ def cmd_meet_create(api, args):
         params[name] = str(value)
 
     # Apply --meta key=value
-    for k, v in args.meta:
+    for k, v in args.meta or []:
         if v:
             params[f"meta_{k}"] = str(v)
 
     # Apply --disable feature,feature
     disabled = set()
     enabled = set()
-    for feature in args.disable or []:
+    for feature in args.disabledFeatures or []:
         if feature in CREATE_FEATURES:
             disabled.add(feature)
-    for feature in args.enabled or []:
+    for feature in args.disabledFeaturesExclude or []:
         if feature in CREATE_FEATURES:
             enabled.add(feature)
-            disabled.remove(feature)
+            disabled.discard(feature)
     if disabled:
         params["disabledFeatures"] = ",".join(sorted(disabled))
-    if disabled:
+    if enabled:
         params["disabledFeaturesExclude"] = ",".join(sorted(enabled))
 
+    # Apply raw key=value parameters last so they can override shortcuts.
+    for k, v in args.params:
+        params[k] = str(v)
+
     created = api.createMeeting(**params)
 
     if args.join:
@@ -897,7 +908,10 @@ def cmd_meet_nuke(api, args):
                     pass
                 else:
                     continue
-            api.end(meetingID=meeting.find("meetingID").text)
+            api.end(
+                meetingID=meeting.find("meetingID").text,
+                password=meeting.find("moderatorPW").text,
+            )
 
 
 def cmd_sign(api, args):