X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2Ftarget%2FFileBasedMailbox.java;h=bf5d370ecd344a00e0ae39084015b228a6b40761;hb=8bed6f7a1b4b9336c71c89711df9def5c27d22c5;hp=a934fac088861027b8a9bf3482cba81fb30bbde8;hpb=2dc579e8aa98e6823094d326d6447aaa647478e1;p=org.ibex.mail.git

diff --git a/src/org/ibex/mail/target/FileBasedMailbox.java b/src/org/ibex/mail/target/FileBasedMailbox.java
index a934fac..bf5d370 100644
--- a/src/org/ibex/mail/target/FileBasedMailbox.java
+++ b/src/org/ibex/mail/target/FileBasedMailbox.java
@@ -1,203 +1,247 @@
 package org.ibex.mail.target;
+import org.prevayler.*;
 import org.ibex.mail.*;
 import org.ibex.util.*;
 import org.ibex.io.*;
 import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
 import java.net.*;
 import java.util.*;
 import java.text.*;
 
-// FIXME: we can omit UIDNEXT!
-// FIXME use directory date/time as UIDNEXT and file date/time as UID; need to 'correct' file date/time after changes
-
 /** An exceptionally crude implementation of Mailbox relying on POSIXy filesystem semantics */
 public class FileBasedMailbox extends Mailbox.Default {
 
-    public String toString() { return "[FileBasedMailbox " + path + "]"; }
+    public static final long MAGIC_DATE = 0;
 
+    public String toString() { return "[FileBasedMailbox " + path.getAbsolutePath() + "]"; }
     private static final char slash = File.separatorChar;
-    private static final Hashtable instances = new Hashtable();
-    public static FileBasedMailbox getFileBasedMailbox(String path, boolean create) {
-        FileBasedMailbox ret = (FileBasedMailbox)instances.get(path);
-        if (ret != null) return ret;
-        File f = new File(path);
-        if (!create && !f.exists()) return null;
-        instances.put(path, ret = new FileBasedMailbox(path));
-        return ret;
-    }
+    private static final WeakHashMap<String,FileBasedMailbox> instances = new WeakHashMap<String,FileBasedMailbox>();
+    public Mailbox slash(String name, boolean create) { return getFileBasedMailbox(path.getAbsolutePath()+slash+name, create); }
 
-    public static final FilenameFilter filter = new FilenameFilter() {
-            public boolean accept(File f, String s) {
-                return s.indexOf('.') != -1;
-            } };
+    // FIXME: should be a File()
+    public static synchronized FileBasedMailbox getFileBasedMailbox(String path, boolean create) {
+        try {
+            FileBasedMailbox ret = instances.get(path);
+            if (ret == null) {
+                if (!create && !(new File(path).exists())) return null;
+                instances.put(path, ret = new FileBasedMailbox(new File(path)));
+            }
+            return ret;
+        } catch (Exception e) {
+            Log.error(FileBasedMailbox.class, e);
+            return null;
+        }
+    }
 
 
     // Instance //////////////////////////////////////////////////////////////////////////////
 
-    private String path;
-    private File uidNext;
-    private FileBasedMailbox(String path) throws MailException {
-        new File(this.path = path).mkdirs();
-        uidNext(false);
-    }
+    private File path;
+    private FileLock lock;
+    private Prevayler prevayler;
+    private Cache cache;
+
+    public static class Cache implements Serializable {
+        public            final int uidValidity = new Random().nextInt();
+        private           final Hashtable<String,Entry> byname = new Hashtable<String,Entry>();
+        private           final Hashtable<Integer,Entry> byuid = new Hashtable<Integer,Entry>();
+        private           final ArrayList<Entry>        linear = new ArrayList<Entry>();
+        public            final File dir;
+        private                 int uidNext = 0;
+
+        public Cache(File dir) { this.dir = dir; }
+
+        public void init(final Prevayler prevayler) throws IOException {
+            dir.mkdirs();
+            Log.info(this, "initializing maildir " + dir.getParent());
+            boolean invalid = false;
+            ArrayList<Transaction> kill = new ArrayList<Transaction>();
+            for(String s : byname.keySet()) {
+                String name = dir.getParent() + slash + s;
+                if (!new File(name).exists() && !new File(name+"s").exists()) {
+                    Log.error(this, "dropping message " + name);
+                    kill.add(new Drop(byname.get(s).uid()));
+                }
+            }
+            for(Transaction t : kill) prevayler.execute(t);
+            for(String file : new File(dir.getParent()).list())
+                if (file.charAt(0)!='.' && !(new File(dir.getParent() + slash + file).isDirectory()))
+                    if (get(file) == null) new Entry(this, prevayler, file);
+            Log.info(this, "  done initializing maildir " + dir.getParent());
+            new Thread() { public void run() {
+                try { prevayler.takeSnapshot(); } catch (Exception e) { Log.error(this, e); }
+            } }.start();
+        }
 
-    public Mailbox          slash(String name, boolean create) {
-        return FileBasedMailbox.getFileBasedMailbox(path + slash + name, create); }
+        public static class Drop implements Transaction {
+            int uid;
+            public Drop(int uid) { this.uid = uid; }
+            public void executeOn(Object o, Date now) {
+                Cache c = (Cache)o;
+                Entry e = c.get(uid);
+                c.byname.remove(e.name);
+                c.linear.remove(e);
+                c.byuid.remove(uid);
+            } 
+        }
+        
+        public synchronized int size() { return linear.size(); }
+        public synchronized int uidNext(boolean increment) { return increment ? uidNext++ : uidNext; }
+        public synchronized Entry get(int uid) { return byuid.get(uid); }
+        public synchronized Entry getLinear(int num) { return linear.get(num); }
+        public synchronized Entry get(String name) {
+            if (name.endsWith("s")) name = name.substring(0, name.length() - 1);
+            return byname.get(name);
+        }
 
-    public String[] children() {
-        Vec vec = new Vec();
-        String[] list = new File(path).list();
-        for(int i=0; i<list.length; i++) {
-            if (!(new File(path + slash + list[i]).isDirectory())) continue;
-            vec.addElement(list[i]);
+        public static class Entry implements Serializable {
+            private final byte[] header;
+            public final String name;
+            private int uid;
+            private boolean seen;
+            
+            public MIME.Headers headers() { return new MIME.Headers(new Stream(new ByteArrayInputStream(header)), true); }
+            public Entry(Cache cache, Prevayler prevayler, String name) throws IOException {
+                File f = new File(cache.dir.getParent()+slash+name);
+                seen = f.lastModified() == MAGIC_DATE;
+                this.name = name;
+                header = new MIME.Headers(new Stream(new FileInputStream(f)), true).toString().getBytes();
+                prevayler.execute(new Transaction() {
+                        public void executeOn(Object o, Date now) {
+                            Cache cache = (Cache)o;
+                            synchronized(cache) {
+                                Entry.this.uid = cache.uidNext(true);
+                                cache.linear.add(Entry.this);
+                                cache.byuid.put(Entry.this.uid, Entry.this);
+                                cache.byname.put(Entry.this.name, Entry.this);
+                            } } });
+            }
+
+            public int uid() { return uid; }
+            public boolean seen() { return seen; }
+            public void seen(Cache cache, boolean seen) {
+                this.seen = seen;
+                String base = cache.dir.getParent() + slash + name;
+                File target = new File(base);
+                if (!target.exists()) target = new File(base + "s");
+                target.setLastModified(seen ? System.currentTimeMillis() : MAGIC_DATE);
+            }
+            public void delete(Cache cache) {
+                String base = cache.dir.getParent() + slash + name;
+                File target = new File(base);
+                if (!target.exists()) target = new File(base + "s");
+                if (target.exists()) target.delete();
+            }
+            public Message message(Cache cache) { try {
+                String base = cache.dir.getParent() + slash + name;
+                File target = new File(base);
+                if (!target.exists()) target = new File(base + "s");
+                FileInputStream fis = null;
+                try {
+                    fis = new FileInputStream(target);
+                    return new Message(new Stream(fis), new Message.Envelope(null, null, new Date(target.lastModified())));
+                } finally { if (fis != null) fis.close(); }
+            } catch (IOException e) { throw new MailException.IOException(e);
+            } catch (Message.Malformed e) { throw new MailException(e.getMessage()); }
+            }
         }
-        String[] ret = new String[vec.size()];
-        vec.copyInto(ret);
-        return ret;
     }
 
-    public Mailbox.Iterator iterator() { return new FileBasedMailbox.Iterator(); }
-    public int              uidValidity() { return (int)(new File(path).lastModified() & 0xffffffL); }
+    private static void rmDashRf(File f) throws IOException {
+        if (!f.isDirectory()) { f.delete(); return; }
+        String[] children = f.list();
+        for(int i=0; i<children.length; i++) rmDashRf(new File(f.getAbsolutePath() + slash + children[i]));
+        f.delete();
+    }
+
+    private FileBasedMailbox(File path) throws MailException, IOException, ClassNotFoundException {
+        this.path = path;
+        path.mkdirs();
 
-    public int uidNext() { return uidNext(false); }
-    public int uidNext(boolean inc) {
+        // acquire lock
+        lock = new RandomAccessFile(this.path.getAbsolutePath() + slash + ".lock", "rw").getChannel().tryLock();
+        if (lock == null) throw new IOException("unable to lock FileBasedMailbox");
+
+        File cacheDir = new File(path.getAbsolutePath() + slash + ".cache");
         try {
-            uidNext = new File(path + slash + "UIDNEXT");
-            if (!uidNext.exists()) {
-                File tmp = new File(uidNext + "-");
-                PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(tmp)));
-                pw.println("1");
-                pw.flush();
-                pw.close();
-                tmp.renameTo(uidNext);
-                return 1;
-            }
-            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(uidNext)));
-            int ret = Integer.parseInt(br.readLine());
-            br.close();
-            if (inc) {
-                File tmp = new File(uidNext + "-");
-                PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(tmp)));
-                pw.println(ret+1);
-                pw.flush();
-                pw.close();
-                tmp.renameTo(uidNext);
-            }
-            return ret;
-        } catch (IOException e) { throw new MailException.IOException(e); }
-    }        
+            prevayler = PrevaylerFactory.createPrevayler(new Cache(cacheDir), cacheDir.getAbsolutePath());
+            cache = (Cache)prevayler.prevalentSystem();
+        } catch (Throwable t) {
+            Log.warn(this, "error while attempting to reconstitute a FileBasedMailbox.cache:");
+            Log.warn(this, t);
+            Log.warn(this, "discarding cache...");
+            rmDashRf(cacheDir);
+            prevayler = PrevaylerFactory.createPrevayler(new Cache(cacheDir), cacheDir.getAbsolutePath());
+            cache = (Cache)prevayler.prevalentSystem();
+        }
+        cache.init(prevayler);
+    }
+
 
