Remove Gmail realdelete option
It can lead to potential dataloss (see recent commit log where I added a scary warning about it to offlineimap.conf). Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
@ -18,16 +18,18 @@
|
||||
|
||||
"""Folder implementation to support features of the Gmail IMAP server.
|
||||
"""
|
||||
|
||||
from IMAP import IMAPFolder
|
||||
from offlineimap import imaputil
|
||||
|
||||
|
||||
class GmailFolder(IMAPFolder):
|
||||
"""Folder implementation to support features of the Gmail IMAP server.
|
||||
Specifically, deleted messages are moved to folder `Gmail.TRASH_FOLDER`
|
||||
(by default: ``[Gmail]/Trash``) prior to expunging them, since
|
||||
Gmail maps to IMAP ``EXPUNGE`` command to "remove label".
|
||||
|
||||
Removing a message from a folder will only remove the "label" from
|
||||
the message and keep it in the "All mails" folder. To really delete
|
||||
a message it needs to be copied to the Trash folder. However, this
|
||||
is dangerous as our folder moves are implemented as a 1) delete in
|
||||
one folder and 2) append to the other. If 2 comes before 1, this
|
||||
will effectively delete the message from all folders. So we cannot
|
||||
do that until we have a smarter folder move mechanism.
|
||||
|
||||
For more information on the Gmail IMAP server:
|
||||
http://mail.google.com/support/bin/answer.py?answer=77657&topic=12815
|
||||
@ -35,31 +37,6 @@ class GmailFolder(IMAPFolder):
|
||||
|
||||
def __init__(self, imapserver, name, repository):
|
||||
super(GmailFolder, self).__init__(imapserver, name, repository)
|
||||
self.realdelete = repository.getrealdelete(name)
|
||||
self.trash_folder = repository.gettrashfolder(name)
|
||||
#: Gmail will really delete messages upon EXPUNGE in these folders
|
||||
# Gmail will really delete messages upon EXPUNGE in these folders
|
||||
self.real_delete_folders = [ self.trash_folder, repository.getspamfolder() ]
|
||||
|
||||
def deletemessages_noconvert(self, uidlist):
|
||||
uidlist = [uid for uid in uidlist if uid in self.messagelist]
|
||||
if not len(uidlist):
|
||||
return
|
||||
|
||||
if self.realdelete and not (self.getname() in self.real_delete_folders):
|
||||
# IMAP expunge is just "remove label" in this folder,
|
||||
# so map the request into a "move into Trash"
|
||||
|
||||
imapobj = self.imapserver.acquireconnection()
|
||||
try:
|
||||
imapobj.select(self.getfullname())
|
||||
result = imapobj.uid('copy',
|
||||
imaputil.uid_sequence(uidlist),
|
||||
self.trash_folder)
|
||||
assert result[0] == 'OK', \
|
||||
"Bad IMAPlib result: %s" % result[0]
|
||||
finally:
|
||||
self.imapserver.releaseconnection(imapobj)
|
||||
for uid in uidlist:
|
||||
del self.messagelist[uid]
|
||||
else:
|
||||
IMAPFolder.deletemessages_noconvert(self, uidlist)
|
||||
|
Reference in New Issue
Block a user