Chrome policies/Meet/Courses

taers232c · Sep 12, 2024 · 813e974 · 813e974
1 parent 8a1b81d
commit 813e974
Show file tree

Hide file tree

Showing 12 changed files with 810 additions and 180 deletions.
diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: taers232c.GAMADV-XTD3
-          release-tag: v6.80.21
+          release-tag: v6.81.00
           max-versions-to-keep: 1 # keep only latest versions
           installers-regex: '\.msi$'
           token: ${{ secrets.WINGET_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
@@ -101,10 +101,10 @@ script:
 
 before_deploy:
 # Comment out for Linux Xenial and Trusty
-#- yes | gem update --system --force
-#- gem install bundler
-#- gem install uri
-#- gem install logger
+- yes | gem update --system --force
+- gem install bundler
+- gem install uri
+- gem install logger
 - export TRAVIS_TAG="preview"
 - unset LD_LIBRARY_PATH
 
@@ -116,10 +116,10 @@ deploy:
   file: gamadv-xtd3-$GAMVERSION-*
   skip_cleanup: true
   draft: true
-#  edge: true
+  edge: true
 # Linux Xenial and Trusty
-  edge:
-    branch: v2.0.3-beta.4
+#  edge:
+#    branch: v2.0.3-beta.4
   on:
     repo: taers232c/GAMADV-XTD3
 
diff --git a/src/GamCommands.txt b/src/GamCommands.txt
@@ -2599,19 +2599,21 @@ gam create chromepolicyimage <ChromePolicyImageSchemaName> <FileName>
 
 gam update chromepolicy [convertcrnl]
         (<SchemaName> ((<Field> <Value>)+ | <JSONData>))+
-        ou|org|orgunit <OrgUnitItem> [(printerid <PrinterID>)|(appid <AppID>)]
+        ((ou|orgunit <OrgUnitItem>)|(cigroup <GroupItem>))
+        [(printerid <PrinterID>)|(appid <AppID>)]
 gam delete chromepolicy
         (<SchemaName> [<JSONData>])+
-        ou|org|orgunit <OrgUnitItem> [(printerid <PrinterID>)|(appid <AppID>)]
+        ((ou|orgunit <OrgUnitItem>)|(cigroup <GroupItem>))
+        [(printerid <PrinterID>)|(appid <AppID>)]
 gam show chromepolicies
-        ou|org|orgunit <OrgUnitItem> [(printerid <PrinterID>)|(appid <AppID>)]
-        [filter <String>] [namespace <NamespaceList>]
-        [show all|direct|inherited]
+        ((ou|orgunit <OrgUnitItem> [show all|direct|inherited])|(cigroup <GroupItem>))
+        [(printerid <PrinterID>)|(appid <AppID>)]
+        (filter <StringList>)* (namespace <NamespaceList>)*
         [formatjson]
 gam print chromepolicies [todrive <ToDriveAttribute>*]
-        ou|org|orgunit <OrgUnitItem> [(printerid <PrinterID>)|(appid <AppID>)]
-        [filter <String>] [namespace <NamespaceList>]
-        [show all|direct|inherited]
+        ((ou|orgunit <OrgUnitItem> [show all|direct|inherited])|(cigroup <GroupItem>))
+        [(printerid <PrinterID>)|(appid <AppID>)]
+        (filter <StringList>)* (namespace <NamespaceList>)*
         [[formatjson [quotechar <Character>]]
 
 <ChromePolicySchemaFieldName> ::=
@@ -3144,36 +3146,36 @@ gam print course-announcements [todrive <ToDriveAttribute>*]
         (announcementids <CourseAnnouncementIDEntity>)|((announcementstates <CourseAnnouncementStateList>)*
         (orderby <CourseAnnouncementOrderByFieldName> [ascending|descending])*)
         [showcreatoremails|creatoremail] [fields <CourseAnnouncementFieldNameList>]
-        [formatjson [quotechar <Character>]]
         [timefilter creationtime|updatetime|scheduledtime] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
+        [countsonly] [formatjson [quotechar <Character>]]
 gam print course-materials [todrive <ToDriveAttribute>*]
         (course|class <CourseEntity>)*|([teacher <UserItem>] [student <UserItem>] states <CourseStateList>])
         (materialids <CourseMaterialIDEntity>)|((materialstates <CourseMaterialStateList>)*
         (orderby <CourseMaterialOrderByFieldName> [ascending|descending])*)
         [showcreatoremails|creatoremail] [showtopicnames] [fields <CourseMaterialFieldNameList>]
-        [formatjson [quotechar <Character>]]
         [timefilter creationtime|updatetime|scheduledtime] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
+        [countsonly] [formatjson [quotechar <Character>]]
 gam print course-submissions [todrive <ToDriveAttribute>*]
         (course|class <CourseEntity>)*|([teacher <UserItem>] [student <UserItem>] states <CourseStateList>])
         (workids <CourseWorkIDEntity>)|((workstates <CourseWorkStateList>)*
         (orderby <CourseWorkOrderByFieldName> [ascending|descending])*)
         (submissionids <CourseSubmissionIDEntity>)|((submissionstates <CourseSubmissionStateList>)*) [late|notlate]
         [fields <CourseSubmissionFieldNameList>]
-        [formatjson [quotechar <Character>]] [showuserprofile]
         [timefilter creationtime|updatetime] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
+        [countsonly] [formatjson [quotechar <Character>]]
 gam print course-topics [todrive <ToDriveAttribute>*]
         (course|class <CourseEntity>)*|([teacher <UserItem>] [student <UserItem>] states <CourseStateList>])
         [topicids <CourseTopicIDEntity>]