+    public Mailbox.Iterator  iterator()           { return new Iterator(); }
+    public int               uidValidity()        { return cache.uidValidity; }
     public synchronized void add(Message message) { add(message, Mailbox.Flag.RECENT); }
+    public String[] children() {
+        Vec vec = new Vec();
+        String[] list = path.list();
+        for(int i=0; i<list.length; i++) {
+            File f = new File(path.getAbsolutePath() + slash + list[i]);
+            if (f.isDirectory() && f.getName().charAt(0) != '.') vec.addElement(list[i]);
+        }
+        return (String[])vec.copyInto(new String[vec.size()]);
+    }
+
+    public int uidNext() { return cache.uidNext(false); }
     public synchronized void add(Message message, int flags) {
-        Log.info(this, "adding message to ["+toString()+"]:\n" + message.summary());
+        Log.info(path, message.summary());
         try {
-            int num = new File(path).list(filter).length;
-	    String name = path + slash + uidNext(true) + "." +
-                ((flags & Mailbox.Flag.DELETED) == Mailbox.Flag.DELETED ? "x" : "") +
-                ((flags & Mailbox.Flag.DRAFT) == Mailbox.Flag.DRAFT ? "d" : "") +
-                ((flags & Mailbox.Flag.RECENT) == Mailbox.Flag.RECENT ? "r" : "") +
-                ((flags & Mailbox.Flag.ANSWERED) == Mailbox.Flag.ANSWERED ? "a" : "") +
-                ((flags & Mailbox.Flag.FLAGGED) == Mailbox.Flag.FLAGGED ? "f" : "") +
-                ((flags & Mailbox.Flag.SEEN) == Mailbox.Flag.SEEN ? "s" : "");
-            Log.info(this, "    with chosen filename " + name);
-            File target = new File(name);
-            File f = new File(target.getCanonicalPath() + "-");
+            String name; String fullname; File target; File f;
+            do {
+                name = cache.uidNext(true) + ".";
+                fullname = path.getAbsolutePath() + slash + name;
+                target = new File(fullname);
+                f = new File(target.getCanonicalPath() + "-");
+                Log.error(this, "aieeee!!!! target of add() already exists: " + target.getAbsolutePath());
+            } while (f.exists() || target.exists());
             FileOutputStream fo = new FileOutputStream(f);
             Stream stream = new Stream(fo);
-            stream.println("X-org.ibex.mail.headers.envelope.From: " + message.envelope.from);
-            stream.println("X-org.ibex.mail.headers.envelope.To: " + message.envelope.to);
+            if (message.envelope != null) {
+                stream.println("X-org.ibex.mail.headers.envelope.From: " + message.envelope.from);
+                stream.println("X-org.ibex.mail.headers.envelope.To: " + message.envelope.to);
+            }
             message.dump(stream);
             fo.close();
-            f.renameTo(target);
-            Log.info(this, "    done writing.");
+            f.renameTo(new File(fullname));
+            if ((flags & Mailbox.Flag.SEEN) == Mailbox.Flag.SEEN) f.setLastModified(MAGIC_DATE);
+            new Cache.Entry(cache, prevayler, name);
         } catch (IOException e) { throw new MailException.IOException(e); }
     }
 
     private class Iterator extends Mailbox.Default.Iterator {
         int cur = -1;
-        private String[] names;
-        private boolean seen = false, deleted = false, draft = false, flagged = false, answered = false, recent = false;
-        public Iterator() { names = new File(path).list(filter); }
-
-        public Message head() { return cur(); }
-        public Message cur() {
-	    if (cur >= names.length) return null;
-            try {
-                File file = new File(path + File.separatorChar + names[cur]);
-                FileInputStream fis = new FileInputStream(file);
-                Stream stream = new Stream(fis);
-                Address envelopeFrom = null;
-                Address envelopeTo = null;
-                /*
-                for(String s = stream.readln(); s != null; s = stream.readln()) {
-                    if (s.startsWith("X-org.ibex.mail.headers.envelope.From: "))
-                        envelopeFrom = Address.parse(s.substring(38).trim());
-                    else if (s.startsWith("X-org.ibex.mail.headers.envelope.To: "))
-                        envelopeTo = Address.parse(s.substring(36).trim());
-                    else {
-                        stream.unread(s + "\r\n");
-                        break;
-                    }
-                }
-                */
-                Message ret = new Message(stream, new Message.Envelope(null, null, new Date(file.lastModified())));
-                fis.close();
-                return ret;
-            } catch (IOException e) { throw new MailException.IOException(e);
-            } catch (Message.Malformed e) { throw new MailException(e.getMessage()); }
-        }
-        public boolean next() {
-            cur++;
-            if (cur >= names.length) return false;
-            String name = names[cur].substring(names[cur].indexOf('.') + 1);
-	    if (!(new File(path + File.separatorChar + names[cur])).exists()) return next();
-            seen     = name.indexOf('s') != -1;
-            deleted  = name.indexOf('x') != -1;
-            flagged  = name.indexOf('f') != -1;
-            draft    = name.indexOf('d') != -1;
-            answered = name.indexOf('a') != -1;
-            recent   = name.indexOf('r') != -1;
-            return true;
-        }
-        public int num() { return cur; }
-        public int uid() {
-            try { return Integer.parseInt(names[cur].substring(0, names[cur].indexOf('.')));
-            } catch (NumberFormatException nfe) {
-                Log.warn(FileBasedMailbox.class, "NumberFormatException: " + names[cur].substring(0, names[cur].length() - 1));
-                return -1; } }
-
-        private void fixflags() {
-            String newName =
-                names[cur].substring(0, names[cur].indexOf('.') + 1) +
-                (seen ? "s" : "") +
-                (deleted ? "x" : "") +
-                (flagged ? "f" : "") +
-                (draft ? "d" : "") +
-                (recent ? "r" : "") +
-                (answered ? "a" : "");
-            new File(path + File.separatorChar + names[cur]).renameTo(new File(path + File.separatorChar + newName));
-            names[cur] = newName;
-        }
-
-        public void    delete() {
-	    new File(path + File.separatorChar + names[cur]).delete();
-	    // FIXME remove from list?
-	}
-        public void    set(String key, String val) { throw new MailException("not supported"); }
-        public String  get(String key) { throw new MailException("not supported"); }
-
-        public boolean seen() { return seen; }
-        public boolean deleted() { return deleted; }
-        public boolean flagged() { return flagged; }
-        public boolean draft() { return draft; }
-        public boolean answered() { return answered; }
-        public boolean recent() { return recent; }
-        public void    seen(boolean on) { seen = on; fixflags(); }
-        public void    deleted(boolean on) { deleted = on; fixflags(); }
-        public void    flagged(boolean on) { flagged = on; fixflags(); }
-        public void    draft(boolean on) { draft = on; fixflags(); }
-        public void    answered(boolean on) { answered = on; fixflags(); }
-        public void    recent(boolean on) { recent = on; fixflags(); }
+        private Cache.Entry entry() { return cache.getLinear(cur); }
+        public MIME.Headers head() { return done() ? null : entry().headers(); }
+        public boolean done() { return cur >= cache.size(); }
+        public boolean next() { cur++; return !done(); }
+        public boolean seen() { return done() ? false : entry().seen(); }
+        public int num() { return cur+1; }  // EUDORA insists that message numbers start at 1, not 0
+        public int uid() { return done() ? -1 : entry().uid(); }
+        public Message cur() { return done() ? null : entry().message(cache); }
+        public void seen(boolean seen) { prevayler.execute(new Seen(uid(), seen)); }
+        public void delete() { if (!done()) prevayler.execute(new Delete(uid())); }
+    }
 
+    private static class Delete implements Transaction {
+        private int uid;
+        public Delete(int uid) { this.uid = uid; }
+        public void executeOn(Object c, Date d) { ((Cache)c).get(uid).delete((Cache)c); }
+    }
+    private static class Seen implements Transaction {
+        private int uid;
+        private boolean seen;
+        public Seen(int uid, boolean seen) { this.uid = uid; this.seen = seen; }
+        public void executeOn(Object c, Date d) { ((Cache)c).get(uid).seen((Cache)c, seen); }
     }
 }