vmail 2.3.9 → 2.4.0

data/README.markdown

@@ -207,8 +207,9 @@ message window. Watch the status line.
 If you have `notify-send` (Linux) or `growlnotify` (OS X) installed on
 your system, Vmail will also poll your INBOX every 30 seconds for new
 messages. If it detects a new message, it will alert you through your
-notification program. **NOTE**: You will still have to press `u` in the
-Vmail interface to force the new messages to display.
+notification program. **NOTE**: This is an alert mechanism only;
+you will still have to manually check for new messages in the Vmail
+interface to force the new messages to display.
  
 ## Switching mailboxes, moving messages, copying messages to another mailbox
 

data/lib/vmail/imap_client.rb

@@ -214,6 +214,9 @@ module Vmail
       log "- got seqnos: #{ids.inspect}"
       log "- getting seqnos > #{self.max_seqno}"
       new_ids = ids.select {|seqno| seqno > self.max_seqno}
+      # reset the max_seqno
+      self.max_seqno = ids.max
+      log "- setting max_seqno to #{self.max_seqno}"
       log "- new uids found: #{new_ids.inspect}"
       new_ids
     end
@@ -222,7 +225,6 @@ module Vmail
       prime_connection
       new_ids = check_for_new_messages 
       if !new_ids.empty?
-        self.max_seqno = new_ids[-1]
         @ids = @ids + new_ids
         message_ids = fetch_and_cache_headers(new_ids)
         res = get_message_headers(message_ids)

data/lib/vmail/inbox_poller.rb

@@ -1,6 +1,7 @@
 module Vmail
   class InboxPoller < ImapClient
 
+
     # This is a second IMAP client operating in a separate process
  
     def start_polling
@@ -32,26 +33,36 @@ module Vmail
     def update
       new_ids = check_for_new_messages 
       if !new_ids.empty?
-        self.max_seqno = new_ids[-1]
         @ids = @ids + new_ids
-        message_ids = fetch_and_cache_headers(new_ids)
-        res = get_message_headers(message_ids)
+        res = uncached_headers(new_ids).map {|m| m[:sender] }.join(", ")
         @notifier.call "Vmail: new email", "from #{res}"
       end
     rescue
       log "VMAIL_ERROR: #{[$!.message, $!.backtrace].join("\n")}"
     end
 
-    def get_message_headers(message_ids)
-      messages = message_ids.map {|message_id| 
-        m = Message[message_id]
-        if m.nil?
-          raise "Message #{message_id} not found"
-        end
-        m
-      }
-      res = messages.map {|m| m.sender }.join(", ")
-      res
+    # doesn't try to access Sequel / sqlite3
+    def uncached_headers(id_set)
+      log "Fetching headers for #{id_set.size} messages"
+      results = reconnect_if_necessary do 
+        @imap.fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID"])
+      end
+      results.reverse.map do |x| 
+        envelope = x.attr["ENVELOPE"]
+        message_id = envelope.message_id
+        subject = Mail::Encodings.unquote_and_convert_to((envelope.subject || ''), 'UTF-8')
+        recipients = ((envelope.to || []) + (envelope.cc || [])).map {|a| extract_address(a)}.join(', ')
+        sender = extract_address envelope.from.first
+        uid = x.attr["UID"]
+        params = {
+          subject: (subject || ''),
+          flags: x.attr['FLAGS'].join(','),
+          date: Time.parse(envelope.date).localtime.to_s,
+          size: x.attr['RFC822.SIZE'],
+          sender: sender,
+          recipients: recipients
+        }
+      end
     end
 
     def log(string)

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.3.9'
+  VERSION = '2.4.0'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 3
-  - 9
-  version: 2.3.9
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Daniel Choi