2002-06-19 08:08:59 +02:00
|
|
|
# Maildir folder support
|
2007-03-28 22:23:18 +02:00
|
|
|
# Copyright (C) 2002 - 2007 John Goerzen
|
2002-06-19 07:55:12 +02:00
|
|
|
# <jgoerzen@complete.org>
|
|
|
|
#
|
|
|
|
# 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
|
2003-04-16 21:23:45 +02:00
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
2002-06-19 07:55:12 +02:00
|
|
|
#
|
|
|
|
# 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
|
2002-06-19 07:55:12 +02:00
|
|
|
|
2008-12-04 22:45:15 +01:00
|
|
|
import os.path, os, re, time, socket
|
2002-06-19 07:55:12 +02:00
|
|
|
from Base import BaseFolder
|
2002-06-21 12:01:10 +02:00
|
|
|
from offlineimap import imaputil
|
2003-05-06 21:26:12 +02:00
|
|
|
from offlineimap.ui import UIBase
|
|
|
|
from threading import Lock
|
2008-12-04 22:45:15 +01:00
|
|
|
|
|
|
|
try:
|
|
|
|
from hashlib import md5
|
|
|
|
except ImportError:
|
|
|
|
import md5
|
2002-06-22 06:32:29 +02:00
|
|
|
|
2002-07-23 21:55:18 +02:00
|
|
|
uidmatchre = re.compile(',U=(\d+)')
|
|
|
|
flagmatchre = re.compile(':.*2,([A-Z]+)')
|
|
|
|
|
2002-06-22 06:32:29 +02:00
|
|
|
timeseq = 0
|
|
|
|
lasttime = long(0)
|
2003-05-06 21:26:12 +02:00
|
|
|
timelock = Lock()
|
2002-06-22 06:32:29 +02:00
|
|
|
|
|
|
|
def gettimeseq():
|
2003-05-06 21:26:12 +02:00
|
|
|
global lasttime, timeseq, timelock
|
|
|
|
timelock.acquire()
|
|
|
|
try:
|
|
|
|
thistime = long(time.time())
|
|
|
|
if thistime == lasttime:
|
|
|
|
timeseq += 1
|
|
|
|
return (thistime, timeseq)
|
|
|
|
else:
|
|
|
|
lasttime = thistime
|
|
|
|
timeseq = 0
|
|
|
|
return (thistime, timeseq)
|
|
|
|
finally:
|
|
|
|
timelock.release()
|
2002-06-19 07:55:12 +02:00
|
|
|
|
2002-06-19 08:08:59 +02:00
|
|
|
class MaildirFolder(BaseFolder):
|
2008-08-02 21:55:08 +02:00
|
|
|
def __init__(self, root, name, sep, repository, accountname, config):
|
2002-06-19 08:08:59 +02:00
|
|
|
self.name = name
|
2008-08-02 21:55:08 +02:00
|
|
|
self.config = config
|
2008-08-02 22:11:23 +02:00
|
|
|
self.dofsync = config.getdefaultboolean("general", "fsync", True)
|
2002-06-19 08:08:59 +02:00
|
|
|
self.root = root
|
2002-08-08 04:40:18 +02:00
|
|
|
self.sep = sep
|
2002-06-20 05:33:23 +02:00
|
|
|
self.messagelist = None
|
2002-08-20 22:54:02 +02:00
|
|
|
self.repository = repository
|
2003-01-06 00:07:58 +01:00
|
|
|
self.accountname = accountname
|
2003-04-18 04:18:34 +02:00
|
|
|
BaseFolder.__init__(self)
|
2003-01-06 00:07:58 +01:00
|
|
|
|
|
|
|
def getaccountname(self):
|
|
|
|
return self.accountname
|
2002-06-20 05:33:23 +02:00
|
|
|
|
2002-06-20 07:14:35 +02:00
|
|
|
def getfullname(self):
|
|
|
|
return os.path.join(self.getroot(), self.getname())
|
|
|
|
|
2002-06-20 05:33:23 +02:00
|
|
|
def getuidvalidity(self):
|
2003-04-18 04:18:34 +02:00
|
|
|
"""Maildirs have no notion of uidvalidity, so we just return a magic
|
|
|
|
token."""
|
|
|
|
return 42
|
2002-06-20 05:33:23 +02:00
|
|
|
|
2002-07-16 04:26:58 +02:00
|
|
|
def _scanfolder(self):
|
2002-06-20 05:33:23 +02:00
|
|
|
"""Cache the message list. Maildir flags are:
|
|
|
|
R (replied)
|
|
|
|
S (seen)
|
|
|
|
T (trashed)
|
|
|
|
D (draft)
|
|
|
|
F (flagged)
|
|
|
|
and must occur in ASCII order."""
|
2002-07-16 04:26:58 +02:00
|
|
|
retval = {}
|
2002-06-20 05:33:23 +02:00
|
|
|
files = []
|
2002-06-20 06:14:54 +02:00
|
|
|
nouidcounter = -1 # Messages without UIDs get
|
|
|
|
# negative UID numbers.
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
foldermd5 = md5.new(self.getvisiblename()).hexdigest()
|
|
|
|
folderstr = ',FMD5=' + foldermd5
|
2002-06-20 05:33:23 +02:00
|
|
|
for dirannex in ['new', 'cur']:
|
|
|
|
fulldirname = os.path.join(self.getfullname(), dirannex)
|
2002-06-20 07:14:35 +02:00
|
|
|
files.extend([os.path.join(fulldirname, filename) for
|
2002-06-20 05:33:23 +02:00
|
|
|
filename in os.listdir(fulldirname)])
|
|
|
|
for file in files:
|
|
|
|
messagename = os.path.basename(file)
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
foldermatch = messagename.find(folderstr) != -1
|
|
|
|
if not foldermatch:
|
2002-06-22 06:32:29 +02:00
|
|
|
# If there is no folder MD5 specified, or if it mismatches,
|
|
|
|
# assume it is a foreign (new) message and generate a
|
|
|
|
# negative uid for it
|
2002-06-20 06:14:54 +02:00
|
|
|
uid = nouidcounter
|
2002-06-22 06:39:02 +02:00
|
|
|
nouidcounter -= 1
|
2002-06-22 06:32:29 +02:00
|
|
|
else: # It comes from our folder.
|
2002-07-23 21:55:18 +02:00
|
|
|
uidmatch = uidmatchre.search(messagename)
|
2002-06-22 06:32:29 +02:00
|
|
|
uid = None
|
|
|
|
if not uidmatch:
|
|
|
|
uid = nouidcounter
|
|
|
|
nouidcounter -= 1
|
|
|
|
else:
|
|
|
|
uid = long(uidmatch.group(1))
|
2002-07-23 21:55:18 +02:00
|
|
|
flagmatch = flagmatchre.search(messagename)
|
2002-06-20 05:33:23 +02:00
|
|
|
flags = []
|
|
|
|
if flagmatch:
|
2002-06-20 16:09:19 +02:00
|
|
|
flags = [x for x in flagmatch.group(1)]
|
2002-06-20 06:59:57 +02:00
|
|
|
flags.sort()
|
2002-11-12 22:40:40 +01:00
|
|
|
retval[uid] = {'uid': uid,
|
|
|
|
'flags': flags,
|
|
|
|
'filename': file}
|
2002-07-16 04:26:58 +02:00
|
|
|
return retval
|
|
|
|
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
def quickchanged(self, statusfolder):
|
|
|
|
self.cachemessagelist()
|
|
|
|
savedmessages = statusfolder.getmessagelist()
|
|
|
|
if len(self.messagelist) != len(savedmessages):
|
|
|
|
return True
|
|
|
|
for uid in self.messagelist.keys():
|
|
|
|
if uid not in savedmessages:
|
|
|
|
return True
|
|
|
|
if self.messagelist[uid]['flags'] != savedmessages[uid]['flags']:
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
2002-07-16 04:26:58 +02:00
|
|
|
def cachemessagelist(self):
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
if self.messagelist is None:
|
|
|
|
self.messagelist = self._scanfolder()
|
2002-06-20 05:33:23 +02:00
|
|
|
|
|
|
|
def getmessagelist(self):
|
|
|
|
return self.messagelist
|
2002-06-19 08:08:59 +02:00
|
|
|
|
2002-06-20 06:59:57 +02:00
|
|
|
def getmessage(self, uid):
|
2002-07-24 01:36:44 +02:00
|
|
|
filename = self.messagelist[uid]['filename']
|
2002-06-20 06:59:57 +02:00
|
|
|
file = open(filename, 'rt')
|
|
|
|
retval = file.read()
|
|
|
|
file.close()
|
2002-07-22 07:29:26 +02:00
|
|
|
return retval.replace("\r\n", "\n")
|
2002-06-20 06:59:57 +02:00
|
|
|
|
2006-08-22 03:09:36 +02:00
|
|
|
def getmessagetime( self, uid ):
|
|
|
|
filename = self.messagelist[uid]['filename']
|
|
|
|
st = os.stat(filename)
|
|
|
|
return st.st_mtime
|
|
|
|
|
|
|
|
def savemessage(self, uid, content, flags, rtime):
|
2007-06-13 05:42:15 +02:00
|
|
|
# This function only ever saves to tmp/,
|
|
|
|
# but it calls savemessageflags() to actually save to cur/ or new/.
|
2003-05-06 21:26:12 +02:00
|
|
|
ui = UIBase.getglobalui()
|
|
|
|
ui.debug('maildir', 'savemessage: called to write with flags %s and content %s' % \
|
|
|
|
(repr(flags), repr(content)))
|
2002-06-21 03:03:30 +02:00
|
|
|
if uid < 0:
|
|
|
|
# We cannot assign a new uid.
|
|
|
|
return uid
|
2002-07-24 01:36:44 +02:00
|
|
|
if uid in self.messagelist:
|
2002-06-20 06:59:57 +02:00
|
|
|
# We already have it.
|
2002-06-21 03:12:52 +02:00
|
|
|
self.savemessageflags(uid, flags)
|
2002-06-21 03:03:30 +02:00
|
|
|
return uid
|
2007-06-13 05:42:15 +02:00
|
|
|
|
|
|
|
# Otherwise, save the message in tmp/ and then call savemessageflags()
|
|
|
|
# to give it a permanent home.
|
2002-06-20 06:59:57 +02:00
|
|
|
tmpdir = os.path.join(self.getfullname(), 'tmp')
|
2007-10-19 21:29:34 +02:00
|
|
|
messagename = None
|
2002-06-20 06:59:57 +02:00
|
|
|
attempts = 0
|
|
|
|
while 1:
|
|
|
|
if attempts > 15:
|
|
|
|
raise IOError, "Couldn't write to file %s" % messagename
|
2003-05-06 21:26:12 +02:00
|
|
|
timeval, timeseq = gettimeseq()
|
2002-06-22 06:32:29 +02:00
|
|
|
messagename = '%d_%d.%d.%s,U=%d,FMD5=%s' % \
|
2003-05-06 21:26:12 +02:00
|
|
|
(timeval,
|
|
|
|
timeseq,
|
2002-06-20 06:59:57 +02:00
|
|
|
os.getpid(),
|
|
|
|
socket.gethostname(),
|
2002-06-22 06:32:29 +02:00
|
|
|
uid,
|
|
|
|
md5.new(self.getvisiblename()).hexdigest())
|
2007-10-19 21:29:34 +02:00
|
|
|
if os.path.exists(os.path.join(tmpdir, messagename)):
|
|
|
|
time.sleep(2)
|
|
|
|
attempts += 1
|
|
|
|
else:
|
|
|
|
break
|
|
|
|
tmpmessagename = messagename.split(',')[0]
|
|
|
|
ui.debug('maildir', 'savemessage: using temporary name %s' % tmpmessagename)
|
|
|
|
file = open(os.path.join(tmpdir, tmpmessagename), "wt")
|
2002-06-20 06:59:57 +02:00
|
|
|
file.write(content)
|
2007-03-28 22:23:18 +02:00
|
|
|
|
|
|
|
# Make sure the data hits the disk
|
|
|
|
file.flush()
|
2008-08-02 21:55:08 +02:00
|
|
|
if self.dofsync:
|
|
|
|
os.fsync(file.fileno())
|
2007-03-28 22:23:18 +02:00
|
|
|
|
2002-06-20 06:59:57 +02:00
|
|
|
file.close()
|
2006-12-02 21:54:26 +01:00
|
|
|
if rtime != None:
|
|
|
|
os.utime(os.path.join(tmpdir,tmpmessagename), (rtime,rtime))
|
2003-05-06 21:26:12 +02:00
|
|
|
ui.debug('maildir', 'savemessage: moving from %s to %s' % \
|
|
|
|
(tmpmessagename, messagename))
|
2007-06-13 05:42:15 +02:00
|
|
|
if tmpmessagename != messagename: # then rename it
|
|
|
|
os.link(os.path.join(tmpdir, tmpmessagename),
|
|
|
|
os.path.join(tmpdir, messagename))
|
|
|
|
os.unlink(os.path.join(tmpdir, tmpmessagename))
|
2007-03-28 22:23:18 +02:00
|
|
|
|
2008-08-02 22:31:43 +02:00
|
|
|
if self.dofsync:
|
|
|
|
try:
|
|
|
|
# fsync the directory (safer semantics in Linux)
|
|
|
|
fd = os.open(tmpdir, os.O_RDONLY)
|
|
|
|
os.fsync(fd)
|
|
|
|
os.close(fd)
|
|
|
|
except:
|
|
|
|
pass
|
2007-03-28 22:23:18 +02:00
|
|
|
|
2002-06-20 06:59:57 +02:00
|
|
|
self.messagelist[uid] = {'uid': uid, 'flags': [],
|
2007-06-13 05:42:15 +02:00
|
|
|
'filename': os.path.join(tmpdir, messagename)}
|
2002-06-21 03:12:52 +02:00
|
|
|
self.savemessageflags(uid, flags)
|
2003-05-06 21:26:12 +02:00
|
|
|
ui.debug('maildir', 'savemessage: returning uid %d' % uid)
|
2002-06-21 03:03:30 +02:00
|
|
|
return uid
|
2002-06-20 06:59:57 +02:00
|
|
|
|
2002-06-20 07:14:35 +02:00
|
|
|
def getmessageflags(self, uid):
|
2002-07-24 01:36:44 +02:00
|
|
|
return self.messagelist[uid]['flags']
|
2002-06-20 07:14:35 +02:00
|
|
|
|
|
|
|
def savemessageflags(self, uid, flags):
|
2002-07-24 01:36:44 +02:00
|
|
|
oldfilename = self.messagelist[uid]['filename']
|
2002-06-20 07:14:35 +02:00
|
|
|
newpath, newname = os.path.split(oldfilename)
|
2007-06-13 05:42:15 +02:00
|
|
|
tmpdir = os.path.join(self.getfullname(), 'tmp')
|
2003-06-27 02:03:07 +02:00
|
|
|
if 'S' in flags:
|
|
|
|
# If a message has been seen, it goes into the cur
|
|
|
|
# directory. CR debian#152482, [complete.org #4]
|
|
|
|
newpath = os.path.join(self.getfullname(), 'cur')
|
|
|
|
else:
|
|
|
|
newpath = os.path.join(self.getfullname(), 'new')
|
2002-06-20 07:14:35 +02:00
|
|
|
infostr = ':'
|
|
|
|
infomatch = re.search('(:.*)$', newname)
|
|
|
|
if infomatch: # If the info string is present..
|
|
|
|
infostr = infomatch.group(1)
|
|
|
|
newname = newname.split(':')[0] # Strip off the info string.
|
2002-06-21 06:04:47 +02:00
|
|
|
infostr = re.sub('2,[A-Z]*', '', infostr)
|
2002-06-20 07:14:35 +02:00
|
|
|
flags.sort()
|
|
|
|
infostr += '2,' + ''.join(flags)
|
|
|
|
newname += infostr
|
|
|
|
|
|
|
|
newfilename = os.path.join(newpath, newname)
|
|
|
|
if (newfilename != oldfilename):
|
|
|
|
os.rename(oldfilename, newfilename)
|
2002-07-24 01:36:44 +02:00
|
|
|
self.messagelist[uid]['flags'] = flags
|
|
|
|
self.messagelist[uid]['filename'] = newfilename
|
2002-06-20 07:14:35 +02:00
|
|
|
|
2007-06-13 05:42:15 +02:00
|
|
|
# By now, the message had better not be in tmp/ land!
|
|
|
|
final_dir, final_name = os.path.split(self.messagelist[uid]['filename'])
|
|
|
|
assert final_dir != tmpdir
|
|
|
|
|
2002-06-20 07:14:35 +02:00
|
|
|
def deletemessage(self, uid):
|
2002-06-21 06:30:08 +02:00
|
|
|
if not uid in self.messagelist:
|
|
|
|
return
|
2002-07-24 01:36:44 +02:00
|
|
|
filename = self.messagelist[uid]['filename']
|
2002-07-16 04:26:58 +02:00
|
|
|
try:
|
|
|
|
os.unlink(filename)
|
2002-08-17 03:01:12 +02:00
|
|
|
except OSError:
|
2002-07-16 04:26:58 +02:00
|
|
|
# Can't find the file -- maybe already deleted?
|
|
|
|
newmsglist = self._scanfolder()
|
|
|
|
if uid in newmsglist: # Nope, try new filename.
|
|
|
|
os.unlink(newmsglist[uid]['filename'])
|
|
|
|
# Yep -- return.
|
2002-06-20 07:14:35 +02:00
|
|
|
del(self.messagelist[uid])
|
|
|
|
|