deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 06:03:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Threads and batch support for Gmail modify/delete

Browse Source
This commit is contained in:
Jay Lee
2017-01-27 11:03:25 -05:00
parent 31871f192c
commit 15bd6beebd
1 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/gam.py
View File

@ -4662,7 +4662,7 @@ def labelsToLabelIds(gmail, labels):
parent_label = parent_label[:parent_label.rfind(u'/')] parent_label = parent_label[:parent_label.rfind(u'/')]
return labelIds return labelIds
def doProcessMessages(users, function): def doProcessMessagesOrThreads(users, function, unit=u'messages'):
query = None query = None
doIt = False doIt = False
maxToProcess = 1 maxToProcess = 1
@ -4688,7 +4688,7 @@ def doProcessMessages(users, function):
body[u'removeLabelIds'].append(sys.argv[i+1]) body[u'removeLabelIds'].append(sys.argv[i+1])
i += 2 i += 2
else: else:
print u'ERROR: %s is not a valid argument for "gam <users> %s messages"' % (sys.argv[i], function) print u'ERROR: %s is not a valid argument for "gam <users> %s %s"' % (sys.argv[i], function, unit)
sys.exit(2) sys.exit(2)
if not query: if not query:
print u'ERROR: No query specified. You must specify some query!' print u'ERROR: No query specified. You must specify some query!'
@ -4698,9 +4698,10 @@ def doProcessMessages(users, function):
user, gmail = buildGmailGAPIObject(user) user, gmail = buildGmailGAPIObject(user)
if not gmail: if not gmail:
continue continue
print u'Searching messages for %s' % user print u'Searching %s for %s' % (unit, user)
page_message = u'Got %%%%total_items%%%% messages for user %s' % user unitmethod = getattr(gmail.users(), unit)
listResult = callGAPIpages(gmail.users().messages(), u'list', u'messages', page_message=page_message, page_message = u'Got %%%%total_items%%%% %s for user %s' % (unit, user)
listResult = callGAPIpages(unitmethod(), u'list', unit, page_message=page_message,
userId=u'me', q=query, includeSpamTrash=True, soft_errors=True) userId=u'me', q=query, includeSpamTrash=True, soft_errors=True)
result_count = len(listResult) result_count = len(listResult)
if not doIt or result_count == 0: if not doIt or result_count == 0:
@ -4709,33 +4710,34 @@ def doProcessMessages(users, function):
elif result_count > maxToProcess: elif result_count > maxToProcess:
print u'WARNING: refusing to %s ANY messages for %s since max messages to process is %s and messages to be %s is %s\n' % (function, user, maxToProcess, action, result_count) print u'WARNING: refusing to %s ANY messages for %s since max messages to process is %s and messages to be %s is %s\n' % (function, user, maxToProcess, action, result_count)
continue continue
kwargs = {u'body': {}}
for my_key in body:
kwargs[u'body'][my_key] = labelsToLabelIds(gmail, body[my_key])
if not kwargs[u'body']:
del(kwargs[u'body'])
i = 0 i = 0
if function == u'delete': if unit == u'messages' and function in [u'delete', u'modify']:
batchFunction = u'batch%s' % function.title()
id_batches = [[]] id_batches = [[]]
for del_me in listResult: for a_unit in listResult:
id_batches[i].append(del_me[u'id']) id_batches[i].append(a_unit[u'id'])
if len(id_batches[i]) == 1000: if len(id_batches[i]) == 1000:
i += 1 i += 1
id_batches.append([]) id_batches.append([])
deleted_messages = 0 processed_messages = 0
for id_batch in id_batches: for id_batch in id_batches:
print u'deleting %s messages' % len(id_batch) kwargs[u'body'][u'ids'] = id_batch
callGAPI(gmail.users().messages(), u'batchDelete', print u'%s %s messages' % (function, len(id_batch))
body={u'ids': id_batch}, userId=u'me') callGAPI(unitmethod(), batchFunction,
deleted_messages += len(id_batch) userId=u'me', **kwargs)
print u'deleted %s of %s messages' % (deleted_messages, result_count) processed_messages += len(id_batch)
print u'%s %s of %s messages' % (function, processed_messages, result_count)
continue continue
if not body: for a_unit in listResult:
kwargs = {}
else:
kwargs = {u'body': {}}
for my_key in body:
kwargs[u'body'][my_key] = labelsToLabelIds(gmail, body[my_key])
for a_message in listResult:
i += 1 i += 1
print u' %s message %s for user %s (%s/%s)' % (function, a_message[u'id'], user, i, result_count) print u' %s %s %s for user %s (%s/%s)' % (function, unit, a_unit[u'id'], user, i, result_count)
callGAPI(gmail.users().messages(), function, callGAPI(unitmethod(), function,
id=a_message[u'id'], userId=u'me', **kwargs) id=a_unit[u'id'], userId=u'me', **kwargs)
def doDeleteLabel(users): def doDeleteLabel(users):
label = sys.argv[5] label = sys.argv[5]
@ -10066,21 +10068,27 @@ def ProcessGAMCommand(args):
elif command == u'modify': elif command == u'modify':
modifyWhat = sys.argv[4].lower() modifyWhat = sys.argv[4].lower()
if modifyWhat in [u'message', u'messages']: if modifyWhat in [u'message', u'messages']:
doProcessMessages(users, u'modify') doProcessMessagesOrThreads(users, u'modify', u'messages')
elif modifyWhat in [u'thread', u'threads']:
doProcessMessagesOrThreads(users, u'modify', u'threads')
else: else:
print u'ERROR: %s is not a valid argument for "gam <users> modify"' % modifyWhat print u'ERROR: %s is not a valid argument for "gam <users> modify"' % modifyWhat
sys.exit(2) sys.exit(2)
elif command == u'trash': elif command == u'trash':
trashWhat = sys.argv[4].lower() trashWhat = sys.argv[4].lower()
if trashWhat in [u'message', u'messages']: if trashWhat in [u'message', u'messages']:
doProcessMessages(users, u'trash') doProcessMessagesOrThreads(users, u'trash', u'messages')
elif trashWhat in [u'thread', u'threads']:
doProcessMessagesOrThreads(users, u'trash', u'threads')
else: else:
print u'ERROR: %s is not a valid argument for "gam <users> trash"' % trashWhat print u'ERROR: %s is not a valid argument for "gam <users> trash"' % trashWhat
sys.exit(2) sys.exit(2)
elif command == u'untrash': elif command == u'untrash':
untrashWhat = sys.argv[4].lower() untrashWhat = sys.argv[4].lower()
if untrashWhat in [u'message', u'messages']: if untrashWhat in [u'message', u'messages', u'messages']:
doProcessMessages(users, u'untrash') doProcessMessagesOrThreads(users, u'untrash')
elif untrashWhat in [u'thread', u'threads']:
doProcessMessagesOrThreads(u'users', u'untrash', u'threads')
else: else:
print u'ERROR: %s is not a valid argument for "gam <users> untrash"' % untrashWhat print u'ERROR: %s is not a valid argument for "gam <users> untrash"' % untrashWhat
sys.exit(2) sys.exit(2)
@ -10093,8 +10101,9 @@ def ProcessGAMCommand(args):
elif delWhat == u'label': elif delWhat == u'label':
doDeleteLabel(users) doDeleteLabel(users)
elif delWhat in [u'message', u'messages']: elif delWhat in [u'message', u'messages']:
#doProcessMessages(users, u'delete') runCmdForUsers(doProcessMessagesOrThreads, users, default_to_batch=True, function=u'delete', unit=u'messages')
runCmdForUsers(doProcessMessages, users, default_to_batch=True, function=u'delete') elif delWhat in [u'thread', u'threads']:
runCmdForUsers(doProcessMessagesOrThreads, users, default_to_batch=True, function=u'delete', unit=u'threads')
elif delWhat == u'photo': elif delWhat == u'photo':
deletePhoto(users) deletePhoto(users)
elif delWhat in [u'license', u'licence']: elif delWhat in [u'license', u'licence']: