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

Clean up permissions display in show fileinfo

Browse Source
This commit is contained in:
Ross Scroggs
2025-11-06 13:57:56 -08:00
parent c59398791b
commit f20520b3a7
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GamUpdate.txt
View File

@@ -1,3 +1,8 @@
7.28.01
Updated `gam <UserTypeEntity> show fileinfo <DriveFileEntity>` to display `displayName` as the key field
of a `permission` not `deleted`.
7.28.00 7.28.00
Added option `addcsvdata <FieldName> <String>` to `gam report [usage] customers|users` Added option `addcsvdata <FieldName> <String>` to `gam report [usage] customers|users`

24
src/gam/__init__.py
View File

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
""" """
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>' __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
__version__ = '7.28.00' __version__ = '7.28.01'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
#pylint: disable=wrong-import-position #pylint: disable=wrong-import-position
@@ -9177,7 +9177,7 @@ def flattenJSON(topStructure, flattened=None,
# Show a json object # Show a json object
def showJSON(showName, showValue, skipObjects=None, timeObjects=None, def showJSON(showName, showValue, skipObjects=None, timeObjects=None,
simpleLists=None, dictObjectsKey=None, sortDictKeys=True): simpleLists=None, dictObjectsKey=None, sortDictKeys=True):
def _show(objectName, objectValue, subObjectKey, level, subSkipObjects): def _show(objectName, objectValue, subObjectKey, subObjectName, level, subSkipObjects):
if objectName in subSkipObjects: if objectName in subSkipObjects:
return return
if objectName is not None: if objectName is not None:
@@ -9200,10 +9200,12 @@ def showJSON(showName, showValue, skipObjects=None, timeObjects=None,
if isinstance(subValue, (str, bool, float, int)): if isinstance(subValue, (str, bool, float, int)):
printKeyValueList([subValue]) printKeyValueList([subValue])
else: else:
_show(None, subValue, subObjectKey, level+1, DEFAULT_SKIP_OBJECTS) _show(None, subValue, subObjectKey, objectName, level+1, DEFAULT_SKIP_OBJECTS)
if objectName is not None: if objectName is not None:
Ind.Decrement() Ind.Decrement()
elif isinstance(objectValue, dict): elif isinstance(objectValue, dict):
if not subObjectKey:
subObjectKey = dictObjectsKey.get(subObjectName)
indentAfterFirst = unindentAfterLast = False indentAfterFirst = unindentAfterLast = False
if objectName is not None: if objectName is not None:
printBlankLine() printBlankLine()
@@ -9211,13 +9213,23 @@ def showJSON(showName, showValue, skipObjects=None, timeObjects=None,
elif level > 0: elif level > 0:
indentAfterFirst = unindentAfterLast = True indentAfterFirst = unindentAfterLast = True
subObjects = sorted(objectValue) if sortDictKeys else objectValue.keys() subObjects = sorted(objectValue) if sortDictKeys else objectValue.keys()
if subObjectKey and (subObjectKey in subObjects): if subObjectKey:
if subObjectKey in subObjects:
subObjects.remove(subObjectKey) subObjects.remove(subObjectKey)
subObjects.insert(0, subObjectKey) subObjects.insert(0, subObjectKey)
subObjectKey = None subObjectKey = None
elif subObjectName == 'permissions': # subObjectKey in displayName
if 'id' in objectValue:
if objectValue['id'] == 'anyone':
objectValue[subObjectKey] = 'Anyone'
elif objectValue['id'] == 'anyoneWithLink':
objectValue[subObjectKey] = 'Anyone with Link'
else:
objectValue[subObjectKey] = objectValue['id']
subObjects.insert(0, subObjectKey)
for subObject in subObjects: for subObject in subObjects:
if subObject not in subSkipObjects: if subObject not in subSkipObjects:
_show(subObject, objectValue[subObject], subObjectKey, level+1, DEFAULT_SKIP_OBJECTS) _show(subObject, objectValue[subObject], subObjectKey, None, level+1, DEFAULT_SKIP_OBJECTS)
if indentAfterFirst: if indentAfterFirst:
Ind.Increment() Ind.Increment()
indentAfterFirst = False indentAfterFirst = False
@@ -9244,7 +9256,7 @@ def showJSON(showName, showValue, skipObjects=None, timeObjects=None,
timeObjects = timeObjects or set() timeObjects = timeObjects or set()
simpleLists = simpleLists or set() simpleLists = simpleLists or set()
dictObjectsKey = dictObjectsKey or {} dictObjectsKey = dictObjectsKey or {}
_show(showName, showValue, None, 0, DEFAULT_SKIP_OBJECTS.union(skipObjects or set())) _show(showName, showValue, None, None, 0, DEFAULT_SKIP_OBJECTS.union(skipObjects or set()))
class FormatJSONQuoteChar(): class FormatJSONQuoteChar():