deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-04 03:33:44 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

gam print devices clientstates

Browse Source
This commit is contained in:
Jay Lee
2025-06-26 15:14:33 +00:00
parent a51b245015
commit cbd04bcec4
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/GamCommands.txt
View File

@ -4124,6 +4124,7 @@ gam print devices [todrive <ToDriveAttribute>*]
[orderby <DeviceOrderByFieldName> [ascending|descending]] [orderby <DeviceOrderByFieldName> [ascending|descending]]
[all|company|personal|nocompanydevices|nopersonaldevices] [all|company|personal|nocompanydevices|nopersonaldevices]
[nodeviceusers|oneuserperrow] [nodeviceusers|oneuserperrow]
[clientstates]
[formatjson [quotechar <Character>]] [formatjson [quotechar <Character>]]
[showitemcountonly] [showitemcountonly]

4
src/GamUpdate.txt
View File

@ -1,3 +1,7 @@
7.10.06
"gam print devices clientstates" to include client states in device output
7.10.05 7.10.05
Google renamed an error: cannotModifyInheritedTeamDrivePermission became cannotModifyInheritedPermission. Google renamed an error: cannotModifyInheritedTeamDrivePermission became cannotModifyInheritedPermission.

34
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.10.05' __version__ = '7.10.06'
__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
@ -29508,6 +29508,7 @@ def getCIDeviceEntity():
return ([], ci, customer, False) return ([], ci, customer, False)
DEVICE_USERNAME_PATTERN = re.compile(r'^(devices/.+)/(deviceUsers/.+)$') DEVICE_USERNAME_PATTERN = re.compile(r'^(devices/.+)/(deviceUsers/.+)$')
DEVICE_USERNAME_CLIENT_STATE_PATTERN = re.compile(r'^(devices/.+/deviceUsers/.+)/clientStates/(.+)$')
DEVICE_USERNAME_FORMAT_REQUIRED = 'devices/<String>/deviceUsers/<String>' DEVICE_USERNAME_FORMAT_REQUIRED = 'devices/<String>/deviceUsers/<String>'
def getCIDeviceUserEntity(): def getCIDeviceUserEntity():
ci = buildGAPICIDeviceServiceObject() ci = buildGAPICIDeviceServiceObject()
@ -29956,6 +29957,7 @@ DEVICE_ORDERBY_CHOICE_MAP = {
# [orderby <DeviceOrderByFieldName> [ascending|descending]] # [orderby <DeviceOrderByFieldName> [ascending|descending]]
# [all|company|personal|nocompanydevices|nopersonaldevices] # [all|company|personal|nocompanydevices|nopersonaldevices]
# [nodeviceusers|oneuserperrow] # [nodeviceusers|oneuserperrow]
# [clientstates]
# [formatjson [quotechar <Character>]] # [formatjson [quotechar <Character>]]
# [showitemcountonly] # [showitemcountonly]
def doPrintCIDevices(): def doPrintCIDevices():
@ -29971,6 +29973,7 @@ def doPrintCIDevices():
queries = [None] queries = [None]
view, entityType = DEVICE_VIEW_CHOICE_MAP['all'] view, entityType = DEVICE_VIEW_CHOICE_MAP['all']
getDeviceUsers = True getDeviceUsers = True
getClientStates = False
oneUserPerRow = showItemCountOnly = False oneUserPerRow = showItemCountOnly = False
while Cmd.ArgumentsRemaining(): while Cmd.ArgumentsRemaining():
myarg = getArgument() myarg = getArgument()
@ -29986,6 +29989,8 @@ def doPrintCIDevices():
view, entityType = DEVICE_VIEW_CHOICE_MAP[myarg] view, entityType = DEVICE_VIEW_CHOICE_MAP[myarg]
elif myarg == 'nodeviceusers': elif myarg == 'nodeviceusers':
getDeviceUsers = False getDeviceUsers = False
elif myarg == 'clientstates':
getClientStates = True
elif myarg in {'oneuserperrow', 'oneitemperrow'}: elif myarg in {'oneuserperrow', 'oneitemperrow'}:
getDeviceUsers = oneUserPerRow = True getDeviceUsers = oneUserPerRow = True
elif getFieldsList(myarg, DEVICE_FIELDS_CHOICE_MAP, fieldsList, initialField='name'): elif getFieldsList(myarg, DEVICE_FIELDS_CHOICE_MAP, fieldsList, initialField='name'):
@ -30004,14 +30009,16 @@ def doPrintCIDevices():
if FJQC.formatJSON and oneUserPerRow: if FJQC.formatJSON and oneUserPerRow:
csvPF.SetJSONTitles(['name', 'user.name', 'JSON']) csvPF.SetJSONTitles(['name', 'user.name', 'JSON'])
itemCount = 0 itemCount = 0
throwReasons = [GAPI.INVALID, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED]
retryReasons = GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS
for query in queries: for query in queries:
printGettingAllAccountEntities(entityType, query) printGettingAllAccountEntities(entityType, query)
pageMessage = getPageMessage() pageMessage = getPageMessage()
try: try:
devices = callGAPIpages(ci.devices(), 'list', 'devices', devices = callGAPIpages(ci.devices(), 'list', 'devices',
pageMessage=pageMessage, pageMessage=pageMessage,
throwReasons=[GAPI.INVALID, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED], throwReasons=throwReasons,
retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS, retryReasons=retryReasons,
customer=customer, filter=query, customer=customer, filter=query,
orderBy=OBY.orderBy, view=view, fields=fields, pageSize=100) orderBy=OBY.orderBy, view=view, fields=fields, pageSize=100)
if showItemCountOnly: if showItemCountOnly:
@ -30030,10 +30037,27 @@ def doPrintCIDevices():
try: try:
deviceUsers = callGAPIpages(ci.devices().deviceUsers(), 'list', 'deviceUsers', deviceUsers = callGAPIpages(ci.devices().deviceUsers(), 'list', 'deviceUsers',
pageMessage=pageMessage, pageMessage=pageMessage,
throwReasons=[GAPI.INVALID, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED], throwReasons=throwReasons,
retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS, retryReasons=retryReasons,
customer=customer, filter=query, parent=parent, customer=customer, filter=query, parent=parent,
orderBy=OBY.orderBy, fields=userFields, pageSize=20) orderBy=OBY.orderBy, fields=userFields, pageSize=20)
if getClientStates:
printGettingAllAccountEntities(Ent.DEVICE_USER_CLIENT_STATE, None)
states = callGAPIpages(ci.devices().deviceUsers().clientStates(), 'list', 'clientStates',
pageMessage=pageMessage,
throwReasons=throwReasons,
retryReasons=retryReasons,
customer=customer, filter=query, parent='devices/-/deviceUsers/-')
for state in states:
mg = DEVICE_USERNAME_CLIENT_STATE_PATTERN.match(state['name'])
if mg:
du = mg.group(1)
state_name = mg.group(2)
for i in range(len(deviceUsers)):
if deviceUsers[i]['name'] == du:
deviceUsers[i].setdefault('clientstates', {})
deviceUsers[i]['clientstates'][state_name] = state
break
for deviceUser in deviceUsers: for deviceUser in deviceUsers:
mg = DEVICE_USERNAME_PATTERN.match(deviceUser['name']) mg = DEVICE_USERNAME_PATTERN.match(deviceUser['name'])
if mg: if mg: