2005-04-16 21:35:25 +02:00
|
|
|
# Base folder support
|
2012-01-06 23:13:55 +01:00
|
|
|
# Copyright (C) 2002-2012 John Goerzen & contributors
|
2005-04-16 21:35:25 +02:00
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software
|
2006-08-12 06:15:55 +02:00
|
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
2011-09-21 00:46:46 +02:00
|
|
|
from threading import Lock
|
2012-02-05 12:52:12 +01:00
|
|
|
from .IMAP import IMAPFolder
|
2011-03-11 22:13:21 +01:00
|
|
|
import os.path
|
2005-04-16 21:35:25 +02:00
|
|
|
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
class MappedIMAPFolder(IMAPFolder):
|
|
|
|
"""IMAP class to map between Folder() instances where both side assign a uid
|
|
|
|
|
|
|
|
This Folder is used on the local side, while the remote side should
|
|
|
|
be an IMAPFolder.
|
2011-03-16 16:24:07 +01:00
|
|
|
|
|
|
|
Instance variables (self.):
|
|
|
|
r2l: dict mapping message uids: self.r2l[remoteuid]=localuid
|
|
|
|
l2r: dict mapping message uids: self.r2l[localuid]=remoteuid
|
|
|
|
#TODO: what is the difference, how are they used?
|
|
|
|
diskr2l: dict mapping message uids: self.r2l[remoteuid]=localuid
|
|
|
|
diskl2r: dict mapping message uids: self.r2l[localuid]=remoteuid"""
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
|
|
|
|
def __init__(self, *args, **kwargs):
|
2011-08-16 10:55:13 +02:00
|
|
|
IMAPFolder.__init__(self, *args, **kwargs)
|
2005-04-16 21:35:25 +02:00
|
|
|
self.maplock = Lock()
|
|
|
|
(self.diskr2l, self.diskl2r) = self._loadmaps()
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb = IMAPFolder(*args, **kwargs)
|
|
|
|
"""Representing the local IMAP Folder using local UIDs"""
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
def _getmapfilename(self):
|
|
|
|
return os.path.join(self.repository.getmapdir(),
|
|
|
|
self.getfolderbasename())
|
|
|
|
|
|
|
|
def _loadmaps(self):
|
|
|
|
self.maplock.acquire()
|
|
|
|
try:
|
|
|
|
mapfilename = self._getmapfilename()
|
|
|
|
if not os.path.exists(mapfilename):
|
|
|
|
return ({}, {})
|
|
|
|
file = open(mapfilename, 'rt')
|
|
|
|
r2l = {}
|
|
|
|
l2r = {}
|
|
|
|
while 1:
|
|
|
|
line = file.readline()
|
|
|
|
if not len(line):
|
|
|
|
break
|
2011-05-02 11:44:19 +02:00
|
|
|
try:
|
|
|
|
line = line.strip()
|
|
|
|
except ValueError:
|
|
|
|
raise Exception("Corrupt line '%s' in UID mapping file '%s'" \
|
|
|
|
%(line, mapfilename))
|
2005-04-16 21:35:25 +02:00
|
|
|
(str1, str2) = line.split(':')
|
|
|
|
loc = long(str1)
|
|
|
|
rem = long(str2)
|
|
|
|
r2l[rem] = loc
|
|
|
|
l2r[loc] = rem
|
|
|
|
return (r2l, l2r)
|
|
|
|
finally:
|
|
|
|
self.maplock.release()
|
|
|
|
|
|
|
|
def _savemaps(self, dolock = 1):
|
|
|
|
mapfilename = self._getmapfilename()
|
|
|
|
if dolock: self.maplock.acquire()
|
|
|
|
try:
|
|
|
|
file = open(mapfilename + ".tmp", 'wt')
|
|
|
|
for (key, value) in self.diskl2r.iteritems():
|
|
|
|
file.write("%d:%d\n" % (key, value))
|
|
|
|
file.close()
|
|
|
|
os.rename(mapfilename + '.tmp', mapfilename)
|
|
|
|
finally:
|
|
|
|
if dolock: self.maplock.release()
|
|
|
|
|
|
|
|
def _uidlist(self, mapping, items):
|
2012-02-17 08:48:59 +01:00
|
|
|
try:
|
|
|
|
return [mapping[x] for x in items]
|
|
|
|
except KeyError as e:
|
|
|
|
raise OfflineImapError("Could not find UID for msg '{0}' (f:'{1}'."
|
|
|
|
" This is usually a bad thing and should be reported on the ma"
|
|
|
|
"iling list.".format(e.args[0], self),
|
|
|
|
OfflineImapError.ERROR.MESSAGE)
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
def cachemessagelist(self):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.cachemessagelist()
|
|
|
|
reallist = self._mb.getmessagelist()
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
self.maplock.acquire()
|
|
|
|
try:
|
|
|
|
# OK. Now we've got a nice list. First, delete things from the
|
|
|
|
# summary that have been deleted from the folder.
|
|
|
|
|
|
|
|
for luid in self.diskl2r.keys():
|
2012-02-05 13:40:06 +01:00
|
|
|
if not luid in reallist:
|
2005-04-16 21:35:25 +02:00
|
|
|
ruid = self.diskl2r[luid]
|
|
|
|
del self.diskr2l[ruid]
|
|
|
|
del self.diskl2r[luid]
|
|
|
|
|
|
|
|
# Now, assign negative UIDs to local items.
|
|
|
|
self._savemaps(dolock = 0)
|
|
|
|
nextneg = -1
|
|
|
|
|
|
|
|
self.r2l = self.diskr2l.copy()
|
|
|
|
self.l2r = self.diskl2r.copy()
|
|
|
|
|
|
|
|
for luid in reallist.keys():
|
2012-02-05 13:40:06 +01:00
|
|
|
if not luid in self.l2r:
|
2005-04-16 21:35:25 +02:00
|
|
|
ruid = nextneg
|
|
|
|
nextneg -= 1
|
|
|
|
self.l2r[luid] = ruid
|
|
|
|
self.r2l[ruid] = luid
|
|
|
|
finally:
|
|
|
|
self.maplock.release()
|
|
|
|
|
2011-03-28 16:19:19 +02:00
|
|
|
def uidexists(self, ruid):
|
|
|
|
"""Checks if the (remote) UID exists in this Folder"""
|
|
|
|
# This implementation overrides the one in BaseFolder, as it is
|
|
|
|
# much more efficient for the mapped case.
|
|
|
|
return ruid in self.r2l
|
|
|
|
|
|
|
|
def getmessageuidlist(self):
|
|
|
|
"""Gets a list of (remote) UIDs.
|
|
|
|
You may have to call cachemessagelist() before calling this function!"""
|
|
|
|
# This implementation overrides the one in BaseFolder, as it is
|
|
|
|
# much more efficient for the mapped case.
|
|
|
|
return self.r2l.keys()
|
|
|
|
|
|
|
|
def getmessagecount(self):
|
|
|
|
"""Gets the number of messages in this folder.
|
|
|
|
You may have to call cachemessagelist() before calling this function!"""
|
|
|
|
# This implementation overrides the one in BaseFolder, as it is
|
|
|
|
# much more efficient for the mapped case.
|
|
|
|
return len(self.r2l)
|
|
|
|
|
2005-04-16 21:35:25 +02:00
|
|
|
def getmessagelist(self):
|
2011-03-28 16:19:19 +02:00
|
|
|
"""Gets the current message list. This function's implementation
|
|
|
|
is quite expensive for the mapped UID case. You must call
|
|
|
|
cachemessagelist() before calling this function!"""
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
retval = {}
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
localhash = self._mb.getmessagelist()
|
2005-04-16 21:35:25 +02:00
|
|
|
self.maplock.acquire()
|
|
|
|
try:
|
|
|
|
for key, value in localhash.items():
|
|
|
|
try:
|
|
|
|
key = self.l2r[key]
|
|
|
|
except KeyError:
|
|
|
|
# Sometimes, the IMAP backend may put in a new message,
|
|
|
|
# then this function acquires the lock before the system
|
|
|
|
# has the chance to note it in the mapping. In that case,
|
|
|
|
# just ignore it.
|
|
|
|
continue
|
|
|
|
value = value.copy()
|
|
|
|
value['uid'] = self.l2r[value['uid']]
|
|
|
|
retval[key] = value
|
|
|
|
return retval
|
|
|
|
finally:
|
|
|
|
self.maplock.release()
|
|
|
|
|
|
|
|
def getmessage(self, uid):
|
|
|
|
"""Returns the content of the specified message."""
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
return self._mb.getmessage(self.r2l[uid])
|
2005-04-16 21:35:25 +02:00
|
|
|
|
2006-08-22 03:09:36 +02:00
|
|
|
def savemessage(self, uid, content, flags, rtime):
|
2005-04-16 21:35:25 +02:00
|
|
|
"""Writes a new message, with the specified uid.
|
|
|
|
|
2011-03-16 16:24:07 +01:00
|
|
|
The UIDMaps class will not return a newly assigned uid, as it
|
|
|
|
internally maps different uids between IMAP servers. So a
|
|
|
|
successful savemessage() invocation will return the same uid it
|
|
|
|
has been invoked with. As it maps between 2 IMAP servers which
|
|
|
|
means the source message must already have an uid, it requires a
|
|
|
|
positive uid to be passed in. Passing in a message with a
|
|
|
|
negative uid will do nothing and return the negative uid.
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
If the uid is > 0, the backend should set the uid to this, if it can.
|
|
|
|
If it cannot set the uid to that, it will save it anyway.
|
|
|
|
It will return the uid assigned in any case.
|
2011-09-16 11:44:50 +02:00
|
|
|
|
|
|
|
See folder/Base for details. Note that savemessage() does not
|
|
|
|
check against dryrun settings, so you need to ensure that
|
|
|
|
savemessage is never called in a dryrun mode.
|
2005-04-16 21:35:25 +02:00
|
|
|
"""
|
2011-09-16 11:44:50 +02:00
|
|
|
self.ui.savemessage('imap', uid, flags, self)
|
2011-03-16 16:24:07 +01:00
|
|
|
# Mapped UID instances require the source to already have a
|
|
|
|
# positive UID, so simply return here.
|
2005-04-16 21:35:25 +02:00
|
|
|
if uid < 0:
|
|
|
|
return uid
|
2011-03-16 16:24:07 +01:00
|
|
|
|
|
|
|
#if msg uid already exists, just modify the flags
|
2005-04-16 21:35:25 +02:00
|
|
|
if uid in self.r2l:
|
|
|
|
self.savemessageflags(uid, flags)
|
|
|
|
return uid
|
2011-03-16 16:24:07 +01:00
|
|
|
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
newluid = self._mb.savemessage(-1, content, flags, rtime)
|
2005-04-16 21:35:25 +02:00
|
|
|
if newluid < 1:
|
2012-01-09 09:57:36 +01:00
|
|
|
raise ValueError("Backend could not find uid for message, returned "
|
|
|
|
"%s" % newluid)
|
2005-04-16 21:35:25 +02:00
|
|
|
self.maplock.acquire()
|
|
|
|
try:
|
|
|
|
self.diskl2r[newluid] = uid
|
|
|
|
self.diskr2l[uid] = newluid
|
|
|
|
self.l2r[newluid] = uid
|
|
|
|
self.r2l[uid] = newluid
|
|
|
|
self._savemaps(dolock = 0)
|
|
|
|
finally:
|
|
|
|
self.maplock.release()
|
2011-06-16 17:22:29 +02:00
|
|
|
return uid
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
def getmessageflags(self, uid):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
return self._mb.getmessageflags(self.r2l[uid])
|
2005-04-16 21:35:25 +02:00
|
|
|
|
2006-08-22 03:09:36 +02:00
|
|
|
def getmessagetime(self, uid):
|
|
|
|
return None
|
|
|
|
|
2005-04-16 21:35:25 +02:00
|
|
|
def savemessageflags(self, uid, flags):
|
2011-09-16 11:44:50 +02:00
|
|
|
"""
|
|
|
|
|
|
|
|
Note that this function does not check against dryrun settings,
|
|
|
|
so you need to ensure that it is never called in a
|
|
|
|
dryrun mode."""
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.savemessageflags(self.r2l[uid], flags)
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
def addmessageflags(self, uid, flags):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.addmessageflags(self.r2l[uid], flags)
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
def addmessagesflags(self, uidlist, flags):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.addmessagesflags(self._uidlist(self.r2l, uidlist),
|
2005-04-16 21:35:25 +02:00
|
|
|
flags)
|
|
|
|
|
2011-08-30 10:52:11 +02:00
|
|
|
def change_message_uid(self, ruid, new_ruid):
|
|
|
|
"""Change the message from existing ruid to new_ruid
|
|
|
|
|
|
|
|
:param new_uid: The old remote UID will be changed to a new
|
|
|
|
UID. The UIDMaps case handles this efficiently by simply
|
|
|
|
changing the mappings file."""
|
|
|
|
if ruid not in self.r2l:
|
|
|
|
raise OfflineImapError("Cannot change unknown Maildir UID %s" % ruid,
|
|
|
|
OfflineImapError.ERROR.MESSAGE)
|
|
|
|
if ruid == new_ruid: return # sanity check shortcut
|
|
|
|
self.maplock.acquire()
|
|
|
|
try:
|
|
|
|
luid = self.r2l[ruid]
|
|
|
|
self.l2r[luid] = new_ruid
|
|
|
|
del self.r2l[ruid]
|
|
|
|
self.r2l[new_ruid] = luid
|
|
|
|
#TODO: diskl2r|r2l are a pain to sync and should be done away with
|
|
|
|
#diskl2r only contains positive UIDs, so wrap in ifs
|
|
|
|
if luid>0: self.diskl2r[luid] = new_ruid
|
|
|
|
if ruid>0: del self.diskr2l[ruid]
|
|
|
|
if new_ruid > 0: self.diskr2l[new_ruid] = luid
|
|
|
|
self._savemaps(dolock = 0)
|
|
|
|
finally:
|
|
|
|
self.maplock.release()
|
|
|
|
|
2005-04-16 21:35:25 +02:00
|
|
|
def _mapped_delete(self, uidlist):
|
|
|
|
self.maplock.acquire()
|
|
|
|
try:
|
|
|
|
needssave = 0
|
|
|
|
for ruid in uidlist:
|
|
|
|
luid = self.r2l[ruid]
|
|
|
|
del self.r2l[ruid]
|
|
|
|
del self.l2r[luid]
|
|
|
|
if ruid > 0:
|
|
|
|
del self.diskr2l[ruid]
|
|
|
|
del self.diskl2r[luid]
|
|
|
|
needssave = 1
|
|
|
|
if needssave:
|
|
|
|
self._savemaps(dolock = 0)
|
|
|
|
finally:
|
|
|
|
self.maplock.release()
|
|
|
|
|
|
|
|
def deletemessageflags(self, uid, flags):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.deletemessageflags(self.r2l[uid], flags)
|
2005-04-16 21:35:25 +02:00
|
|
|
|
|
|
|
def deletemessagesflags(self, uidlist, flags):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.deletemessagesflags(self._uidlist(self.r2l, uidlist),
|
2005-04-16 21:35:25 +02:00
|
|
|
flags)
|
|
|
|
|
|
|
|
def deletemessage(self, uid):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.deletemessage(self.r2l[uid])
|
2005-04-16 21:35:25 +02:00
|
|
|
self._mapped_delete([uid])
|
|
|
|
|
|
|
|
def deletemessages(self, uidlist):
|
Simplify MappedIMAPFolder, fixing bugs
Previously, we instanciated an MappedImapFolder, and would cleverly (too
cleverly?) invoke methods on it casting it to an IMAPFolder by calling
methods such as: self._mb.cachemessages(self) where self._MB is the class
IMAPFolder and self and instance of MappedImapFolder. If
e.g. cachemessages() invokes a method uidexists() which exists for
MappedImapFolder, but not directly in IMAPFolder, I am not sure if
Python would at some point attempt to use the method of the wrong class.
Also, this leads to some twisted thinking as our class would in same
cases act as an IMAPFolder and in some cases as an MappedImapFOlder and
it is not always clear if we mean REMOTE UID or LOCAL UID.
This commit simplifies the class, by a)doing away with the complex Mixin
construct and directly inheriting from IMAPFOlder (so we get all the
IMAPFOlder methods that we can inherit). We instantiate self._mb as a
new instance of IMAPFolder which represents the local IMAP using local
UIDs, separating the MappedIMAPFolder construct logically from the
IMAPFolder somewhat.
In the long run, I would like to remove self._mb completely and simply
override any method that needs overriding, but let us take small and
understandable baby steps here.
Reported-and-tested-by: Vincent Beffara <vbeffara@gmail.com>
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-06-24 11:28:30 +02:00
|
|
|
self._mb.deletemessages(self._uidlist(self.r2l, uidlist))
|
2005-04-16 21:35:25 +02:00
|
|
|
self._mapped_delete(uidlist)
|