deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-05 05:11:35 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Update __init__.py

Browse Source
This commit is contained in:
Ross Scroggs
2026-06-05 09:18:39 -07:00
parent 85cfd13e77
commit a61bbdb858
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/gam/__init__.py
View File

@@ -48102,7 +48102,28 @@ def doPrintUsers(entityList=None):
ensure_ascii=False, sort_keys=True) ensure_ascii=False, sort_keys=True)
csvPF.WriteRowNoFilter(row) csvPF.WriteRowNoFilter(row)
def _getDisabledTimeStr(userEntity):
disabledTimeStr = ''
if isDisabled or (isSuspended and isArchived):
if 'suspensionTime' in userEntity:
if 'archivalTime' in userEntity:
disabledTimeStr = min(userEntity['suspensionTime'], userEntity['archivalTime'])
else:
disabledTimeStr = userEntity['suspensionTime']
userEntity['archivalTime'] = ''
elif 'archivalTime' in userEntity:
disabledTimeStr = userEntity['archivalTime']
userEntity['suspensionTime'] = ''
elif isSuspended:
if 'suspensionTime' in userEntity:
disabledTimeStr = userEntity['suspensionTime']
else: #isArchived
if 'archivalTime' in userEntity:
disabledTimeStr = userEntity['archivalTime']
return disabledTimeStr
def _printUser(userEntity, i, count): def _printUser(userEntity, i, count):
getDisabledTime = isDisabled or isSuspended or isArchived
if disabledAfterTime is not None or disabledBeforeTime is not None: if disabledAfterTime is not None or disabledBeforeTime is not None:
if not (isDisabled or isSuspended or isArchived): if not (isDisabled or isSuspended or isArchived):
return return
@@ -48118,27 +48139,8 @@ def doPrintUsers(entityList=None):
return return
if (isArchived and not ('archived' in userEntity and userEntity['archived'])): if (isArchived and not ('archived' in userEntity and userEntity['archived'])):
return return
if isDisabled or (isSuspended and isArchived): disabledTimeStr = _getDisabledTimeStr(userEntity)
if 'suspensionTime' in userEntity: if not disabledTimeStr:
if 'archivalTime' in userEntity:
disabledTimeStr = min(userEntity['suspensionTime'], userEntity['archivalTime'])
else:
disabledTimeStr = userEntity['suspensionTime']
userEntity['archivalTime'] = ''
elif 'archivalTime' in userEntity:
disabledTimeStr = userEntity['archivalTime']
userEntity['suspensionTime'] = ''
else:
return
elif isSuspended:
if 'suspensionTime' in userEntity:
disabledTimeStr = userEntity['suspensionTime']
else:
return
else: #isArchived
if 'archivalTime' in userEntity:
disabledTimeStr = userEntity['archivalTime']
else:
return return
try: try:
disabledTime = arrow.get(disabledTimeStr) disabledTime = arrow.get(disabledTimeStr)
@@ -48148,6 +48150,7 @@ def doPrintUsers(entityList=None):
except (arrow.parser.ParserError, OverflowError): except (arrow.parser.ParserError, OverflowError):
return return
userEntity.update({'disabled': True, 'disabledTime': disabledTimeStr}) userEntity.update({'disabled': True, 'disabledTime': disabledTimeStr})
getDisabledTime = False
showUser = True showUser = True
elif isDisabled is not None: elif isDisabled is not None:
if isDisabled: if isDisabled:
@@ -48159,20 +48162,26 @@ def doPrintUsers(entityList=None):
if showUser and userEntity['primaryEmail'] in archivedSuspendedUsers: if showUser and userEntity['primaryEmail'] in archivedSuspendedUsers:
return return
archivedSuspendedUsers.add(userEntity['primaryEmail']) archivedSuspendedUsers.add(userEntity['primaryEmail'])
userEntity['disabled'] = isDisabled
elif (isSuspended is None and isArchived is None): elif (isSuspended is None and isArchived is None):
showUser = True showUser = True
elif (isSuspended is not None and isArchived is None): elif (isSuspended is not None and isArchived is None):
showUser = isSuspended == userEntity.get('suspended', False) showUser = isSuspended == userEntity.get('suspended', False)
userEntity['disabled'] = isSuspended
elif (isSuspended is None and isArchived is not None): elif (isSuspended is None and isArchived is not None):
showUser = isArchived == userEntity.get('archived', False) showUser = isArchived == userEntity.get('archived', False)
userEntity['disabled'] = isArchived
else: # (isSuspended is not None and isArchived is not None) else: # (isSuspended is not None and isArchived is not None)
showUser = ((isSuspended == userEntity.get('suspended', False)) and showUser = ((isSuspended == userEntity.get('suspended', False)) and
(isArchived == userEntity.get('archived', False))) (isArchived == userEntity.get('archived', False)))
if showUser and userEntity['primaryEmail'] in archivedSuspendedUsers: if showUser and userEntity['primaryEmail'] in archivedSuspendedUsers:
return return
archivedSuspendedUsers.add(userEntity['primaryEmail']) archivedSuspendedUsers.add(userEntity['primaryEmail'])
userEntity['disabled'] = isSuspended or isArchived
if not showUser: if not showUser:
return return
if getDisabledTime:
userEntity['disabledTime'] = _getDisabledTimeStr(userEntity)
if getIsGuestUser and 'isGuestUser' not in userEntity: if getIsGuestUser and 'isGuestUser' not in userEntity:
userEntity['isGuestUser'] = False userEntity['isGuestUser'] = False
if showValidColumn: if showValidColumn: