mirror/archivemail
1
0
Fork 0
mirror of https://git.code.sf.net/p/archivemail/code synced 2025-03-12 15:52:50 +00:00
Code Issues Releases Wiki Activity

Simplify imap_get_namespace() and imap_guess_mailboxnames()

Browse source 
I don't think anybody wants to archive folders in shared or public IMAP
namespaces, so we don't bother checking all possible namespaces.  The code was
ugly anyway.
This commit is contained in:
Nikolaus Schulz 2008-12-18 21:56:00 +01:00
parent 9574c4f41c
commit bd85cffe37
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
archivemail.py
View file

@ -1533,9 +1533,13 @@ def imap_get_namespace(srv):
# ['(("INBOX." ".")) NIL (("#shared." ".")("shared." "."))'] or
# ['(("" ".")) NIL NIL'], see RFC 2342.
# Make a reasonable guess parsing this beast.
ns = re.findall(r'\("([^"]*)" (?:"(.)"|NIL)', response[0])
assert(ns)
return ns
try:
m = re.match(r'\(\("([^"]*)" (?:"(.)"|NIL)', response[0])
nsprefix, hdelim = m.groups()
except:
print "Cannot parse IMAP NAMESPACE response %s" % repr(response)
raise
return nsprefix, hdelim
def imap_smart_select(srv, mailbox):
@ -1600,25 +1604,21 @@ def imap_guess_mailboxnames(srv, mailbox):
of preference, compiled by prepending an IMAP namespace prefix if necessary,
and by translating hierarchy delimiters."""
if 'NAMESPACE' in srv.capabilities:
namespace_response = imap_get_namespace(srv)
for nsprefix, hdelim in namespace_response:
if mailbox.startswith(nsprefix):
mailbox = mailbox[len(nsprefix):]
break
else:
# mailbox doesn't start with a namespace prefix;
# choose private namespace, which is the first one.
nsprefix, hdelim = namespace_response[0]
nsprefix, hdelim = imap_get_namespace(srv)
else:
vprint("Server doesn't support NAMESPACE command.")
nsprefix = ""
hdelim = imap_getdelim(srv)
vprint("IMAP namespace prefix: '%s', hierarchy delimiter: '%s'" % \
(nsprefix, hdelim))
boxnames = [nsprefix + mailbox]
if os.path.sep in mailbox and hdelim:
if mailbox.startswith(nsprefix):
boxnames = [mailbox]
else:
boxnames = [nsprefix + mailbox]
if os.path.sep in mailbox and hdelim is not None:
mailbox = mailbox.replace(os.path.sep, hdelim)
boxnames.append(mailbox) # could have a valid namespace prefix now
if mailbox.startswith(nsprefix):
boxnames.append(mailbox)
if nsprefix:
boxnames.append(nsprefix + mailbox)
return boxnames