deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 13:43:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Clean up gam create resource/print resources

Browse Source 
Add type as a synonym of restype to create to make consistent with
update
Add type to print so that resource type is visible
This commit is contained in:
Ross Scroggs
2015-11-11 06:08:55 -08:00
parent ddd8348bdd
commit a4ed95b81b
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gam.py
View File

@ -5093,7 +5093,7 @@ def doCreateResource():
if sys.argv[i].lower() == u'description': if sys.argv[i].lower() == u'description':
description = sys.argv[i+1] description = sys.argv[i+1]
i += 2 i += 2
elif sys.argv[i].lower() == u'resType': elif sys.argv[i].lower() in [u'resType', u'type']:
resType = sys.argv[i+1] resType = sys.argv[i+1]
i += 2 i += 2
else: else:
@ -7756,14 +7756,15 @@ def doPrintResources():
res_attributes = [] res_attributes = []
res_attributes.append({u'Name': u'Name'}) res_attributes.append({u'Name': u'Name'})
titles = ['Name'] titles = ['Name']
printid = printdesc = printemail = todrive = False printid = printdesc = printemail = printtype = todrive = False
while i < len(sys.argv): while i < len(sys.argv):
if sys.argv[i].lower() == u'allfields': if sys.argv[i].lower() == u'allfields':
printid = printdesc = printemail = True printid = printdesc = printemail = True
res_attributes[0].update(ID=u'ID', Description=u'Description', Email=u'Email') res_attributes[0].update(ID=u'ID', Description=u'Description', Email=u'Email', Type=u'Type')
titles.append(u'ID') titles.append(u'ID')
titles.append(u'Description') titles.append(u'Description')
titles.append(u'Email') titles.append(u'Email')
titles.append(u'Type')
i += 1 i += 1
elif sys.argv[i].lower() == u'todrive': elif sys.argv[i].lower() == u'todrive':
todrive = True todrive = True
@ -7783,11 +7784,16 @@ def doPrintResources():
res_attributes[0].update(Email=u'Email') res_attributes[0].update(Email=u'Email')
titles.append(u'Email') titles.append(u'Email')
i += 1 i += 1
elif sys.argv[i].lower() == u'type':
printtype = True
res_attributes[0].update(Type=u'Type')
titles.append(u'Type')
i += 1
else: else:
print 'ERROR: %s is not a valid argument for "gam print resources"' % sys.argv[i] print 'ERROR: %s is not a valid argument for "gam print resources"' % sys.argv[i]
sys.exit(2) sys.exit(2)
resObj = getResCalObject() resObj = getResCalObject()
sys.stderr.write(u"Retrieving All Resource Calendars for your account (may take some time on a large domain)") sys.stderr.write(u"Retrieving All Resource Calendars for your account (may take some time on a large domain)\n")
resources = callGData(service=resObj, function=u'RetrieveAllResourceCalendars') resources = callGData(service=resObj, function=u'RetrieveAllResourceCalendars')
for resource in resources: for resource in resources:
resUnit = {} resUnit = {}
@ -7802,6 +7808,8 @@ def doPrintResources():
resUnit.update({u'Description': desc}) resUnit.update({u'Description': desc})
if printemail: if printemail:
resUnit.update({u'Email': resource[u'resourceEmail']}) resUnit.update({u'Email': resource[u'resourceEmail']})
if printtype:
resUnit.update({u'Type': resource[u'resourceType']})
res_attributes.append(resUnit) res_attributes.append(resUnit)
output_csv(res_attributes, titles, u'Resources', todrive) output_csv(res_attributes, titles, u'Resources', todrive)