vmail 0.8.7 → 0.8.8

data/lib/vmail/imap_client.rb

@@ -28,10 +28,16 @@ module Vmail
       @mailbox = nil
       @logger = Logger.new(config['logfile'] || STDERR)
       @logger.level = Logger::DEBUG
-      @current_mail = nil
-      @current_message_index = nil
       @imap_server = config['server'] || 'imap.gmail.com'
       @imap_port = config['port'] || 993
+      @current_mail = nil
+      @current_message_index = nil
+    end
+
+    # holds mail objects keyed by [mailbox, uid]
+    # TODO don't cache a mail if too large; or come up with a way to purge
+    def message_cache
+      @message_cache ||= {}
     end
 
     def open
@@ -361,27 +367,34 @@ module Vmail
 
     def show_message(index, raw=false)
       return if index.to_i < 0
-      log "showing message at #{index}" 
       return @current_mail.to_s if raw 
       index = index.to_i
       if index == @current_message_index 
         return @current_message 
       end
+
+      prefetch_adjacent(index)
+
       envelope_data = @message_list[index]
       seqno = envelope_data[:seqno]
       uid = envelope_data[:uid] 
-      log "showing message seqno: #{seqno} uid #{uid}"
-      fetch_data = reconnect_if_necessary do 
-        @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])[0]
-      end
-      res = fetch_data.attr["RFC822"]
-      mail = Mail.new(res) 
+      log "showing message index: #{index} seqno: #{seqno} uid #{uid}"
+
+      data = if x = message_cache[[@mailbox, uid]]
+               log "- message cache hit"
+               x
+             else 
+               log "- fetching and storing to message_cache[[#{@mailbox}, #{uid}]]"
+               fetch_and_cache(uid)
+             end
+      # pre-fetch prev and next
+
+      mail = data[:mail]
+      size = data[:size]
       @current_message_index = index
       @current_mail = mail # used later to show raw message or extract attachments if any
-      log "saving current mail with parts: #{@current_mail.parts.inspect}"
       formatter = Vmail::MessageFormatter.new(mail)
       out = formatter.process_body 
-      size = fetch_data.attr["RFC822.SIZE"]
       @current_message = <<-EOF
 #{@mailbox} seqno:#{envelope_data[:seqno]} uid:#{uid} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
 #{divider '-'}
@@ -391,7 +404,29 @@ module Vmail
 EOF
     rescue
       log "parsing error"
-      "Error encountered parsing this message:\n#{$!}"
+      "Error encountered parsing this message:\n#{$!}\n#{$!.backtrace.join("\n")}"
+    end
+
+    def fetch_and_cache(uid)
+      return if message_cache[[@mailbox, uid]] 
+      fetch_data = reconnect_if_necessary do 
+        @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])[0] 
+      end
+      d = {:mail => Mail.new(fetch_data.attr['RFC822']), :size => fetch_data.attr["RFC822.SIZE"]}
+      log "storing message_cache[[#{@mailbox}, #{uid}]]"
+      message_cache[[@mailbox, uid]] = d
+      d
+    end
+
+    def prefetch_adjacent(index)
+      Thread.new do 
+        [index + 1, index - 1].each do |idx|
+          envelope_data = @message_list[idx]
+          next unless envelope_data
+          uid = envelope_data[:uid] 
+          fetch_and_cache(uid)
+        end
+      end
     end
 
     def format_parts_info(parts)

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Daniel Choi