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

Handle info user/group arguments better in whatis

Browse Source
This commit is contained in:
Ross Scroggs
2016-04-15 15:06:34 -07:00
parent 457feac4ac
commit 6c3a0e2b71
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gam.py
View File

@@ -6414,30 +6414,33 @@ def doGetUserInfo(user_email=None):
projection = u'full' projection = u'full'
customFieldMask = viewType = None customFieldMask = viewType = None
while i < len(sys.argv): while i < len(sys.argv):
if sys.argv[i].lower() == u'noaliases': myarg = sys.argv[i].lower()
if myarg == u'noaliases':
getAliases = False getAliases = False
i += 1 i += 1
elif sys.argv[i].lower() == u'nogroups': elif myarg == u'nogroups':
getGroups = False getGroups = False
i += 1 i += 1
elif sys.argv[i].lower() in [u'nolicenses', u'nolicences']: elif myarg in [u'nolicenses', u'nolicences']:
getLicenses = False getLicenses = False
i += 1 i += 1
elif sys.argv[i].lower() == u'noschemas': elif myarg == u'noschemas':
getSchemas = False getSchemas = False
projection = u'basic' projection = u'basic'
i += 1 i += 1
elif sys.argv[i].lower() == u'schemas': elif myarg == u'schemas':
getSchemas = True getSchemas = True
projection = u'custom' projection = u'custom'
customFieldMask = sys.argv[i+1] customFieldMask = sys.argv[i+1]
i += 2 i += 2
elif sys.argv[i].lower() == u'userview': elif myarg == u'userview':
viewType = u'domain_public' viewType = u'domain_public'
getGroups = getLicenses = False getGroups = getLicenses = False
i += 1 i += 1
elif myarg in [u'nousers', u'groups']:
i += 1
else: else:
print u'ERROR: %s is not a valid argument for "gam info user"' % sys.argv[i] print u'ERROR: %s is not a valid argument for "gam info user"' % myarg
sys.exit(2) sys.exit(2)
user = callGAPI(service=cd.users(), function=u'get', userKey=user_email, projection=projection, customFieldMask=customFieldMask, viewType=viewType) user = callGAPI(service=cd.users(), function=u'get', userKey=user_email, projection=projection, customFieldMask=customFieldMask, viewType=viewType)
print u'User: %s' % user[u'primaryEmail'] print u'User: %s' % user[u'primaryEmail']
@@ -6591,17 +6594,22 @@ def doGetGroupInfo(group_name=None):
else: else:
i = 3 i = 3
while i < len(sys.argv): while i < len(sys.argv):
if sys.argv[i].lower() == u'nousers': myarg = sys.argv[i].lower()
if myarg == u'nousers':
getUsers = False getUsers = False
i += 1 i += 1
elif sys.argv[i].lower() == u'noaliases': elif myarg == u'noaliases':
getAliases = False getAliases = False
i += 1 i += 1
elif sys.argv[i].lower() == u'groups': elif myarg == u'groups':
getGroups = True getGroups = True
i += 1 i += 1
elif myarg in [u'nogroups', u'nolicenses', u'nolicences', u'noschemas', u'schemas', u'userview']:
i += 1
if myarg == u'schemas':
i += 1
else: else:
print u'ERROR: %s is not a valid argument for "gam info group"' % sys.argv[i] print u'ERROR: %s is not a valid argument for "gam info group"' % myarg
sys.exit(2) sys.exit(2)
if group_name[:4].lower() == u'uid:': if group_name[:4].lower() == u'uid:':
group_name = group_name[4:] group_name = group_name[4:]