-        [formatjson [quotechar <Character>]]
         [timefilter updatetime] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
+        [countsonly] [formatjson [quotechar <Character>]]
 gam print course-works [todrive <ToDriveAttribute>*]
         (course|class <CourseEntity>)*|([teacher <UserItem>] [student <UserItem>] states <CourseStateList>])
         (workids <CourseWorkIDEntity>)|((workstates <CourseWorkStateList>)*
         (orderby <CourseWorkOrderByFieldName> [ascending|descending])*)
         [showcreatoremails|creatoremail] [showtopicnames] [fields <CourseWorkFieldNameList>]
         [showstudentsaslist [<Boolean>]] [delimiter <Character>]
-        [formatjson [quotechar <Character>]]
         [timefilter creationtime|updatetime|scheduledtime] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
+        [countsonly] [formatjson [quotechar <Character>]]
 
 # Classroom - Invitations
 
@@ -6062,7 +6064,7 @@ gam <UserTypeEntity> print focustime|outofoffice|workinglocation
         [showdayofweek]
         [formatjson [quotechar <Character>]] [todrive <ToDriveAttribute>*]
 
-# Users Chat
+# Users - Chat
 
 <ChatContent> ::=
         ((text <String>)|
@@ -7794,6 +7796,52 @@ gam <UserTypeEntity> show lookerstudiopermissions
         [role editor|owner|viewer]
         [formatjson]
 
+# Users - Meet
+
+<MeetConferenceName> ::= conferenceRecords/<String>
+<MeetSpaceName> ::= spaces/<String> | <String>
+<MeetSpaceOptions> ::=
+        accesstype open|trusted|restricted |
+        entrypointaccess all|creatorapponly
+
+gam <UserTypeEntity> create meetspace
+        <MeetSpaceOptions>*
+        [formatjson]
+
+gam <UserTypeEntity> update meetspace <MeetSpaceName>
+        <MeetSpaceOptions>*
+        [formatjson]
+
+gam <UserTypeEntity> info meetspace <MeetSpaceName>
+        [formatjson]
+
+gam <UserTypeEntity> end meetconference <MeetSpaceName>
+
+gam <UserItem> show meetconferences
+        [space <MeetSpaceName>] [code <String>]
+        [andquery|orquery <String>] [querytime<String> <Time>]
+        [formatjson]
+gam <UserItem> print meetconferences [todrive <ToDriveAttribute>*]
+        [andquery|orquery <String>] [querytime<String> <Time>]
+        [formatjson [quotechar <Character>]]
+
+gam <UserItem> show meetparticipants <MeetConferenceName>
+        [query <String>] [querytime<String> <Time>]
+        [formatjson]
+gam <UserItem> print meetparticipants <MeetConferenceName> [todrive <ToDriveAttribute>*]
+        [query <String>] [querytime<String> <Time>]
+        [formatjson [quotechar <Character>]]
+
+gam <UserItem> show meetrecordings <MeetConferenceName>
+        [formatjson]
+gam <UserItem> print meetrecordings <MeetConferenceName> [todrive <ToDriveAttribute>*]
+        [formatjson [quotechar <Character>]]
+
+gam <UserItem> show meettranscripts <MeetConferenceName>
+        [formatjson]
+gam <UserItem> print meettranscripts <MeetConferenceName> [todrive <ToDriveAttribute>*]
+        [formatjson [quotechar <Character>]]
+
 # Users - Contacts and Profiles
 
 <PeopleContactAttribute> ::=

diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
@@ -1,13 +1,31 @@
+6.81.00
+
+Added support for groups when defining Chrome policies.
+
+Added support for the Meet API.
+
+* See: https://github.com/taers232c/GAMADV-XTD3/wiki/Users-Meet
+
+Added option `countsonly` to the following course commands that displays
+the number of items in a course but not the details of the items.
+```
+gam print course-announcements
+gam print course-materials
+gam print course-submissions
+gam print course-topics
+gam print course-work
+```
+
 6.80.21
 
-Updated `gam <UserTypeEntity> archive messages` to handle the followong error:
+Updated `gam <UserTypeEntity> archive messages` to handle the following error:
 ```
 googleapiclient.errors.MediaUploadSizeError: Media larger than: 26214400
 ```
 
 6.80.20
 
-Updated `gam report usage user` and `gam report users` to handle the followong error:
+Updated `gam report usage user` and `gam report users` to handle the following error:
 ```
 ERROR: 503: serviceNotAvailable - The service is currently unavailable.
 ```

diff --git a/src/gam.spec b/src/gam.spec
@@ -21,6 +21,7 @@ hiddenimports = [
      'gam.gamlib.yubikey',
      ]
 
+print(f"datas before analysis:\n{datas}")
 a = Analysis(
     ['gam/__main__.py'],
     pathex=[],
@@ -36,10 +37,12 @@ a = Analysis(
     cipher=None,
     noarchive=False,
     )
+print(f"datas from analysis:\n{a.datas}")
 for d in a.datas:
     if 'pyconfig' in d[0]:
         a.datas.remove(d)
         break
+print(f"datas after pyconfig cleanup:\n{a.datas}")
 pyz = PYZ(a.pure,
           a.zipped_data,
           cipher=None)