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

Gmail: allow parenthesis in labels

Browse Source 
Reported-by Heinrich Hartmann <Heinrich@HeinrichHartmann.com>
Tested-by Heinrich Hartmann <Heinrich@HeinrichHartmann.com>
Github-ref: https://github.com/OfflineIMAP/offlineimap/issues/545
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2018-05-05 01:26:42 +02:00
parent 356bd0b78f
commit fc61c6fd30
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
offlineimap/folder/Gmail.py
View File

@ -79,7 +79,7 @@ class GmailFolder(IMAPFolder):
# Embed the labels into the message headers # Embed the labels into the message headers
if self.synclabels: if self.synclabels:
m = re.search('X-GM-LABELS\s*\(([^\)]*)\)', data[0][0]) m = re.search('X-GM-LABELS\s*[(](.*)[)]', data[0][0])
if m: if m:
labels = set([imaputil.dequote(lb) for lb in imaputil.imapsplit(m.group(1))]) labels = set([imaputil.dequote(lb) for lb in imaputil.imapsplit(m.group(1))])
else: else:
@ -153,6 +153,7 @@ class GmailFolder(IMAPFolder):
if messagestr == None: if messagestr == None:
continue continue
messagestr = messagestr.split(' ', 1)[1] messagestr = messagestr.split(' ', 1)[1]
# e.g.: {'X-GM-LABELS': '("Webserver (RW.net)" "\\Inbox" GInbox)', 'FLAGS': '(\\Seen)', 'UID': '275440'}
options = imaputil.flags2hash(messagestr) options = imaputil.flags2hash(messagestr)
if not 'UID' in options: if not 'UID' in options:
self.ui.warn('No UID in message with options %s' %\ self.ui.warn('No UID in message with options %s' %\
@ -162,7 +163,8 @@ class GmailFolder(IMAPFolder):
uid = int(options['UID']) uid = int(options['UID'])
self.messagelist[uid] = self.msglist_item_initializer(uid) self.messagelist[uid] = self.msglist_item_initializer(uid)
flags = imaputil.flagsimap2maildir(options['FLAGS']) flags = imaputil.flagsimap2maildir(options['FLAGS'])
m = re.search('\(([^\)]*)\)', options['X-GM-LABELS']) # e.g.: '("Webserver (RW.net)" "\\Inbox" GInbox)'
m = re.search('^[(](.*)[)]', options['X-GM-LABELS'])
if m: if m:
labels = set([imaputil.dequote(lb) for lb in imaputil.imapsplit(m.group(1))]) labels = set([imaputil.dequote(lb) for lb in imaputil.imapsplit(m.group(1))])
else: else: