Changeset 264

Timestamp:

08/03/08 02:00:51 PM (4 months ago)

Author:

octorian

Message:

More UID FETCH code

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• mail/AbstractMailStore.java (modified) (1 diff)
• mail/imap/ImapClient.java (modified) (4 diffs)
• mail/imap/ImapProtocol.java (modified) (4 diffs)
• mail/IncomingMailClient.java (modified) (1 diff)
• mail/IncomingMailConnectionHandler.java (modified) (2 diffs)
• mail/NetworkMailStore.java (modified) (1 diff)
• mail/pop/PopClient.java (modified) (1 diff)
• model/MailboxNode.java (modified) (2 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailStore.java

@@ -151 +151 @@
      * 
      * @param folder The folder to request a message listing for.
-     * @param count The maximum number of messages to get headers for.
-     */
-    public abstract void requestFolderMessagesRecent(FolderTreeItem folder, int count);
+     */
+    public abstract void requestFolderMessagesRecent(FolderTreeItem folder);
     
     /**

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapClient.java

@@ -91 +91 @@
     private FolderTreeItem activeMailbox = null;
 
+    /**
+     * Seen mailboxes, used to track whether fetching new
+     * messages should be based on a limited range, or
+     * the UIDNEXT parameter.
+     */
+    private Hashtable seenMailboxes = new Hashtable();
+    
+    /**
+     * Known mailboxes, used to track protocol-specific
+     * information on mailboxes that is not exposed
+     * to other classes.
+     */
+    private Hashtable knownMailboxes = new Hashtable();
+    
     public ImapClient(GlobalConfig globalConfig, ImapConfig accountConfig) {
         this.accountConfig = accountConfig;
@@ -361 +375 @@
         this.activeMailbox = mailbox;
         activeMailbox.setMsgCount(response.exists);
+        knownMailboxes.put(activeMailbox, response);
         
         // ideally, this should parse out the message counts
@@ -375 +390 @@
                 imapProtocol.executeFetchEnvelope(firstIndex, lastIndex);
         
+        return prepareFolderMessages(response);
+    }
+
+    public FolderMessage[] getNewFolderMessages() throws IOException, MailException {
+        // Sanity check
+        if(activeMailbox == null) {
+                throw new MailException("Mailbox not selected");
+        }
+        
+        FolderMessage[] result;
+        if(!seenMailboxes.containsKey(activeMailbox)) {
+                int count = MailSettings.getInstance().getGlobalConfig().getRetMsgCount();
+                        int msgCount = activeMailbox.getMsgCount();
+                int firstIndex = Math.max(1, msgCount - count);
+                result = getFolderMessages(firstIndex, activeMailbox.getMsgCount());
+                seenMailboxes.put(activeMailbox, new Object());
+        }
+        else {
+                int uidNext = ((ImapProtocol.SelectResponse)knownMailboxes.get(activeMailbox)).uidNext;
+                ImapProtocol.FetchEnvelopeResponse[] response =
+                        imapProtocol.executeFetchEnvelopeUid(uidNext);
+                result = prepareFolderMessages(response);
+                
+                if(result.length > 0) {
+                        uidNext = result[result.length-1].getUid() + 1;
+                        ((ImapProtocol.SelectResponse)knownMailboxes.get(activeMailbox)).uidNext = uidNext;
+                }
+        }
+        return result;
+    }
+
+    private FolderMessage[] prepareFolderMessages(ImapProtocol.FetchEnvelopeResponse[] response) {
         FolderMessage[] folderMessages = new FolderMessage[response.length];
         for(int i=0;i<response.length;i++) {
@@ -386 +433 @@
             folderMessages[i].setJunk(response[i].flags.junk);
         }
-        
-        return folderMessages;
-    }
-
+        return folderMessages;
+    }
+    
     public Message getMessage(FolderMessage folderMessage) throws IOException, MailException {
         ImapParser.MessageSection structure = getMessageStructure(folderMessage.getUid());

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java

@@ -477 +477 @@
                                    Integer.toString(lastIndex) +
                                    " (FLAGS UID ENVELOPE)");
-        
-        FetchEnvelopeResponse[] envResponses = new FetchEnvelopeResponse[(lastIndex - firstIndex)+1];
-        
-        // Pre-process the returned text to clean up mid-field line breaks
+        return prepareFetchEnvelopeResponse(rawList);
+    }
+
+    /**
+     * Execute the "UID FETCH (FLAGS UID ENVELOPE)" command
+     * @param uidNext Unique ID of the next message
+     * @return Array of FetchEnvelopeResponse objects
+     */
+    public FetchEnvelopeResponse[] executeFetchEnvelopeUid(int uidNext) throws IOException, MailException {
+        if(EventLogger.getMinimumLevel() >= EventLogger.DEBUG_INFO) {
+            EventLogger.logEvent(
+            AppInfo.GUID,
+            ("ImapProtocol.executeFetchEnvelopeUid("+uidNext+")").getBytes(),
+            EventLogger.DEBUG_INFO);
+        }
+        
+        String[] rawList = execute("UID FETCH",
+                Integer.toString(uidNext) + ":*" +
+                " (FLAGS UID ENVELOPE)");
+        
+        return prepareFetchEnvelopeResponse(rawList);
+    }
+    
+    private FetchEnvelopeResponse[] prepareFetchEnvelopeResponse(String[] rawList) throws IOException, MailException {
+        // Preprocess the returned text to clean up mid-field line breaks
         // This should all become unnecessary once execute()
         // becomes more intelligent in how it handles replies
@@ -500 +521 @@
         }
         
