X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FIMAP.java;h=9588cb46c9d241c305f3104b15cca7def46136a6;hb=94ad82f9461422b78e0dbe4db58f9a9efdf95064;hp=4f60d0dc1194cc3ced59e3b035a68764d9bfffba;hpb=bea75eed0419e5888bda70d9cb1f3951a1a6d510;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/IMAP.java b/src/org/ibex/mail/IMAP.java index 4f60d0d..9588cb4 100644 --- a/src/org/ibex/mail/IMAP.java +++ b/src/org/ibex/mail/IMAP.java @@ -102,7 +102,7 @@ public class IMAP { Mailbox inbox = null; Mailbox selected = null; - MailboxTree root = null; + MailTree root = null; Mailbox selected() { if (selected == null) throw new Bad("no mailbox selected"); return selected; } final Login auth; final Client client; @@ -110,16 +110,26 @@ public class IMAP { public MailboxWrapper(Login auth, Client c) { this.auth=auth; this.client=c;} public void setClient(IMAP.Client client) { } + private String dirname(String name) { return name.substring(0, name.lastIndexOf(sep)); } + private String basename(String name) { return name.substring(name.lastIndexOf(sep)+1); } private Mailbox mailbox(String name, boolean create) { return mailbox(name, create, true); } private Mailbox mailbox(String name, boolean create, boolean throwexn) { if (name.equalsIgnoreCase("inbox")) return inbox; - MailboxTree m = root; + if (name.equalsIgnoreCase("trash")) name = "trash"; + MailTree mt = mailboxTree(name, create, throwexn); + Mailbox ret = mt==null ? null : mt.getMailbox(); + if (ret==null && throwexn) throw new Server.No("no such mailbox " + name); + return ret; + } + private MailTree mailboxTree(String name, boolean create) { return mailboxTree(name, create, true); } + private MailTree mailboxTree(String name, boolean create, boolean throwexn) { + MailTree m = root; for(StringTokenizer st = new StringTokenizer(name, sep + ""); st.hasMoreTokens();) if ((m = m.slash(st.nextToken(), create)) == null) { if (throwexn) throw new Server.No("no such mailbox " + name); return null; } - return m.getMailbox(); + return m; } // FEATURE: not accurate when a wildcard and subsequent non-wildcards both match a single component @@ -133,13 +143,13 @@ public class IMAP { if (ref.length() == 0) { client.list(sep, start, lsub, false); return; } while (start.endsWith(""+sep)) start = start.substring(0, start.length() - 1); if (ref.endsWith("%")) ref = ref + sep; - String[] children = (start.length() == 0 ? root : mailbox(start, false)).children(); + String[] children = (start.length() == 0 ? root : mailboxTree(start, false)).children(); for(int i=0; i 0 ? sep+"" : "") + s; if (mailbox(kid, false) == null) continue; - Mailbox phant = mailbox(kid, false, false); + MailTree phant = mailboxTree(kid, false, false); if (phant != null) { - boolean phantom = phant.phantom(); + boolean phantom = phant.getMailbox()==null; while(true) { if (pre.length() == 0) { if (s.length() == 0) client.list(sep, kid, lsub, phantom); @@ -174,8 +184,20 @@ public class IMAP { for(Mailbox.Iterator it=selected().iterator(q);it.next();) to.insert(it.cur(), it.getFlags() | Mailbox.Flag.RECENT); } public void unselect() { selected = null; } - public void delete(String m0) { delete(mailbox(m0,false)); } - public void delete(Mailbox m) { if (!m.equals(inbox)) m.destroy(false); else throw new Bad("can't delete inbox"); } + + public void delete(String m0) { mailboxTree(dirname(m0),false).rmdir(basename(m0)); } + + public void rename(String from0, String to) { + Mailbox from = mailbox(from0, false); + if (from.equals(inbox)) { from.copy(Query.all(), mailbox(to, true)); } + else if (to.equalsIgnoreCase("inbox")) { from.copy(Query.all(), mailbox(to, true)); delete(from0); } + else mailboxTree(dirname(from0), false) + .rename(dirname(from0), + mailboxTree(dirname(to), + true /* required by IMAP */), + basename(to)); + } + public void create(String m) { mailbox(m, true, false); } public void append(String m,int f,Date a,String b) { try { // FIXME: more efficient streaming here? @@ -193,8 +215,7 @@ public class IMAP { int ret = 0; Mailbox mb = selected(); if (mb == null) return 0; - for(Mailbox.Iterator it = mb.iterator(); it.next(); ) ret = it.uid(); - return ret; + return mb.maxuid(); } public int unseen(String mailbox) { return mailbox(mailbox, false).count(Query.not(Query.seen())); } public int recent(String mailbox) { return mailbox(mailbox, false).count(Query.recent()); } @@ -208,7 +229,8 @@ public class IMAP { Vec.Int vec = new Vec.Int(); for(Mailbox.Iterator it = selected().iterator(q); it.next();) { vec.addElement(uid ? it.uid() : it.imapNumber()); - it.setFlags(it.getFlags() & ~Mailbox.Flag.RECENT); + if ((it.getFlags() & Mailbox.Flag.RECENT) != 0) + it.setFlags(it.getFlags() & ~Mailbox.Flag.RECENT); } return vec.dump(); } @@ -229,15 +251,10 @@ public class IMAP { } } - public void rename(String from0, String to) { - Mailbox from = mailbox(from0, false); - if (from.equals(inbox)) { from.copy(Query.all(), mailbox(to, true)); } - else if (to.equalsIgnoreCase("inbox")) { from.copy(Query.all(), mailbox(to, true)); from.destroy(false); } - else from.rename(to); - } public void fetch(Query q, int spec, String[] headers, int start, int end, boolean uid) { for(Mailbox.Iterator it = selected().iterator(q); it.next(); ) { - Message message = ((spec & (BODYSTRUCTURE | ENVELOPE | INTERNALDATE | FIELDS | FIELDSNOT | RFC822 | + Message message = + ((spec & (BODYSTRUCTURE | ENVELOPE | INTERNALDATE | FIELDS | FIELDSNOT | RFC822 | RFC822TEXT | RFC822SIZE | HEADERNOT | HEADER)) != 0) ? it.cur() : null; long size = message == null ? 0 : message.getLength(); client.fetch(it.imapNumber(), it.getFlags(), (int)size, message, it.uid()); @@ -252,7 +269,7 @@ public class IMAP { public static class Listener implements Client { String selectedName = null; Mailbox inbox = null; - MailboxTree root = null; + MailTree root = null; Server api; Parser parser = null; Connection conn = null; @@ -276,8 +293,9 @@ public class IMAP { } else { Account account = (Account)ret; ((MailboxWrapper)api).root = root = account.getMailbox(IMAP.class); - ((MailboxWrapper)api).inbox = inbox = root.slash("INBOX", false).getMailbox(); - if (inbox == null) ((MailboxWrapper)api).inbox = inbox = root.getMailbox(); + MailTree ibt = root.slash("inbox", false); + Mailbox ib = ibt==null ? null : ibt.getMailbox(); + ((MailboxWrapper)api).inbox = inbox = ib; } } @@ -425,8 +443,8 @@ public class IMAP { lastfetch = t; int spec = 0; // spec; see constants for flags + int start = 0, len = 0; String[] headers = null; - int start = -1, end = -1; StringBuffer r = new StringBuffer(); if (e) { r.append(num); r.append(" FETCH ("); } int initlen = r.length(); @@ -490,19 +508,28 @@ public class IMAP { else if (s.equals("HEADER.FIELDS.NOT")) { spec |= FIELDSNOT; payload=Fountain.Util.create(headers(r,t[i].l()[1].sl(),true,m,e)); } else if (s.equals("MIME")) { throw new Server.Bad("MIME not supported"); } else throw new Server.Bad("unknown section type " + s); + if (i')); int dot = s.indexOf('.'); start = dot == -1 ? Integer.parseInt(s) : Integer.parseInt(s.substring(0, s.indexOf('.'))); - end = dot == -1 ? -1 : Integer.parseInt(s.substring(s.indexOf('.') + 1)); + len = dot == -1 ? -1 : Integer.parseInt(s.substring(s.indexOf('.') + 1)); if (e) { - //payload = payload.substring(start, Math.min(end+1,payload.getLength())); r.append("<"+start+">"); - // FIXME - throw new RuntimeException("this had to be disabled"); + if (start == 0 && len == -1) { + } else if (len == -1) { + payload = Fountain.Util.subFountain(payload, start); + } else { + len = (int)Math.min(len, payload.getLength()-start); + payload = Fountain.Util.subFountain(payload, start, len); + } + r.append("]"); + r.append("<"+start+"> "); } + } else { + if (e) r.append("] "); } - if (e) { r.append("] "); r.append(Printer.qq(payload.getStream())); } + if (e) r.append(Printer.qq(payload.getStream())); } } if ((spec & PEEK) == 0 && looked_at_body && e) @@ -511,7 +538,7 @@ public class IMAP { r.append(")"); println("* " + r.toString()); } else { - api.fetch(q, spec, headers, start, end, uid); + api.fetch(q, spec, headers, start, (len==-1?0:len), uid); } }