From 2260e7df5036e57cf11dc76bdcf3c067c09443b3 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 21 Mar 2024 11:42:12 -0700 Subject: [PATCH] Updated `` to include `cpuinfo` and `backlightinfo`. --- docs/ChromeOS-Devices.md | 2 ++ docs/GamUpdates.md | 4 +++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 +-- docs/Users-Chat.md | 6 ++-- docs/Users-Drive-Files-Display.md | 44 ++++++++++++++++++------ docs/Version-and-Help.md | 12 +++---- src/GamCommands.txt | 2 ++ src/GamUpdate.txt | 4 +++ src/gam/__init__.py | 2 ++ 9 files changed, 58 insertions(+), 22 deletions(-) diff --git a/docs/ChromeOS-Devices.md b/docs/ChromeOS-Devices.md index 8a9c09be..4edc5b68 100644 --- a/docs/ChromeOS-Devices.md +++ b/docs/ChromeOS-Devices.md @@ -105,7 +105,9 @@ The second form is backwards compatible with Standard GAM and selection with `` to include `cpuinfo` and `backlightinfo`. + ### 6.71.17 Added `depth` column to output of `gam print diskusage ` that can diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 2ad23ad5..b79715d0 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.18 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -1006,7 +1006,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.18 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-Chat.md b/docs/Users-Chat.md index e26dc701..d9acc360 100644 --- a/docs/Users-Chat.md +++ b/docs/Users-Chat.md @@ -92,21 +92,21 @@ gam create chatspace [formatjson|returnidonly] ``` For `type space`, the following apply: -* `member ` - Optional, can not specify more that 20 users +* `members ` - Optional, can not specify more that 20 users * `displayname ` - Required * `description ` - Optional * `guidelines ` - Optional * `history ` - Optional For `type groupchat`, the following apply: -* `member ` - Required, must specify between 2 and 20 users +* `members ` - Required, must specify between 2 and 20 users * `displayname ` - Ignored * `description ` - Optional * `guidelines ` - Optional * `history ` - Optional For `type directmessage`, the following apply: -* `member ` - Required, must specify 1 user +* `members ` - Required, must specify 1 user * `displayname ` - Ignored * `description ` - Ignored * `guidelines ` - Ignored diff --git a/docs/Users-Drive-Files-Display.md b/docs/Users-Drive-Files-Display.md index c9c3f51e..a58595f0 100644 --- a/docs/Users-Drive-Files-Display.md +++ b/docs/Users-Drive-Files-Display.md @@ -1542,6 +1542,10 @@ For each folder in ``, the following items are displayed: * `totalFileCount` - The number of files directly in the folder and all of its subfolders * `totalFileSize` - The sum of the sizes of the files directly in the folder and all of its subfolders * `totalFolderCount` - The number of folders directly in the folder and all of its subfolders +* `depth` - The depth of the folder + * `-1` - The top level folder + * `0` - Immediate children of the top level folder + * `1` - Immediate children of level 0 folders * `path` - The path of the folder There is a final row detailing files and folders in the trash; it is omitted if `excludetrashed` or `show summary` are specified. @@ -1558,8 +1562,13 @@ There is a final row detailing files and folders in the trash; it is omitted if * `totalFileCount` - The number of files in the trash * `totalFileSize` - The sum of the sizes of the files in the trash * `totalFolderCount` - The number of folders in the trash +* `depth` - Always -1 * `path` - Trash +GAM version `6.71.17` added the `depth` column that can be used to filter the depth of the folders displayed. +Depth `-1` is the top level folder, depth `0` are its immediate children, depth `2` are the children of depth `1` and so forth. +For example to limit the display to the top folder and its immediate children, use `config csv_output_row_filter depth:count<1`. + By default, files owned by the user are counted. These options update the current query with the desired ownership. * `showownedby me` - Count files owned by the user; this is the default * `showownedby any` or `anyowner` - Count files accessible by the user @@ -1589,24 +1598,37 @@ Use the `show` option to control the display of data: $ gam redirect csv ./MyDriveUsage.csv user testsimple@domain.com print diskusage mydrive User: testsimple@domain.com, Print 1 Drive Disk Usage $ more MyDriveUsage.csv -User,Owner,id,name,ownedByMe,trashed,explicitlyTrashed,directFileCount,directFileSize,directFolderCount,totalFileCount,totalFileSize,totalFolderCount,path -testsimple@domain.com,testsimple@domain.com,012YenC8f12ALUk9PVA,My Drive,,False,False,100,138212,24,167,189598,79,My Drive -testsimple@domain.com,testsimple@domain.com,456YenC8f12ALfndaQ1NHc0RtUG92Y1BIUUl4bjVBRmNkWG5oakNqVVFDcXJWOHNmdFlwZmc,Classroom,True,False,False,0,0,15,9,6840,17,My Drive/Classroom +User,Owner,id,name,ownedByMe,trashed,explicitlyTrashed,directFileCount,directFileSize,directFolderCount,totalFileCount,totalFileSize,totalFolderCount,depth,path +testsimple@domain.com,testsimple@domain.com,012YenC8f12ALUk9PVA,My Drive,,False,False,100,138212,24,167,189598,79,-1,My Drive +testsimple@domain.com,testsimple@domain.com,456YenC8f12ALfndaQ1NHc0RtUG92Y1BIUUl4bjVBRmNkWG5oakNqVVFDcXJWOHNmdFlwZmc,Classroom,True,False,False,0,0,15,9,6840,17,0,My Drive/Classroom +testsimple@domain.com,testsimple@domain.com,0B3YenC8f12ALfmRuX3I4WFlqaTRnMGhXNkVvWV9UUG1zRDQwY1BwVkJhUGx5WHVIcjJKZUU,TestUpdate,True,False,False,2,3420,0,2,3420,0,1,My Drive/Classroom/TestUpdate +testsimple@domain.com,testsimple@domain.com,1MT5xJ897oYa0Q2OuzBDfLHvig6k_b0EKaovVA2imGYcnrmqZu5hjlJkEPMH-rHKj4qDyy9_j,TS Course,True,False,False,0,0,0,0,0,0,1,My Drive/Classroom/TS Course +testsimple@domain.com,testsimple@domain.com,1gsbqsbhhwBx9hCF0sqtE213tpUn6Ebj2klLFhHb4xkzBKIdEFkvvwCVtZpYWPgOA796fIPEN,TS Course 2,True,False,False,0,0,0,0,0,0,1,My Drive/Classroom/TS Course 2 ... -testsimple@domain.com,testsimple@domain.com,1bHS_Tp77W3KSGRNSs_jP1RhAJhIGRCaI,XferFolder,True,False,False,1,1024,0,1,1024,0,My Drive/XferFolder -testsimple@domain.com,testsimple@domain.com,Trash,Trash,,True,True,0,0,1,3,3072,9,Trash +testsimple@domain.com,testsimple@domain.com,1bHS_Tp77W3KSGRNSs_jP1RhAJhIGRCaI,XferFolder,True,False,False,1,1024,0,1,1024,0,0,My Drive/XferFolder +testsimple@domain.com,testsimple@domain.com,Trash,Trash,,True,True,0,0,1,3,3072,9,-1,Trash + +$ gam config csv_output_row_filter "depth:count<1" redirect csv ./MyDriveUsage.csv user testsimple@domain.com print diskusage mydrive +User: testsimple@domain.com, Print 1 Drive Disk Usage +$ more MyDriveUsage.csv +User,Owner,id,name,ownedByMe,trashed,explicitlyTrashed,directFileCount,directFileSize,directFolderCount,totalFileCount,totalFileSize,totalFolderCount,depth,path +testsimple@domain.com,testsimple@domain.com,012YenC8f12ALUk9PVA,My Drive,,False,False,100,138212,24,167,189598,79,-1,My Drive +testsimple@domain.com,testsimple@domain.com,456YenC8f12ALfndaQ1NHc0RtUG92Y1BIUUl4bjVBRmNkWG5oakNqVVFDcXJWOHNmdFlwZmc,Classroom,True,False,False,0,0,15,9,6840,17,0,My Drive/Classroom +... +testsimple@domain.com,testsimple@domain.com,1bHS_Tp77W3KSGRNSs_jP1RhAJhIGRCaI,XferFolder,True,False,False,1,1024,0,1,1024,0,0,My Drive/XferFolder +testsimple@domain.com,testsimple@domain.com,Trash,Trash,,True,True,0,0,1,3,3072,9,-1,Trash $ gam redirect csv ./MyDriveUsage.csv user testsimple@domain.com print diskusage mydrive show summaryandtrash User: testsimple@domain.com, Print 1 Drive Disk Usage $ more MyDriveUsage.csv -User,Owner,id,name,ownedByMe,trashed,explicitlyTrashed,directFileCount,directFileSize,directFolderCount,totalFileCount,totalFileSize,totalFolderCount,path -testsimple@domain.com,testsimple@domain.com,012YenC8f12ALUk9PVA,My Drive,,False,False,100,138212,24,167,189598,79,My Drive -testsimple@domain.com,testsimple@domain.com,Trash,Trash,,True,True,0,0,1,3,3072,9,Trash +User,Owner,id,name,ownedByMe,trashed,explicitlyTrashed,directFileCount,directFileSize,directFolderCount,totalFileCount,totalFileSize,totalFolderCount,depth,path +testsimple@domain.com,testsimple@domain.com,012YenC8f12ALUk9PVA,My Drive,,False,False,100,138212,24,167,189598,79,-1,My Drive +testsimple@domain.com,testsimple@domain.com,Trash,Trash,,True,True,0,0,1,3,3072,9,-1,Trash $ gam redirect csv ./MyDriveUsage.csv user testsimple@domain.com print diskusage shareddriveid 0AL5LiIe4dqxZUk9PVA show summaryandtrash User: testsimple@domain.com, Print 1 Drive Disk Usage $ more MyDriveUsage.csv -User,id,name,trashed,explicitlyTrashed,directFileCount,directFileSize,directFolderCount,totalFileCount,totalFileSize,totalFolderCount,path -testsimple@domain.com,0125LiIe4dqxZUk9PVA,TS Shared Drive 1,False,False,16,6144,7,42,73799,25,SharedDrives/TS Shared Drive 1 -testsimple@domain.com,Trash,Trash,True,True,1,1024,0,1,1024,0,Trash +User,id,name,trashed,explicitlyTrashed,directFileCount,directFileSize,directFolderCount,totalFileCount,totalFileSize,totalFolderCount,depth,path +testsimple@domain.com,0125LiIe4dqxZUk9PVA,TS Shared Drive 1,False,False,16,6144,7,42,73799,25,-1,SharedDrives/TS Shared Drive 1 +testsimple@domain.com,Trash,Trash,True,True,1,1024,0,1,1024,0,-1,Trash ``` diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 3d1513aa..1fbb1c1c 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.18 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.18 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.18 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.71.17 + Latest: 6.71.18 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.71.17 +6.71.18 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.71.18 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 diff --git a/src/GamCommands.txt b/src/GamCommands.txt index 6b87aff1..4bcdafaa 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -2224,7 +2224,9 @@ gam update + [quickcrosmove []] [nobatc annotatedlocation|location| annotateduser|user| autoupdateexpiration| + backlightinfo| bootmode| + cpuinfo| cpustatusreports| deprovisionreason| devicefiles| diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index d520afb8..2618569f 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,10 @@ Merged GAM-Team version +6.71.18 + +Updated `` to include `cpuinfo` and `backlightinfo`. + 6.71.17 Added `depth` column to output of `gam print diskusage ` that can diff --git a/src/gam/__init__.py b/src/gam/__init__.py index bc15eb8d..6b958fbd 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -23116,7 +23116,9 @@ CROS_FIELDS_CHOICE_MAP = { 'asset': 'annotatedAssetId', 'assetid': 'annotatedAssetId', 'autoupdateexpiration': 'autoUpdateExpiration', + 'backlightinfo': 'backlightInfo', 'bootmode': 'bootMode', + 'cpuinfo': 'cpuInfo', 'cpustatusreports': 'cpuStatusReports', 'deprovisionreason': 'deprovisionReason', 'devicefiles': ['deviceFiles.type', 'deviceFiles.createTime'],