mirror/archivemail
1
0
Fork 0
mirror of https://git.code.sf.net/p/archivemail/code synced 2025-01-03 05:34:58 +00:00
Code Issues Releases Wiki Activity

Improved IMAP error handling: pass error messages from the server on to the

Browse source 
user, and check if deleting the messages was successful.
This commit is contained in:
Nikolaus Schulz 2006-11-01 20:35:53 +00:00
parent c7d074abde
commit 89e6683334
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
archivemail.py
View file

@ -1325,7 +1325,8 @@ def _archive_imap(mailbox_name, final_archive_name):
vprint("logged in to server as %s" % imap_username) vprint("logged in to server as %s" % imap_username)
result, response = imap_srv.select(imap_folder) result, response = imap_srv.select(imap_folder)
if result != 'OK': unexpected_error("cannot select imap folder") if result != 'OK': unexpected_error("cannot select imap folder; "
"server says '%s'" % response[0])
vprint("selected imap folder %s" % imap_folder) vprint("selected imap folder %s" % imap_folder)
# response is e.g. ['1016'] for 1016 messages in folder # response is e.g. ['1016'] for 1016 messages in folder
total_msg_count = int(response[0]) total_msg_count = int(response[0])
@ -1339,7 +1340,8 @@ def _archive_imap(mailbox_name, final_archive_name):
# deleted. # deleted.
result, response = imap_srv.search(None, imap_filter) result, response = imap_srv.search(None, imap_filter)
if result != 'OK': unexpected_error("imap search failed") if result != 'OK': unexpected_error("imap search failed; server says '%s'" %
response[0])
# response is a list with a single item, listing message sequence numbers # response is a list with a single item, listing message sequence numbers
# like ['1 2 3 1016'] # like ['1 2 3 1016']
message_list = response[0].split() message_list = response[0].split()
@ -1348,7 +1350,8 @@ def _archive_imap(mailbox_name, final_archive_name):
# First, gather data for the statistics. # First, gather data for the statistics.
if total_msg_count > 0: if total_msg_count > 0:
result, response = imap_srv.fetch('1:*', '(RFC822.SIZE)') result, response = imap_srv.fetch('1:*', '(RFC822.SIZE)')
if result != 'OK': unexpected_error("Failed to fetch message sizes") if result != 'OK': unexpected_error("Failed to fetch message sizes; "
"server says '%s'" % response[0])
# response is a list with entries like '1016 (RFC822.SIZE 3118)', # response is a list with entries like '1016 (RFC822.SIZE 3118)',
# where the first number is the message sequence number, the second is # where the first number is the message sequence number, the second is
# the size. # the size.
@ -1363,7 +1366,8 @@ def _archive_imap(mailbox_name, final_archive_name):
if not options.delete_old_mail: if not options.delete_old_mail:
for msn in message_list: for msn in message_list:
result, response = imap_srv.fetch(msn, '(RFC822 FLAGS)') result, response = imap_srv.fetch(msn, '(RFC822 FLAGS)')
if result != 'OK': unexpected_error("Failed to fetch message") if result != 'OK': unexpected_error("Failed to fetch message; "
"server says '%s'" % response[0])
if "\r\n" == os.linesep: if "\r\n" == os.linesep:
msg_str = response[0][1] msg_str = response[0][1]
else: else:
@ -1386,8 +1390,11 @@ def _archive_imap(mailbox_name, final_archive_name):
vprint("Deleting %s messages" % len(message_list)) vprint("Deleting %s messages" % len(message_list))
max_delete = 100 max_delete = 100
for i in range(0, len(message_list), max_delete): for i in range(0, len(message_list), max_delete):
imap_srv.store(string.join(message_list[i:i+max_delete], ','), result, response = imap_srv.store( \
string.join(message_list[i:i+max_delete], ','),
'+FLAGS.SILENT', '\\Deleted') '+FLAGS.SILENT', '\\Deleted')
if result != 'OK': unexpected_error("Error while deleting "
"messages; server says '%s'" % response[0])
imap_srv.close() imap_srv.close()
imap_srv.logout() imap_srv.logout()
if not options.quiet: if not options.quiet: