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

Fixes

Browse Source 
doUpdateCustomer - starting on wrong index
appID2add - wrong variable in error message
convertUserIDtoEmail - id is Python built-in, use uid
doPrintDataTransfers - todrive argument causes infinite loop
doPrintDataTransfers - trailing space
doGetDataTransferInfo - id is Python built-in, use dtId
This commit is contained in:
Ross Scroggs
2015-09-29 20:36:56 -07:00
parent c3038807b9
commit 94dcd98e8d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gam.py
View File

@ -1260,7 +1260,7 @@ def doUpdateCustomer():
cd = buildGAPIObject(u'directory') cd = buildGAPIObject(u'directory')
body = {} body = {}
customer = sys.argv[3] customer = sys.argv[3]
i = 3 i = 4
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower().replace(u'_', u'') myarg = sys.argv[i].lower().replace(u'_', u'')
if myarg == u'alternateemail': if myarg == u'alternateemail':
@ -1373,7 +1373,7 @@ def appID2app(dt, appID):
for online_service in online_services: for online_service in online_services:
if appID == online_service[u'id']: if appID == online_service[u'id']:
return online_service[u'name'] return online_service[u'name']
print u'ERROR: %s is not a valid app ID for data transfer.' % service print u'ERROR: %s is not a valid app ID for data transfer.' % appID
sys.exit(3) sys.exit(3)
def app2appID(dt, app): def app2appID(dt, app):
@ -1413,10 +1413,10 @@ def convertToUserID(user):
print u'ERROR: no such user %s' % user print u'ERROR: no such user %s' % user
sys.exit(3) sys.exit(3)
def convertUserIDtoEmail(id): def convertUserIDtoEmail(uid):
cd = buildGAPIObject(u'directory') cd = buildGAPIObject(u'directory')
try: try:
return callGAPI(service=cd.users(), function=u'get', throw_reasons=[u'notFound'], userKey=id, fields=u'primaryEmail')[u'primaryEmail'] return callGAPI(service=cd.users(), function=u'get', throw_reasons=[u'notFound'], userKey=uid, fields=u'primaryEmail')[u'primaryEmail']
except googleapiclient.errors.HttpError: except googleapiclient.errors.HttpError:
print u'ERROR: no such user %s' % id print u'ERROR: no such user %s' % id
sys.exit(3) sys.exit(3)
@ -1468,10 +1468,11 @@ def doPrintDataTransfers():
i += 2 i += 2
elif sys.argv[i].lower() == u'todrive': elif sys.argv[i].lower() == u'todrive':
todrive = True todrive = True
i += 1
else: else:
print u'ERROR: %s is not a valid argument to "gam print transfers"' print u'ERROR: %s is not a valid argument to "gam print transfers"'
sys.exit(3) sys.exit(3)
transfers_attributes = [{}] transfers_attributes = [{}]
transfers = callGAPIpages(service=dt.transfers(), function=u'list', transfers = callGAPIpages(service=dt.transfers(), function=u'list',
items=u'dataTransfers', customerId=customerId, status=status, items=u'dataTransfers', customerId=customerId, status=status,
newOwnerUserId=newOwnerUserId, oldOwnerUserId=oldOwnerUserId) newOwnerUserId=newOwnerUserId, oldOwnerUserId=oldOwnerUserId)
@ -1496,8 +1497,8 @@ def doPrintDataTransfers():
def doGetDataTransferInfo(): def doGetDataTransferInfo():
dt = buildGAPIObject(u'datatransfer') dt = buildGAPIObject(u'datatransfer')
id = sys.argv[3] dtId = sys.argv[3]
transfer = callGAPI(service=dt.transfers(), function=u'get', dataTransferId=id) transfer = callGAPI(service=dt.transfers(), function=u'get', dataTransferId=dtId)
print u'Old Owner: %s' % convertUserIDtoEmail(transfer[u'oldOwnerUserId']) print u'Old Owner: %s' % convertUserIDtoEmail(transfer[u'oldOwnerUserId'])
print u'New Owner: %s' % convertUserIDtoEmail(transfer[u'newOwnerUserId']) print u'New Owner: %s' % convertUserIDtoEmail(transfer[u'newOwnerUserId'])
print u'Request Time: %s' % transfer[u'requestTime'] print u'Request Time: %s' % transfer[u'requestTime']