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

Delete messages fixes

Browse Source 
-catch more unauthorized service account errors
-print which account we're working with before attempting auth and
mailbox search
-soft errors on API call to keep GAM from quiting on mailbox error.
-
This commit is contained in:
Jay Lee
2015-12-22 16:42:47 -05:00
parent b260cb8f50
commit a06828dbcf
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gam.py
View File

@ -634,7 +634,9 @@ def buildGAPIServiceObject(api, act_as=None, soft_errors=False):
except httplib2.ServerNotFoundError as e: except httplib2.ServerNotFoundError as e:
systemErrorExit(4, e) systemErrorExit(4, e)
except oauth2client.client.AccessTokenRefreshError, e: except oauth2client.client.AccessTokenRefreshError, e:
if e.message in [u'access_denied', u'unauthorized_client: Unauthorized client or scope in request.']: if e.message in [u'access_denied',
u'unauthorized_client: Unauthorized client or scope in request.',
u'access_denied: Requested client not authorized.']:
systemErrorExit(5, MESSAGE_CLIENT_API_ACCESS_DENIED.format(SERVICE_ACCOUNT_CLIENT_ID, u','.join(scope))) systemErrorExit(5, MESSAGE_CLIENT_API_ACCESS_DENIED.format(SERVICE_ACCOUNT_CLIENT_ID, u','.join(scope)))
sys.stderr.write(u'{0}{1}\n'.format(ERROR_PREFIX, e)) sys.stderr.write(u'{0}{1}\n'.format(ERROR_PREFIX, e))
if soft_errors: if soft_errors:
@ -4187,11 +4189,12 @@ def doDeleteMessages(trashOrDelete, users):
print u'ERROR: No query specified. You must specify some query!' print u'ERROR: No query specified. You must specify some query!'
sys.exit(2) sys.exit(2)
for user in users: for user in users:
print u'Searching messages for %s' % user
gmail = buildGAPIServiceObject(u'gmail', act_as=user) gmail = buildGAPIServiceObject(u'gmail', act_as=user)
page_message = u'Got %%%%total_items%%%% messages for user %s' % user page_message = u'Got %%%%total_items%%%% messages for user %s' % user
listResult = callGAPIpages(service=gmail.users().messages(), listResult = callGAPIpages(service=gmail.users().messages(),
function=u'list', items=u'messages', page_message=page_message, function=u'list', items=u'messages', page_message=page_message,
userId=u'me', q=query, includeSpamTrash=True) userId=u'me', q=query, includeSpamTrash=True, soft_errors=True)
del_count = len(listResult) del_count = len(listResult)
if not doIt: if not doIt:
print u'would try to delete %s messages for user %s (max %s)\n' % (del_count, user, maxToDelete) print u'would try to delete %s messages for user %s (max %s)\n' % (del_count, user, maxToDelete)