tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'abdo/decouple_utime_from_header' into next

Browse Source
This commit is contained in:
Nicolas Sebrecht 2015-04-06 17:49:16 +02:00
commit d52b1de3d0
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
offlineimap/folder/Base.py
View File

@ -692,9 +692,6 @@ class BaseFolder(object):
message = None message = None
flags = self.getmessageflags(uid) flags = self.getmessageflags(uid)
rtime = self.getmessagetime(uid) rtime = self.getmessagetime(uid)
if dstfolder.utime_from_header:
content = self.getmessage(uid)
rtime = emailutil.get_message_date(content, 'Date')
# If any of the destinations actually stores the message body, # If any of the destinations actually stores the message body,
# load it up. # load it up.
@ -766,9 +763,6 @@ class BaseFolder(object):
# dst has message with that UID already, only update status # dst has message with that UID already, only update status
flags = self.getmessageflags(uid) flags = self.getmessageflags(uid)
rtime = self.getmessagetime(uid) rtime = self.getmessagetime(uid)
if dstfolder.utime_from_header:
content = self.getmessage(uid)
rtime = emailutil.get_message_date(content, 'Date')
statusfolder.savemessage(uid, None, flags, rtime) statusfolder.savemessage(uid, None, flags, rtime)
continue continue

7
offlineimap/folder/Maildir.py
View File

@ -324,8 +324,11 @@ class MaildirFolder(BaseFolder):
tmpdir = os.path.join(self.getfullname(), 'tmp') tmpdir = os.path.join(self.getfullname(), 'tmp')
messagename = self.new_message_filename(uid, flags) messagename = self.new_message_filename(uid, flags)
tmpname = self.save_to_tmp_file(messagename, content) tmpname = self.save_to_tmp_file(messagename, content)
if rtime != None:
os.utime(os.path.join(self.getfullname(), tmpname), (rtime, rtime)) if self.utime_from_header:
date = emailutil.get_message_date(content, 'Date')
if date != None:
os.utime(os.path.join(self.getfullname(), tmpname), (date, date))
self.messagelist[uid] = self.msglist_item_initializer(uid) self.messagelist[uid] = self.msglist_item_initializer(uid)
self.messagelist[uid]['flags'] = flags self.messagelist[uid]['flags'] = flags