use file modification times instead of filename to record IMAP SEEN flag

darcs-hash:20041023214331-5007d-4d630730991fbad9b150476e24d002ef8f905af9.gz

diff --git a/src/org/ibex/mail/target/FileBasedMailbox.java b/src/org/ibex/mail/target/FileBasedMailbox.java
index 04c26d8..08da7b8 100644 (file)
--- a/src/org/ibex/mail/target/FileBasedMailbox.java
+++ b/src/org/ibex/mail/target/FileBasedMailbox.java
@@ -13,6 +13,8 @@ import java.text.*;
 /** An exceptionally crude implementation of Mailbox relying on POSIXy filesystem semantics */
 public class FileBasedMailbox extends Mailbox.Default {
 
+    public static final long MAGIC_DATE = 0;
+
     public String toString() { return "[FileBasedMailbox " + path.getAbsolutePath() + "]"; }
     private static final char slash = File.separatorChar;
     private static final WeakHashMap<String,FileBasedMailbox> instances = new WeakHashMap<String,FileBasedMailbox>();
@@ -99,9 +101,10 @@ public class FileBasedMailbox extends Mailbox.Default {
             private boolean seen;
             
             public Entry(Cache cache, Prevayler prevayler, String name) throws IOException {
-                seen = name.endsWith("s");
-                this.name = seen ? name.substring(0, name.length() - 1) : name;
-                headers = new MIME.Headers(new Stream(new FileInputStream(cache.dir.getParent()+slash+name)), true);
+                File f = new File(cache.dir.getParent()+slash+name);
+                seen = f.lastModified() == MAGIC_DATE;
+                this.name = name;
+                headers = new MIME.Headers(new Stream(new FileInputStream(f)), true);
                 prevayler.execute(new Transaction() {
                         public void executeOn(Object o, Date now) {
                             Cache cache = (Cache)o;
@@ -116,11 +119,11 @@ public class FileBasedMailbox extends Mailbox.Default {
             public int uid() { return uid; }
             public boolean seen() { return seen; }
             public void seen(Cache cache, boolean seen) {
-                String base = cache.dir.getParent() + slash + name;
-                File target = new File(base + (seen?"s":""));
                 this.seen = seen;
-                if (target.exists()) return;
-                new File(base + (seen?"":"s")).renameTo(target);
+                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;
@@ -193,7 +196,7 @@ public class FileBasedMailbox extends Mailbox.Default {
         try {
             String name; String fullname; File target; File f;
             do {
-                name = cache.uidNext(true) + "." + ((flags & Mailbox.Flag.SEEN) == Mailbox.Flag.SEEN ? "s" : "");
+                name = cache.uidNext(true) + ".";
                 fullname = path.getAbsolutePath() + slash + name;
                 target = new File(fullname);
                 f = new File(target.getCanonicalPath() + "-");
@@ -208,6 +211,7 @@ public class FileBasedMailbox extends Mailbox.Default {
             message.dump(stream);
             fo.close();
             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); }
     }