Reformat offlineimap/folder/GmailMaildir.py
Add some spaces, remove lines,... now format is better (lintian).
This commit is contained in:
parent
af18230a2a
commit
2f97dda6d9
@ -25,6 +25,7 @@ import offlineimap.accounts
|
|||||||
from offlineimap import OfflineImapError
|
from offlineimap import OfflineImapError
|
||||||
from offlineimap import imaputil
|
from offlineimap import imaputil
|
||||||
|
|
||||||
|
|
||||||
class GmailMaildirFolder(MaildirFolder):
|
class GmailMaildirFolder(MaildirFolder):
|
||||||
"""Folder implementation to support adding labels to messages in a Maildir."""
|
"""Folder implementation to support adding labels to messages in a Maildir."""
|
||||||
|
|
||||||
@ -49,7 +50,7 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
|
|
||||||
if self._utime_from_header is True:
|
if self._utime_from_header is True:
|
||||||
raise Exception("GmailMaildir does not support quick mode"
|
raise Exception("GmailMaildir does not support quick mode"
|
||||||
" when 'utime_from_header' is enabled.")
|
" when 'utime_from_header' is enabled.")
|
||||||
|
|
||||||
self.cachemessagelist()
|
self.cachemessagelist()
|
||||||
# Folder has different uids than statusfolder => TRUE.
|
# Folder has different uids than statusfolder => TRUE.
|
||||||
@ -66,13 +67,11 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
return True
|
return True
|
||||||
return False # Nope, nothing changed.
|
return False # Nope, nothing changed.
|
||||||
|
|
||||||
|
|
||||||
# Interface from BaseFolder
|
# Interface from BaseFolder
|
||||||
def msglist_item_initializer(self, uid):
|
def msglist_item_initializer(self, uid):
|
||||||
return {'flags': set(), 'labels': set(), 'labels_cached': False,
|
return {'flags': set(), 'labels': set(), 'labels_cached': False,
|
||||||
'filename': '/no-dir/no-such-file/', 'mtime': 0}
|
'filename': '/no-dir/no-such-file/', 'mtime': 0}
|
||||||
|
|
||||||
|
|
||||||
def cachemessagelist(self, min_date=None, min_uid=None):
|
def cachemessagelist(self, min_date=None, min_uid=None):
|
||||||
if self.ismessagelistempty():
|
if self.ismessagelistempty():
|
||||||
self.messagelist = self._scanfolder(min_date=min_date,
|
self.messagelist = self._scanfolder(min_date=min_date,
|
||||||
@ -84,7 +83,6 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
filepath = os.path.join(self.getfullname(), msg['filename'])
|
filepath = os.path.join(self.getfullname(), msg['filename'])
|
||||||
msg['mtime'] = int(os.stat(filepath).st_mtime)
|
msg['mtime'] = int(os.stat(filepath).st_mtime)
|
||||||
|
|
||||||
|
|
||||||
def getmessagelabels(self, uid):
|
def getmessagelabels(self, uid):
|
||||||
# Labels are not cached in cachemessagelist because it is too slow.
|
# Labels are not cached in cachemessagelist because it is too slow.
|
||||||
if not self.messagelist[uid]['labels_cached']:
|
if not self.messagelist[uid]['labels_cached']:
|
||||||
@ -106,7 +104,6 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
|
|
||||||
return self.messagelist[uid]['labels']
|
return self.messagelist[uid]['labels']
|
||||||
|
|
||||||
|
|
||||||
def getmessagemtime(self, uid):
|
def getmessagemtime(self, uid):
|
||||||
if not 'mtime' in self.messagelist[uid]:
|
if not 'mtime' in self.messagelist[uid]:
|
||||||
return 0
|
return 0
|
||||||
@ -166,7 +163,7 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
|
|
||||||
# Change labels into content.
|
# Change labels into content.
|
||||||
labels_str = imaputil.format_labels_string(self.labelsheader,
|
labels_str = imaputil.format_labels_string(self.labelsheader,
|
||||||
sorted(labels | ignoredlabels))
|
sorted(labels | ignoredlabels))
|
||||||
|
|
||||||
# First remove old labels header, and then add the new one.
|
# First remove old labels header, and then add the new one.
|
||||||
content = self.deletemessageheaders(content, self.labelsheader)
|
content = self.deletemessageheaders(content, self.labelsheader)
|
||||||
@ -185,10 +182,10 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
os.rename(tmppath, filepath)
|
os.rename(tmppath, filepath)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
six.reraise(OfflineImapError,
|
six.reraise(OfflineImapError,
|
||||||
OfflineImapError("Can't rename file '%s' to '%s': %s"%
|
OfflineImapError("Can't rename file '%s' to '%s': %s" %
|
||||||
(tmppath, filepath, e[1]),
|
(tmppath, filepath, e[1]),
|
||||||
OfflineImapError.ERROR.FOLDER),
|
OfflineImapError.ERROR.FOLDER),
|
||||||
exc_info()[2])
|
exc_info()[2])
|
||||||
|
|
||||||
# If utime_from_header=true, we don't want to change the mtime.
|
# If utime_from_header=true, we don't want to change the mtime.
|
||||||
if self._utime_from_header and mtime:
|
if self._utime_from_header and mtime:
|
||||||
@ -216,7 +213,7 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
|
|
||||||
# First copy the message.
|
# First copy the message.
|
||||||
super(GmailMaildirFolder, self).copymessageto(uid, dstfolder,
|
super(GmailMaildirFolder, self).copymessageto(uid, dstfolder,
|
||||||
statusfolder, register)
|
statusfolder, register)
|
||||||
|
|
||||||
# Sync labels and mtime now when the message is new (the embedded labels
|
# Sync labels and mtime now when the message is new (the embedded labels
|
||||||
# are up to date, and have already propagated to the remote server. For
|
# are up to date, and have already propagated to the remote server. For
|
||||||
@ -226,7 +223,7 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
try:
|
try:
|
||||||
labels = dstfolder.getmessagelabels(uid)
|
labels = dstfolder.getmessagelabels(uid)
|
||||||
statusfolder.savemessagelabels(uid, labels,
|
statusfolder.savemessagelabels(uid, labels,
|
||||||
mtime=self.getmessagemtime(uid))
|
mtime=self.getmessagemtime(uid))
|
||||||
|
|
||||||
# dstfolder is not GmailMaildir.
|
# dstfolder is not GmailMaildir.
|
||||||
except NotImplementedError:
|
except NotImplementedError:
|
||||||
@ -274,7 +271,6 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
if selfmtime > statusmtime:
|
if selfmtime > statusmtime:
|
||||||
uidlist.append(uid)
|
uidlist.append(uid)
|
||||||
|
|
||||||
|
|
||||||
self.ui.collectingdata(uidlist, self)
|
self.ui.collectingdata(uidlist, self)
|
||||||
# This can be slow if there is a lot of modified files.
|
# This can be slow if there is a lot of modified files.
|
||||||
for uid in uidlist:
|
for uid in uidlist:
|
||||||
@ -309,7 +305,7 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
|
|
||||||
self.ui.addinglabels(uids, lb, dstfolder)
|
self.ui.addinglabels(uids, lb, dstfolder)
|
||||||
if self.repository.account.dryrun:
|
if self.repository.account.dryrun:
|
||||||
continue # Don't actually add in a dryrun.
|
continue # Don't actually add in a dryrun.
|
||||||
dstfolder.addmessageslabels(uids, set([lb]))
|
dstfolder.addmessageslabels(uids, set([lb]))
|
||||||
statusfolder.addmessageslabels(uids, set([lb]))
|
statusfolder.addmessageslabels(uids, set([lb]))
|
||||||
|
|
||||||
@ -320,7 +316,7 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
|
|
||||||
self.ui.deletinglabels(uids, lb, dstfolder)
|
self.ui.deletinglabels(uids, lb, dstfolder)
|
||||||
if self.repository.account.dryrun:
|
if self.repository.account.dryrun:
|
||||||
continue # Don't actually remove in a dryrun.
|
continue # Don't actually remove in a dryrun.
|
||||||
dstfolder.deletemessageslabels(uids, set([lb]))
|
dstfolder.deletemessageslabels(uids, set([lb]))
|
||||||
statusfolder.deletemessageslabels(uids, set([lb]))
|
statusfolder.deletemessageslabels(uids, set([lb]))
|
||||||
|
|
||||||
@ -334,7 +330,7 @@ class GmailMaildirFolder(MaildirFolder):
|
|||||||
break
|
break
|
||||||
|
|
||||||
if self.repository.account.dryrun:
|
if self.repository.account.dryrun:
|
||||||
continue # Don't actually update statusfolder.
|
continue # Don't actually update statusfolder.
|
||||||
|
|
||||||
filename = self.messagelist[uid]['filename']
|
filename = self.messagelist[uid]['filename']
|
||||||
filepath = os.path.join(self.getfullname(), filename)
|
filepath = os.path.join(self.getfullname(), filename)
|
||||||
|
Loading…
Reference in New Issue
Block a user