deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 01:41:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixed bug in `gam <UserTypeEntity> print|show filesharecounts

Browse Source
This commit is contained in:
Ross Scroggs
2024-06-12 20:57:36 -07:00
parent 6d25ada6a4
commit 12c150f64d
10 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/GamUpdate.txt
View File

@@ -2,18 +2,11 @@
Merged GAM-Team version
6.77.00
6.76.15
Added option `asadmin` to the following Chat commands that allows admin access.
These commands are in Developer Preview, your project must have Developer Preview enabled for the Chat API
in order to use these commands.
```
gam <UserTypeEntity> delete chatspace asadmin
gam <UserTypeEntity> print|show chatspaces asadmin
gam <UserTypeEntity> create chatmember asadmin
gam <UserTypeEntity> delete|remove chatmember asadmin
gam <UserTypeEntity> print|show chatmembers|asadmin
```
Fixed bug in `gam <UserTypeEntity> print|show filesharecounts summary only summaryuser <String>`
that printed an erroneous row if `<UserTypeEntity>` specified a single user and `<String>` matched
the user's email address.
6.76.14

6
src/gam/__init__.py
View File

@@ -30278,7 +30278,7 @@ def doCreateGroup(ciGroupsAPI=False):
callGAPI(gs.groups(), 'update',
bailOnInvalidError='messageModerationLevel' in settings,
throwReasons=GAPI.GROUP_SETTINGS_THROW_REASONS,
retryReasons=GAPI.GROUP_SETTINGS_RETRY_REASONS+[GAPI.NOT_FOUND,GAPI.INVALID_ARGUMENT],
retryReasons=GAPI.GROUP_SETTINGS_RETRY_REASONS+[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT],
groupUniqueId=mapGroupEmailForSettings(groupEmail), body=settings, fields='')
entityActionPerformed([entityType, groupEmail])
except (GAPI.alreadyExists, GAPI.duplicate):
@@ -54853,7 +54853,7 @@ def printShowFileCounts(users):
def showMimeTypeInfo(user, mimeTypeInfo, sharedDriveId, sharedDriveName, i, count):
if summary != FILECOUNT_SUMMARY_NONE:
if user != summaryUser:
if count != 0:
for mimeType, mtinfo in iter(mimeTypeInfo.items()):
summaryMimeTypeInfo.setdefault(mimeType, {'count': 0, 'size': 0})
summaryMimeTypeInfo[mimeType]['count'] += mtinfo['count']
@@ -55264,7 +55264,7 @@ def printShowFileShareCounts(users):
def showShareCounts(user, shareCounts, i, count):
if summary != FILECOUNT_SUMMARY_NONE:
if user != summaryUser:
if count != 0:
for field, shareCount in iter(shareCounts.items()):
summaryShareCounts[field] += shareCount
if summary == FILECOUNT_SUMMARY_ONLY:

2
src/gam/gamlib/glentity.py
View File

@@ -84,6 +84,7 @@ class GamEntity():
CHANNEL_PRODUCT = 'chpr'
CHANNEL_SKU = 'chsk'
CHAT_BOT = 'chbo'
CHAT_ADMIN = 'chad'
CHAT_EVENT = 'chev'
CHAT_MANAGER_USER = 'chgu'
CHAT_MEMBER = 'chme'
@@ -424,6 +425,7 @@ class GamEntity():
CHANNEL_PRODUCT: ['Channel Products', 'Channel Product'],
CHANNEL_SKU: ['Channel SKUs', 'Channel SKU'],
CHAT_BOT: ['Chat BOTs', 'Chat BOT'],
CHAT_ADMIN: ['Chat Admins', 'Chat Admin'],
CHAT_EVENT: ['Chat Events', 'Chat Event'],
CHAT_MANAGER_USER: ['Chat User Managers', 'Chat User Manager'],
CHAT_MESSAGE: ['Chat Messages', 'Chat Message'],

1
src/gam/gamlib/glmsgs.py
View File

@@ -186,6 +186,7 @@ BATCH_NOT_PROCESSED_ERRORS = '{0}batch file: {1}, not processed, {2} {3}\n'
CALLING_GCLOUD_FOR_REAUTH = 'Calling gcloud for reauth credentials..."\n'
CAN_NOT_DELETE_USER_WITH_VAULT_HOLD = '{0}: The user may be (or have recently been) on Google Vault Hold and thus not eligible for deletion. You can check holds with "gam user {1} show vaultholds".'
CAN_NOT_BE_SPECIFIED_MORE_THAN_ONCE = 'Argument {0} can not be specified more than once'
CHAT_ADMIN_ACCESS_LIMITED_TO_ONE_USER = 'Chat adminaccess|asadmin limited to one user, {0} specified'
CHROME_TARGET_VERSION_FORMAT = r'^([a-z]+)-(\d+)$ or ^(\d{1,4}\.){1,4}$'
COLUMN_DOES_NOT_MATCH_ANY_INPUT_COLUMNS = '{0} column "{1}" does not match any input columns'
COLUMN_DOES_NOT_MATCH_ANY_OUTPUT_COLUMNS = '{0} column "{1}" does not match any output columns'