-        int index = 0;
+        Vector envResponses = new Vector();
         int size = rawList2.size();
         for(int i=0;i<size;i++) {
@@ -558 +579 @@
                 envRespItem.index = midx;
                 envRespItem.envelope = env;
-                envResponses[index++] = envRespItem;
+                envResponses.addElement(envRespItem);
             } catch (Exception exp) {
                 System.err.println("Parse error: " + exp);
@@ -564 +585 @@
         }
 
-        return envResponses;
-    }
-
+        FetchEnvelopeResponse[] result = new FetchEnvelopeResponse[envResponses.size()];
+        envResponses.copyInto(result);
+        return result;
+    }
+    
     /**
      * Execute the "FETCH (BODYSTRUCTURE)" command

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/IncomingMailClient.java

@@ -129 +129 @@
     
     /**
+     * Get a list of new messages in the selected folder.
+     * On the first invocation, it will return the most recent messages
+     * up to the limit configured in the global configuration.
+     * On subsequent invocations, if the underlying protocol supports it,
+     * this method should return all new messages that have entered the
+     * mailbox since.  Otherwise, it will behave the same as it
+     * did on the first invocation.
+     * 
+     * @return List of message envelopes
+     * @throw IOException on I/O errors
+     * @throw MailException on protocol errors
+     */
+    public abstract FolderMessage[] getNewFolderMessages() throws IOException, MailException;
+    
+    /**
      * Get a particular message from the selected folder.
      * The details of message retrieval should be constrained by

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/IncomingMailConnectionHandler.java

@@ -90 +90 @@
                 case REQUEST_FOLDER_MESSAGES_RECENT:
                         handleRequestFolderMessagesRecent(
-                                        (FolderTreeItem)params[0],
-                                        ((Integer)params[1]).intValue());
+                                        (FolderTreeItem)params[0]);
                         break;
                 case REQUEST_MESSAGE:
@@ -158 +157 @@
         }
         
-        private void handleRequestFolderMessagesRecent(FolderTreeItem folder, int count) throws IOException, MailException {
-                checkActiveFolder(folder);
-                int msgCount = incomingClient.getActiveFolder().getMsgCount();
-        int firstIndex = Math.max(1, msgCount - count);
+        private void handleRequestFolderMessagesRecent(FolderTreeItem folder) throws IOException, MailException {
+                checkActiveFolder(folder);
         
-                FolderMessage[] messages = incomingClient.getFolderMessages(firstIndex, msgCount);
+                FolderMessage[] messages = incomingClient.getNewFolderMessages();
                 
                 MailConnectionHandlerListener listener = getListener();

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/NetworkMailStore.java

@@ -123 +123 @@
         }
         
-        public void requestFolderMessagesRecent(FolderTreeItem folder, int count) {
+        public void requestFolderMessagesRecent(FolderTreeItem folder) {
                 connectionHandler.addRequest(
                                 IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RECENT,
-                                new Object[] { folder, new Integer(count) });
+                                new Object[] { folder });
         }
         

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/pop/PopClient.java

@@ -246 +246 @@
     }
 
+    public FolderMessage[] getNewFolderMessages() throws IOException, MailException {
+        int count = MailSettings.getInstance().getGlobalConfig().getRetMsgCount();
+                int msgCount = activeMailbox.getMsgCount();
+        int firstIndex = Math.max(1, msgCount - count);
+        return getFolderMessages(firstIndex, activeMailbox.getMsgCount());
+    }
+
     public Message getMessage(FolderMessage folderMessage) throws IOException, MailException {
         // Figure out the max number of lines

trunk/LogicMail/src/org/logicprobe/LogicMail/model/MailboxNode.java

@@ -37 +37 @@
 import java.util.Vector;
 
-import org.logicprobe.LogicMail.conf.MailSettings;
 import org.logicprobe.LogicMail.mail.FolderTreeItem;
 import org.logicprobe.LogicMail.util.EventListenerList;
@@ -434 +433 @@
      */
     public void refreshMessages() {
-        parentAccount.getMailStore().requestFolderMessagesRecent(
-                        this.folderTreeItem,
-                        MailSettings.getInstance().getGlobalConfig().getRetMsgCount());
+        parentAccount.getMailStore().requestFolderMessagesRecent(this.folderTreeItem);
     }