vmail 0.4.5 → 0.4.6

data/README.markdown

@@ -63,6 +63,9 @@ You can omit the password key-value pair if you'd rather not have the password
 saved in the file. In that case, you'll prompted for the password each time you
 start vmail.
 
+If you are behind a firewall that blocks IMAP, there are additional
+configuration options that you can use. See below.
+
 ## Contacts autocompletion
 
 vmail uses Vim autocompletion to help you auto-complete email addresses.
@@ -398,6 +401,24 @@ vmail gem is downloaded from).
 [github]:https://github.com/danchoi/vmail
 [rubygems]:https://rubygems.org/gems/vmail
 
+## Additional configuration options
+
+The default IMAP server vmail uses is `imap.gmail.com` and the default port is
+`993`. If you want to change these values, e.g, because you are behind a
+firewall which blocks IMAP, you can change these values by adding two lines in
+your .vmailrc, like so:
+
+    server: localhost
+    port: 2999
+
+Then you can create an SSH tunnel, e.g.
+
+    ssh -f user@example.com -L 2999:imap.gmail.com:993 -N
+
+(Thanks to [Dave Bolton][davebolton] for this patch.)
+
+[davebolton]:https://github.com/lightningdb
+
 ## Bug reports, feature requests
 
 Please file bug reports and feature requests in the [vmail github issue tracker][tracker].

data/Rakefile

@@ -12,12 +12,18 @@ task :web do
   end
 end
 
+desc "git push and rake release bumped version"
+task :bumped do
+  puts `git commit -a -m'bump' && git push && rake release`
+end
+
 desc "Run tests"
 task :test do 
   $:.unshift File.expand_path("test")
   require 'test_helper'
   require 'time_format_test'
   require 'message_formatter_test'
+  require 'reply_template_test'
   require 'base64_test'
   MiniTest::Unit.autorun
 end

data/lib/vmail.rb

@@ -1,3 +1,4 @@
+require 'vmail/version'
 require 'vmail/options'
 require 'vmail/imap_client'
 
@@ -5,6 +6,7 @@ module Vmail
   extend self
 
   def start
+    puts "starting vmail #{Vmail::VERSION}"
 
     vim = ENV['VMAIL_VIM'] || 'vim'
 

data/lib/vmail.vim

@@ -83,9 +83,9 @@ function! s:show_message()
   " moving up when the next echo statement executes:
   call feedkeys(":\<cr>") 
   redraw
-  let selected_uid = matchstr(line, '^\d\+')
-  let s:current_uid = selected_uid
-  let command = s:show_message_command . s:current_uid
+  " substract 2: because lines numbers start at 1 & messages start at line 2
+  let s:current_message_index = line('.') - 2
+  let command = s:show_message_command . s:current_message_index
   echom "Loading message. Please wait..."
   redrawstatus
   let res = system(command)
@@ -133,7 +133,7 @@ endfunction
 
 " invoked from withint message window
 function! s:show_raw()
-  let command = s:show_message_command . s:current_uid . ' raw'
+  let command = s:show_message_command . s:current_message_index . ' raw'
   echo command
   setlocal modifiable
   1,$delete
@@ -198,29 +198,21 @@ function! s:update()
 endfunction
 
 function! s:toggle_star() range
-  let lnum = a:firstline
-  let n = 0
-  let uids = []
-  while lnum <= a:lastline
-    let line =  getline(lnum)
-    let message_uid = matchstr(line, '^\d\+')
-    call add(uids, message_uid)
-    let lnum = lnum + 1
-  endwhile
-  let uid_set = join(uids, ",")
+  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
   let flag_symbol = "[*]"
   " check if starred already
   let action = " +FLAGS"
-  if (match(line, flag_symbol) != -1)
+  if (match(getline(a:firstline), flag_symbol) != -1)
     let action = " -FLAGS"
   endif
   let command = s:flag_command . uid_set . action . " Flagged" 
-  if len(uids) == 1
-    echom "toggling flag on message " . uid_set
+  if (a:lastline - a:firstline + 1) == 1
+    echom "toggling flag on message" 
   else
-    echom "toggling flags on messages " . join(uid_set, ",")
+    echom "toggling flags on " . (a:lastline - a:firstline + 1) . " messages"
   endif
-  " toggle [*] on lines
+  " toggle [*] on lines; TODO: do this all in vimscript and do the starring
+  " in a thread in imap_client
   let res = system(command)
   setlocal modifiable
   exec a:firstline . "," . a:lastline . "delete"
@@ -232,22 +224,19 @@ function! s:toggle_star() range
   if len(split(res, "\n")) > 2
     call feedkeys("\<cr>")
   endif
+  echom "done" 
 endfunction
 
 " flag can be Deleted or [Gmail]/Spam
 func! s:delete_messages(flag) range
-  let lnum = a:firstline
-  let n = 0
-  let uids = []
-  while lnum <= a:lastline
-    let line =  getline(lnum)
-    let message_uid = matchstr(line, '^\d\+')
-    call add(uids, message_uid)
-    let lnum = lnum + 1
-  endwhile
-  let uid_set = join(uids, ",")
+  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
   let command = s:flag_command . uid_set . " +FLAGS " . a:flag
-  echo command
+  let nummsgs = (a:lastline - a:firstline + 1)
+  if nummsgs == 1
+    echom "deleting message" 
+  else
+    echom "deleting " . (a:lastline - a:firstline + 1) . " messages"
+  endif
   let res = system(command)
   setlocal modifiable
   exec a:firstline . "," . a:lastline . "delete"
@@ -255,53 +244,39 @@ func! s:delete_messages(flag) range
   write
   " if more than 2 lines change, vim forces us to look at a message.
   " dismiss it.
-  if len(uids) > 2
+  if nummsgs > 2
     call feedkeys("\<cr>")
   endif
   redraw
-  echo len(uids) . " message" . (len(uids) == 1 ? '' : 's') . " marked " . a:flag
+  echo nummsgs .  " message" . (nummsgs == 1 ? '' : 's') . " marked " . a:flag
 endfunc
 
 func! s:archive_messages() range
-  let lnum = a:firstline
-  let n = 0
-  let uids = []
-  while lnum <= a:lastline
-    let line =  getline(lnum)
-    let message_uid = matchstr(line, '^\d\+')
-    call add(uids, message_uid)
-    let lnum = lnum + 1
-  endwhile
-  let uid_set = join(uids, ",")
+  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
   let command = s:move_to_command . uid_set . ' ' . "all"
-  echo "archiving message" . (len(uids) == 1 ? '' : 's')
+  let nummsgs = (a:lastline - a:firstline + 1)
+  echo "archiving message" . (nummsgs == 1 ? '' : 's')
   let res = system(command)
   setlocal modifiable
   exec a:firstline . "," . a:lastline . "delete"
   setlocal nomodifiable
   write
-  call s:focus_message_window()
-  close
+  if nummsgs > 2
+    call feedkeys("\<cr>")
+  endif
   redraw
-  echo len(uids) . " message" . (len(uids) == 1 ? '' : 's') . " archived"
+  echo nummsgs . " message" . (nummsgs == 1 ? '' : 's') . " archived"
 endfunc
 
 " --------------------------------------------------------------------------------
+
 " append text bodies of a set of messages to a file
 func! s:append_messages_to_file() range
-  let lnum = a:firstline
-  let n = 0
-  let uids = []
-  while lnum <= a:lastline
-    let line =  getline(lnum)
-    let message_uid = matchstr(line, '^\d\+')
-    call add(uids, message_uid)
-    let lnum = lnum + 1
-  endwhile
-  let uid_set = join(uids, ",")
+  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
+  let nummsgs = (a:lastline - a:firstline + 1)
   let s:append_file = input("print messages to file: ", s:append_file)
   let command = s:append_to_file_command . s:append_file . ' ' . uid_set 
-  echo "appending " . len(uids) . " message" . (len(uids) == 1 ? '' : 's') . " to " s:append_file
+  echo "appending " . nummsgs . " message" . (nummsgs == 1 ? '' : 's') . " to " . s:append_file . ". please wait..."
   let res = system(command)
   echo res
   redraw
@@ -311,16 +286,8 @@ endfunc
 " move to another mailbox
 function! s:move_to_mailbox(copy) range
   let s:copy_to_mailbox = a:copy
-  let lnum = a:firstline
-  let n = 0
-  let uids = []
-  while lnum <= a:lastline
-    let line =  getline(lnum)
-    let message_uid = matchstr(line, '^\d\+')
-    call add(uids, message_uid)
-    let lnum = lnum + 1
-  endwhile
-  let s:uid_set = join(uids, ",")
+  let s:uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
+  let s:nummsgs = (a:lastline - a:firstline + 1)
   " now prompt use to select mailbox
   if !exists("s:mailboxes")
     call s:get_mailbox_list()
@@ -360,8 +327,11 @@ function! s:complete_move_to_mailbox()
   end
   setlocal nomodifiable
   write
+  if s:nummsgs > 2
+    call feedkeys("\<cr>")
+  endif
   redraw
-  echo "done"
+  echo s:nummsgs .  " message" . (s:nummsgs == 1 ? '' : 's') . ' ' . (s:copy_to_mailbox ? 'copied' : 'moved') . ' to ' . mailbox 
 endfunction
 
 function! CompleteMoveMailbox(findstart, base)
@@ -453,14 +423,17 @@ function! s:select_mailbox()
     return
   endif
   let s:mailbox = mailbox
+  let s:query = "100 all"
   let command = s:select_mailbox_command . shellescape(s:mailbox)
+  echo "selecting mailbox ". s:mailbox ". please wait..."
+
   call system(command)
   redraw
   " now get latest 100 messages
   call s:focus_list_window()  
   setlocal modifiable
   let command = s:search_command . "100 all"
-  echo "Please wait. Loading messages..."
+  echo "loading messages..."
   let res = system(command)
   1,$delete
   put! =res
@@ -514,7 +487,7 @@ function! s:more_messages()
   let line = getline(line('.'))
   let uid = matchstr(line, '^\d\+')
   let command = s:more_messages_command . uid
-  echo command
+  echo "fetching more messages. please wait..."
   let res = system(command)
   setlocal modifiable
   let lines =  split(res, "\n")
@@ -528,7 +501,7 @@ endfunction
 "  compose reply, compose, forward, save draft
 
 function! s:compose_reply(all)
-  let command = s:reply_template_command . s:current_uid
+  let command = s:reply_template_command 
   if a:all
     let command = command . ' 1'
   endif
@@ -546,7 +519,7 @@ function! s:compose_message()
 endfunction
 
 function! s:compose_forward()
-  let command = s:forward_template_command . s:current_uid
+  let command = s:forward_template_command 
   call s:open_compose_window(command)
 "  call search("^to:") 
 "  normal A
@@ -628,7 +601,7 @@ endfunc
 
 " call from inside message window with <Leader>h
 func! s:open_html_part()
-  let command = s:open_html_part_command . s:current_uid 
+  let command = s:open_html_part_command 
   " the command saves the html part to a local file
   let outfile = system(command)
   " todo: allow user to change open in browser command?
@@ -690,9 +663,9 @@ func! s:message_window_mappings()
   nnoremap <silent> <buffer> q :close<cr>
 
   nnoremap <silent> <buffer> <leader>#  :close<cr>:call <SID>focus_list_window()<cr>:call <SID>delete_messages("Deleted")<cr>
-  nmap <silent> <buffer> <leader>d  <leader>#
   nnoremap <silent> <buffer> <leader>*  :call <SID>focus_list_window()<cr>:call <SID>toggle_star()<cr>
-  nmap <silent> <buffer> s  <leader>*
+  noremap <silent> <buffer> <leader>! :call <SID>focus_list_window()<cr>:call <SID>delete_messages("[Gmail]/Spam")<CR>
+  noremap <silent> <buffer> <leader>e :call <SID>focus_list_window()<cr>:call <SID>archive_messages()<CR>
 
   nnoremap <silent> <buffer> <Leader>b :call <SID>focus_list_window()<cr>call <SID>move_to_mailbox(0)<CR>
   nnoremap <silent> <buffer> <Leader>B :call <SID>focus_list_window()<cr>call <SID>move_to_mailbox(1)<CR>

data/lib/vmail/imap_client.rb

@@ -1,5 +1,6 @@
 require 'drb'
 require 'vmail/message_formatter'
+require 'vmail/reply_template'
 require 'vmail/string_ext'
 require 'yaml'
 require 'mail'
@@ -27,11 +28,13 @@ module Vmail
       @logger = Logger.new(config['logfile'] || STDERR)
       @logger.level = Logger::DEBUG
       @current_mail = nil
-      @current_uid = nil
+      @current_message_index = nil
+      @imap_server = config['server'] || 'imap.gmail.com'
+      @imap_port = config['port'] || 993
     end
 
     def open
-      @imap = Net::IMAP.new('imap.gmail.com', 993, true, nil, false)
+      @imap = Net::IMAP.new(@imap_server, @imap_port, true, nil, false)
       @imap.login(@username, @password)
     end
 
@@ -41,11 +44,11 @@ module Vmail
       @imap.disconnect
     end
 
-    def select_mailbox(mailbox)
+    def select_mailbox(mailbox, force=false)
       if MailboxAliases[mailbox]
         mailbox = MailboxAliases[mailbox]
       end
-      if mailbox == @mailbox 
+      if mailbox == @mailbox && !force
         return
       end
       log "selecting mailbox #{mailbox.inspect}"
@@ -53,11 +56,27 @@ module Vmail
         log @imap.select(mailbox)
       end
       @mailbox = mailbox
-      @all_uids = []
-      @bad_uids = []
+      get_mailbox_status
+      get_highest_message_id
       return "OK"
     end
 
+    def reload_mailbox
+      select_mailbox(@mailbox, true)
+    end
+
+    def get_highest_message_id
+      # get highest message ID
+      res = @imap.fetch([1,"*"], ["ENVELOPE"])
+      @num_messages = res[-1].seqno
+      log "HIGHEST ID: #@num_messages"
+    end
+
+    def get_mailbox_status
+      @status = @imap.status(@mailbox,  ["MESSAGES", "RECENT", "UNSEEN"])
+      log "mailbox status: #{@status.inspect}"
+    end
+
     def revive_connection
       log "reviving connection"
       open
@@ -65,6 +84,18 @@ module Vmail
       @imap.select(@mailbox)
     end
 
+    def prime_connection
+      reconnect_if_necessary(4) do 
+        # this is just to prime the IMAP connection
+        # It's necessary for some reason before update and deliver. 
+        log "priming connection for delivering"
+        res = @imap.fetch(@ids[-1], ["ENVELOPE"])
+        if res.nil?
+          raise IOError, "IMAP connection seems broken"
+        end
+      end 
+    end
+
     def list_mailboxes
       @mailboxes ||= (@imap.list("[Gmail]/", "%") + @imap.list("", "%")).
         select {|struct| struct.attr.none? {|a| a == :Noselect} }.
@@ -83,37 +114,52 @@ module Vmail
       @mailboxes
     end
 
-    def fetch_headers(uid_set)
-      if uid_set.is_a?(String)
-        uid_set = uid_set.split(",").map(&:to_i)
-      elsif uid_set.is_a?(Integer)
-        uid_set = [uid_set]
+    # id_set may be a range, array, or string
+    def fetch_envelopes(id_set, are_uids=false)
+      log "fetch_envelopes: #{id_set.inspect}"
+      if id_set.is_a?(String)
+        id_set = id_set.split(',')
       end
-      max_uid = uid_set.max
-      log "fetch headers for #{uid_set.inspect}"
-      if uid_set.empty?
+      max_id = id_set.to_a[-1]
+      if id_set.to_a.empty?
         log "empty set"
         return ""
       end
       results = reconnect_if_necessary do 
-        @imap.uid_fetch(uid_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE" ])
+        if are_uids
+          @imap.uid_fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID" ])
+        else
+          @imap.fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID" ])
+        end
+      end
+      if results.nil?
+        error = "expected fetch results but got nil"
+        log(error) && raise(error)
       end
       log "extracting headers"
-      lines = results.
-        sort_by {|x| 
-          begin
-            Time.parse(x.attr['ENVELOPE'].date) 
-          rescue ArgumentError
-            Time.now
-          end
-        }.
-        map {|x| format_header(x, max_uid)}
-      log "returning result" 
-      return lines.join("\n")
+      new_message_rows = results.map {|x| extract_row_data(x, max_id) }
+      if are_uids
+        # replace old row_text values
+        new_message_rows.each {|new_row_data|
+          @message_list.
+            select {|old_row_data| old_row_data[:uid] == new_row_data[:uid]}.
+            each {|old_row_data| old_row_data[:row_text] = new_row_data[:row_text]}
+        }
+      else
+        # put new rows before the current ones
+        @message_list.unshift(*new_message_rows)
+      end
+      log "returning #{new_message_rows.size} new rows" 
+      return new_message_rows.
+        map {|x| x[:row_text]}.
+        join("\n")
     end
 
-    def format_header(fetch_data, max_uid=nil)
-      uid = fetch_data.attr["UID"]
+    # TODO extract this to another class or module and write unit tests
+    def extract_row_data(fetch_data, max_id=nil)
+      seqno = fetch_data.seqno
+      uid = fetch_data.attr['UID']
+      # log "fetched seqno #{seqno} uid #{uid}"
       envelope = fetch_data.attr["ENVELOPE"]
       size = fetch_data.attr["RFC822.SIZE"]
       flags = fetch_data.attr["FLAGS"]
@@ -148,18 +194,22 @@ module Vmail
       subject = envelope.subject || ''
       subject = Mail::Encodings.unquote_and_convert_to(subject, 'UTF-8')
       flags = format_flags(flags)
-      first_col_width = max_uid.to_s.length 
+      first_col_width = max_id.to_s.length 
       mid_width = @width - (first_col_width + 33)
       address_col_width = (mid_width * 0.3).ceil
       subject_col_width = (mid_width * 0.7).floor
-      [uid.to_s.col(first_col_width), 
-        (date_formatted || '').col(14),
-        address.col(address_col_width),
-        subject.col(subject_col_width),
-        number_to_human_size(size).rcol(6),
-        flags.rcol(7)].join(' ')
+      row_text = [  seqno.to_s.col(first_col_width), 
+                    (date_formatted || '').col(14),
+                    address.col(address_col_width),
+                    subject.col(subject_col_width),
+                    number_to_human_size(size).rcol(6),
+                    flags.rcol(7)  
+                 ].join(' ')
+      {:uid => uid, :seqno => seqno, :row_text => row_text}
     rescue 
-      "#{uid.to_s} : error extracting this header"
+      log "error extracting header for uid #{uid} seqno #{seqno}: #$!"
+      row_text =i "#{seqno.to_s} : error extracting this header"
+      {:uid => uid, :seqno => seqno, :row_text => row_text}
     end
 
     UNITS = [:b, :kb, :mb, :gb].freeze
@@ -189,83 +239,120 @@ module Vmail
     end
 
     def search(limit, *query)
-      log "uid_search limit: #{limit} query: #{@query.inspect}"
-      limit = 25 if limit.to_s !~ /^\d+$/
+      limit = limit.to_i
+      limit = 100 if limit.to_s !~ /^\d+$/
       query = ['ALL'] if query.empty?
-      @query = query.join(' ')
-      log "uid_search #@query #{limit}"
-      @all_uids = reconnect_if_necessary do
-        @imap.uid_search(@query)
-      end
-      uids = @all_uids[-([limit.to_i, @all_uids.size].min)..-1] || []
-      res = fetch_headers(uids)
-      add_more_message_line(res, uids)
+      if query.size == 1 && query[0].downcase == 'all'
+        # form a sequence range
+        query.unshift [[@num_messages - limit.to_i + 1 , 1].max, @num_messages].join(':')
+        @all_search = true
+      else
+        # this is a special query search
+        # set the target range to the whole set
+        query.unshift "1:#@num_messages"
+        @all_search = false
+      end
+      log "@all_search #{@all_search}"
+      @query = query
+      log "search query: #@query.inspect"
+      @ids = reconnect_if_necessary do
+        @imap.search(@query.join(' '))
+      end
+      # save ids in @ids, because filtered search relies on it
+      fetch_ids = if @all_search
+                    @ids
+                  else #filtered search
+                    @start_index = [@ids.length - limit, 0].max
+                    @ids[@start_index..-1]
+                  end
+      log "search query got #{@ids.size} results" 
+      @message_list = [] # this will hold all the data extracted from these message envelopes
+      res = fetch_envelopes(fetch_ids)
+      add_more_message_line(res, fetch_ids[0])
     end
 
     def update
-      reconnect_if_necessary(4) do 
-        # this is just to prime the IMAP connection
-        # It's necessary for some reason.
-        log "priming connection for update"
-        res = @imap.uid_fetch(@all_uids[-1], ["ENVELOPE"])
-        if res.nil?
-          raise IOError, "IMAP connection seems broken"
-        end
-      end
-      uids = reconnect_if_necessary { 
-        log "uid_search #@query"
-        @imap.uid_search(@query) 
+      prime_connection
+      old_num_messages = @num_messages
+      # we need to re-select the mailbox to get the new highest id
+      reload_mailbox
+      update_query = @query
+      # set a new range filter
+      update_query[0] = "#{old_num_messages}:#{@num_messages}"
+      ids = reconnect_if_necessary { 
+        log "search #update_query"
+        @imap.search(update_query.join(' ')) 
       }
-      new_uids = uids - @all_uids
-      log "UPDATE: NEW UIDS: #{new_uids.inspect}"
-      if !new_uids.empty?
-        res = fetch_headers(new_uids)
-        @all_uids = uids
+      # TODO change this. will throw error now
+      new_ids = ids.select {|x| x > @ids.max}
+      @ids = @ids + new_ids
+      log "UPDATE: NEW UIDS: #{new_ids.inspect}"
+      if !new_ids.empty?
+        res = fetch_envelopes(new_ids)
         res
       end
     end
 
-    # gets 100 messages prior to uid
-    def more_messages(uid, limit=100)
-      uid = uid.to_i
-      x = [(@all_uids.index(uid) - limit), 0].max
-      y = [@all_uids.index(uid) - 1, 0].max
-      uids = @all_uids[x..y]
-      res = fetch_headers(uids)
-      add_more_message_line(res, uids)
-    end
-
-    def add_more_message_line(res, uids)
-      return res if uids.empty?
-      start_index = @all_uids.index(uids[0])
-      if start_index > 0
-        remaining = start_index 
-        res = "> Load #{[100, remaining].min} more messages. #{remaining} remaining.\n" + res
+    # gets 100 messages prior to id
+    def more_messages(message_id, limit=100)
+      log "more_messages: message_id #{message_id}"
+      message_id = message_id.to_i
+      if @all_search 
+        x = [(message_id - limit), 0].max
+        y = [message_id - 1, 0].max
+        res = fetch_envelopes((x..y))
+        add_more_message_line(res, x)
+      else
+        # filter search query
+        log "@start_index #@start_index"
+        x = [(@start_index - limit), 0].max
+        y = [@start_index - 1, 0].max
+        @start_index = x
+        res = fetch_envelopes(@ids[x..y]) 
+        add_more_message_line(res, @ids[x])
+      end
+    end
+
+    def add_more_message_line(res, start_id)
+      log "add_more_message_line for start_id #{start_id}"
+      if @all_search
+        return res if start_id.nil?
+        if start_id <= 1
+          return res
+        end
+        remaining = start_id - 1
+      else # filter search
+        remaining = @ids.index(start_id) - 1
+      end
+      if remaining < 1
+        log "none remaining"
+        return res
       end
-      res 
+      log "remaining messages: #{remaining}"
+      "> Load #{[100, remaining].min} more messages. #{remaining} remaining.\n" + res
     end
 
-    def show_message(uid, raw=false, forwarded=false)
-      uid = uid.to_i
-      if forwarded
-        return @current_message.split(/\n-{20,}\n/, 2)[1]
-      end
+    def show_message(index, raw=false)
+      log "showing message at #{index}" 
       return @current_mail.to_s if raw 
-      return @current_message if uid == @current_uid 
-      log "fetching #{uid.inspect}" 
+      index = index.to_i
+      return @current_message if index == @current_message_index 
+      envelope_data = @message_list[index]
+      uid = envelope_data[:uid] 
+      log "fetching 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) 
-      @current_uid = uid
+      @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} #{uid} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
+#{@mailbox} #{index} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
 ---------------------------------------
 #{format_headers(formatter.extract_headers)}
 
@@ -283,36 +370,66 @@ EOF
       end
     end
 
-    # uid_set is a string comming from the vim client
+    # id_set is a string comming from the vim client
     # action is -FLAGS or +FLAGS
-    def flag(uid_set, action, flg)
-      if uid_set.is_a?(String)
-        uid_set = uid_set.split(",").map(&:to_i)
-      end
-      # #<struct Net::IMAP::FetchData seqno=17423, attr={"FLAGS"=>[:Seen, "Flagged"], "UID"=>83113}>
-      log "flag #{uid_set} #{flg} #{action}"
+    def flag(index_range, action, flg)
+      uid_set = uids_from_index_range(index_range)
+      log "flag #{uid_set.inspect} #{flg} #{action}"
       if flg == 'Deleted'
+        log "Deleting index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
         # for delete, do in a separate thread because deletions are slow
         Thread.new do 
           unless @mailbox == '[Gmail]/Trash'
             @imap.uid_copy(uid_set, "[Gmail]/Trash")
           end
           res = @imap.uid_store(uid_set, action, [flg.to_sym])
+          remove_uid_set_from_cached_lists(uid_set)
+          reload_mailbox
         end
-        uid_set.each { |uid| @all_uids.delete(uid) }
       elsif flg == '[Gmail]/Spam'
-        @imap.uid_copy(uid_set, "[Gmail]/Spam")
-        res = @imap.uid_store(uid_set, action, [:Deleted])
-        "#{uid} deleted"
+        log "Marking as spam index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
+        Thread.new do 
+          @imap.uid_copy(uid_set, "[Gmail]/Spam")
+          res = @imap.uid_store(uid_set, action, [:Deleted])
+          remove_uid_set_from_cached_lists(uid_set)
+          reload_mailbox
+        end
+        "#{id} deleted"
       else
-        log "Flagging"
+        log "Flagging index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
         res = @imap.uid_store(uid_set, action, [flg.to_sym])
-        # log res.inspect
-        fetch_headers(uid_set)
-      end
+        log res.inspect
+        fetch_envelopes(uid_set, true).tap {|x| log x}
+      end
+    end
+
+    def uids_from_index_range(index_range_as_string)
+      raise "expecting String" unless index_range_as_string.is_a?(String)
+      raise "expecting a range as string" unless index_range_as_string =~ /^\d+\.\.\d+$/ 
+      log "converting index_range #{index_range_as_string} to uids"
+      uids = @message_list[eval(index_range_as_string)].map {|row| row[:uid]}
+      log "converted index_range #{index_range_as_string} to uids #{uids.inspect}"
+      uids
+    end
+
+    def remove_uid_set_from_cached_lists(uid_set)
+      # delete from cached @ids and @message_list
+      uid_set.each {|uid| 
+        @message_list.
+          select {|row| row[:uid] == uid}.
+          each {|row| 
+            seqno = row[:seqno]
+            log "deleting seqno #{seqno} from @ids"
+            @ids.delete seqno
+            log "deleting msg uid #{row[:uid]} from @message_list"
+            @message_list.delete(row)
+          }
+      }
+
     end
 
-    def move_to(uid_set, mailbox)
+    def move_to(id_set, mailbox)
+      log "move #{id_set.inspect} to #{mailbox}"
       if mailbox == 'all'
         log "archiving messages"
       end
@@ -320,24 +437,28 @@ EOF
         mailbox = MailboxAliases[mailbox]
       end
       create_if_necessary mailbox
-      if uid_set.is_a?(String)
-        uid_set = uid_set.split(",").map(&:to_i)
+      log "getting uids form index range #{id_set}"
+      uid_set = uids_from_index_range(id_set)
+      log "moving uid_set: #{uid_set.inspect} to #{mailbox}"
+      Thread.new do 
+        log @imap.uid_copy(uid_set, mailbox)
+        log @imap.uid_store(uid_set, '+FLAGS', [:Deleted])
+        reload_mailbox
+        log "moved uid_set #{uid_set.inspect} to #{mailbox}"
       end
-      log "move_to #{uid_set.inspect} #{mailbox}"
-      log @imap.uid_copy(uid_set, mailbox)
-      log @imap.uid_store(uid_set, '+FLAGS', [:Deleted])
     end
 
-    def copy_to(uid_set, mailbox)
+    def copy_to(id_set, mailbox)
       if MailboxAliases[mailbox]
         mailbox = MailboxAliases[mailbox]
       end
       create_if_necessary mailbox
-      log "copy #{uid_set.inspect} #{mailbox}"
-      if uid_set.is_a?(String)
-        uid_set = uid_set.split(",").map(&:to_i)
+      uid_set = uids_from_index_range(id_set)
+      log "copying #{uid_set.inspect} to #{mailbox}"
+      Thread.new do 
+        log @imap.uid_copy(uid_set, mailbox)
+        log "copied uid_set #{uid_set.inspect} to #{mailbox}"
       end
-      log @imap.uid_copy(uid_set, mailbox)
     end
 
     def create_if_necessary(mailbox)
@@ -350,18 +471,18 @@ EOF
       end
     end
 
-    def append_to_file(file, uid_set)
-      if uid_set.is_a?(String)
-        uid_set = uid_set.split(",").map(&:to_i)
-      end
-      log "append messages to file: #{file}"
-      uid_set.each do |uid|
-        message = show_message(uid)
+    def append_to_file(file, index_range_as_string)
+      raise "expecting a range as string" unless index_range_as_string =~ /^\d+\.\.\d+$/ 
+      index_range = eval(index_range_as_string)
+      log "append to file range #{index_range.inspect} to file: #{file}"
+      index_range.each do |idx|
+        message = show_message(idx)
         divider = "#{'=' * 39}\n"
         File.open(file, 'a') {|f| f.puts(divider + message + "\n\n")}
-        log "appended uid #{uid}"
+        subject = (message[/^subject:(.*)/,1] || '').strip
+        log "appended message '#{subject}'"
       end
-      "printed #{uid_set.size} message#{uid_set.size == 1 ? '' : 's'} to #{file.strip}"
+      "printed #{index_range.to_a.size} message#{index_range.to_a.size == 1 ? '' : 's'} to #{file.strip}"
     end
 
 
@@ -384,41 +505,22 @@ EOF
       lines.join("\n")
     end
 
-    def reply_template(uid, replyall=false)
-      log "sending reply template for #{uid}"
-      fetch_data = @imap.uid_fetch(uid.to_i, ["FLAGS", "ENVELOPE", "RFC822"])[0]
-      envelope = fetch_data.attr['ENVELOPE']
-      recipient = [envelope.reply_to, envelope.from].flatten.map {|x| address_to_string(x)}[0]
-      cc = [envelope.to, envelope.cc]
-      cc = cc.flatten.compact.
-        select {|x| @username !~ /#{x.mailbox}@#{x.host}/}.
-        map {|x| address_to_string(x)}.join(", ")
-      mail = Mail.new fetch_data.attr['RFC822']
-      formatter = Vmail::MessageFormatter.new(mail)
-      headers = formatter.extract_headers
-      subject = headers['subject']
-      if subject !~ /Re: /
-        subject = "Re: #{subject}"
-      end
-      cc = replyall ? cc : nil
-      date = headers['date'].is_a?(String) ? Time.parse(headers['date']) : headers['date']
-      quote_header = "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{address_to_string(envelope.from[0])} wrote:\n\n"
-      body = quote_header + formatter.process_body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
-      reply_headers = { 'from' => "#@name <#@username>", 'to' => recipient, 'cc' => cc, 'subject' => subject}
+    def reply_template(replyall=false)
+      log "sending reply template"
+      # user reply_template class
+      reply_headers = Vmail::ReplyTemplate.new(@current_mail, @username, @name, replyall).reply_headers
+      body = reply_headers.delete(:body)
       format_headers(reply_headers) + "\n\n\n" + body + signature
     end
 
-    def address_to_string(x)
-      x.name ? "#{x.name} <#{x.mailbox}@#{x.host}>" : "#{x.mailbox}@#{x.host}"
-    end
 
     def signature
       return '' unless @signature
       "\n\n#@signature"
     end
 
-    def forward_template(uid)
-      original_body = show_message(uid, false, true)
+    def forward_template
+      original_body = @current_message.split(/\n-{20,}\n/, 2)[1]
       new_message_template + 
         "\n---------- Forwarded message ----------\n" +
         original_body + signature
@@ -427,15 +529,7 @@ EOF
     def deliver(text)
       # parse the text. The headers are yaml. The rest is text body.
       require 'net/smtp'
-      reconnect_if_necessary(4) do 
-        # this is just to prime the IMAP connection
-        # It's necessary for some reason.
-        log "priming connection for delivering"
-        res = @imap.uid_fetch(@all_uids[-1], ["ENVELOPE"])
-        if res.nil?
-          raise IOError, "IMAP connection seems broken"
-        end
-      end 
+      prime_connection
       mail = new_mail_from_input(text)
       mail.delivery_method(*smtp_settings)
       log mail.deliver!
@@ -518,8 +612,8 @@ EOF
       "saved:\n" + saved.map {|x| "- #{x}"}.join("\n")
     end
 
-    def open_html_part(uid)
-      log "open_html_part #{uid}"
+    def open_html_part
+      log "open_html_part"
       log @current_mail.parts.inspect
       multipart = @current_mail.parts.detect {|part| part.multipart?}
       html_part = if multipart 
@@ -571,6 +665,9 @@ EOF
       log(revive_connection)
       # try just once
       block.call
+    rescue
+      log "error: #{$!}"
+      raise
     end
 
     def self.start(config)

data/lib/vmail/reply_template.rb

@@ -0,0 +1,51 @@
+require 'vmail/message_formatter'
+require 'mail'
+require 'time'
+
+module Vmail
+  class ReplyTemplate
+
+    def initialize(mail, username, name, replyall)
+      @username, @name, @replyall = username, name, replyall
+      @mail = Mail.new(mail)
+    end
+
+    def reply_headers
+      formatter = Vmail::MessageFormatter.new(@mail)
+      headers = formatter.extract_headers
+      subject = headers['subject']
+      if subject !~ /Re: /
+        subject = "Re: #{subject}"
+      end
+      date = headers['date'].is_a?(String) ? Time.parse(headers['date']) : headers['date']
+      quote_header = "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n"
+      body = quote_header + formatter.process_body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
+      {'from' => "#@name <#@username>", 'to' => primary_recipient, 'cc' => cc, 'subject' => subject, :body => body}
+    end
+
+    def primary_recipient
+      from = @mail.header['from']
+      reply_to = @mail.header['reply-to']
+      [ reply_to, from ].flatten.compact.map(&:to_s)[0]
+    end
+
+    def cc
+      return nil unless @replyall
+      cc = @mail.header['to'].value.split(/,\s*/) + @mail.header['cc'].value.split(/,\s*/) 
+      cc = cc.flatten.compact.
+        select {|x| 
+          x.to_s[/<([^>]+)>/, 1] !~ /#{@username}/ && x.to_s[/^[^<]+/, 1] !~ /#{@name}/
+          }.join(', ')
+    end
+
+    def sender
+      @mail.header['from'].value
+    end
+
+    # deprecated
+    def address_to_string(x)
+      x.name ? "#{x.name} <#{x.mailbox}@#{x.host}>" : "#{x.mailbox}@#{x.host}"
+    end
+
+  end
+end

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.4.5"
+  VERSION = "0.4.6" 
 end

data/test/fixtures/reply_all.eml

@@ -0,0 +1,58 @@
+Return-Path: <chappy1@gmail.com>
+Received: by 10.213.2.204 with SMTP id 12cs233347ebk; Sun, 12 Dec 2010 10:13:13 -0800
+Received: by 10.91.51.19 with SMTP id d19mr3869811agk.183.1292177592502; Sun, 12 Dec 2010 10:13:12 -0800
+Received: from mail-yx0-f171.google.com (mail-yx0-f171.google.com [209.85.213.171]) by mx.google.com with ESMTP id d7si4681466and.167.2010.12.12.10.13.10; Sun, 12 Dec 2010 10:13:11 -0800
+Received: by mail-yx0-f171.google.com with SMTP id 11so3634988yxi.2 for
+ <multiple recipients>; Sun, 12 Dec 2010 10:13:10 -0800 (PST)
+Received: by 10.90.24.10 with SMTP id 10mr3890562agx.179.1292177590623; Sun, 12 Dec 2010 10:13:10 -0800
+Received: from [26.144.14.48] (m482436d0.tmodns.net [208.54.36.72]) by mx.google.com with ESMTPS id c34sm4564739anc.30.2010.12.12.10.13.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 12 Dec 2010 10:13:09 -0800
+Date: Sun, 12 Dec 2010 13:13:01 -0500
+From: Chappy Youn <chappy1@gmail.com>
+To: Daniel Choi <dhchoi@gmail.com>, 
+ Draculette Ko <violinist.ko@gmail.com>, 
+ Cookiemonster Youn <cookiemonster@gmail.com>
+Cc: Racoon <raycoon@gmail.com>
+Message-ID: <73734601-F016-4F3B-A0C8-0FF48011292F@gmail.com>
+Subject: Holiday potluck at Ray's
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=us-ascii;
+ delsp=yes;
+ format=flowed
+Content-Transfer-Encoding: 7bit
+Delivered-To: dhchoi@gmail.com
+Received-SPF: pass (google.com: domain of chappy1@gmail.com designates
+ 209.85.213.171 as permitted sender) client-ip=209.85.213.171;
+Authentication-Results: mx.google.com; spf=pass (google.com: domain of
+ chappy1@gmail.com designates 209.85.213.171 as permitted sender)
+ smtp.mail=chappy1@gmail.com; dkim=pass (test mode) header.i=@gmail.com
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
+ h=domainkey-signature:received:received:message-id:from:to
+ :content-type:content-transfer-encoding:x-mailer:mime-version
+ :subject:date:cc; bh=2E6xsnWGlAai1MjVchauqPtC2J0dmGnscU+hCRvcScY=;
+ b=joH+NKL712kaFO0ThbHEF/7q9qSf1O6Xi9u2TBCp3uQl0aEVwuqGFHcg+id0/Am5qM
+ IoxNBItJn9zMUgmzzZcJSl5/LaxKwrj8NOn/eYF8fkKRecCbNUoCYV4Z0T7BkuPwpkWA
+ PYPun1PZT8ArAM2aXoMzApEnzOCvf/ZkM78Q4=
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
+ h=message-id:from:to:content-type:content-transfer-encoding:x-mailer
+ :mime-version:subject:date:cc;
+ b=fCuCk6O03S/wqKttwtK0ePIAy7MFja+qOyIkt9X/ToJg8MiPoHh6UH5o0UaAlAEyE7
+ 7C8iRyxjV4EC3vfQhzHUzZHFuXAOtPOF6ZSidHKbXVad3Wvv0zie9dV3pFXCbg0fyC8M
+ c1nHTFM+So9DDIulICizW196SVSh65Ds+NVK4=
+X-Mailer: iPhone Mail (7C144)
+
+Guys,
+Tonight we will have a potluck at Ray's at 7. Pls bring food for 1.5  
+ppl.
+
+Ray will provide wine and dessert.
+
+Also, we will be having a poor man's Yankee swap. Pls bring something  
+gift wrapped from home. Nothing fancy, but something halfway decent or  
+funny.
+
+El, make sure it's worth more than 50 cents.
+
+Chappy
+
+Sent from my iPhone

data/test/reply_template_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+require 'vmail/reply_template'
+
+describe Vmail::ReplyTemplate do
+  before do
+    @raw = read_fixture('reply_all.eml')
+    @mail = Mail.new(@raw)
+    @rt = Vmail::ReplyTemplate.new(@mail, 'dhchoi@gmail.com', 'Daniel Choi', true)
+  end
+
+  def test_detect_primary_recipient
+    assert_equal "Chappy Youn <chappy1@gmail.com>", @rt.primary_recipient
+  end
+
+  def test_detect_cc
+    expected = "Draculette Ko <violinist.ko@gmail.com>, Cookiemonster Youn <cookiemonster@gmail.com>, Racoon <raycoon@gmail.com>"
+    assert_equal expected, @rt.cc
+  end
+  
+  def test_sender
+    assert_equal "Chappy Youn <chappy1@gmail.com>", @rt.sender
+  end
+
+  def test_template
+    expected = {"from"=>"Daniel Choi <dhchoi@gmail.com>", "to"=>"Chappy Youn <chappy1@gmail.com>", "cc"=>"Draculette Ko <violinist.ko@gmail.com>, Cookiemonster Youn <cookiemonster@gmail.com>, Racoon <raycoon@gmail.com>", "subject"=>"Re: Holiday potluck at Ray's", :body=>"On Sun, Dec 12, 2010 at 01:13 PM, Chappy Youn <chappy1@gmail.com> wrote:\n\n> Guys,\n> Tonight we will have a potluck at Ray's at 7. Pls bring food for 1.5  \n> ppl.\n> \n> Ray will provide wine and dessert.\n> \n> Also, we will be having a poor man's Yankee swap. Pls bring something  \n> gift wrapped from home. Nothing fancy, but something halfway decent or  \n> funny.\n> \n> El, make sure it's worth more than 50 cents.\n> \n> Chappy\n> \n> Sent from my iPhone"}
+
+    assert_equal expected,  @rt.reply_headers
+  end
+
+
+end
+

data/website/vmail-template.html

@@ -23,10 +23,6 @@
         
           <div class="sidebar">
 
-            <h4>share this</h4>
-
-<span class="st_twitter_large" displayText="Tweet"></span><span class="st_facebook_large" displayText="Facebook"></span><span class="st_ybuzz_large" displayText="Yahoo! Buzz"></span><span class="st_gbuzz_large" displayText="Google Buzz"></span><span class="st_email_large" displayText="Email"></span><span class="st_sharethis_large" displayText="ShareThis"></span>
-
             <h4>links</h4>
             <ul>
               <li><a href="https://github.com/danchoi/vmail">github repo</a></li>
@@ -34,6 +30,10 @@
               <li><a href="https://github.com/danchoi/vmail/issues">issue tracker</a></li>
               <li><a href="http://www.google.com/search?sourceid=chrome&ie=UTF-8&q=vmail+vim#hl=en&tbo=1&tbs=mbl:1,mbl_sv:0&q=link:http://danielchoi.com/software/vmail.html&sa=X&ei=iw0JTYnsPMT_lgfgvMC1AQ&ved=0CAUQ6QcwCg&fp=1&cad=b">web reactions</a></li>
             </ul>
+            <h4>share this</h4>
+
+<span class="st_twitter_large" displayText="Tweet"></span><span class="st_facebook_large" displayText="Facebook"></span><span class="st_ybuzz_large" displayText="Yahoo! Buzz"></span><span class="st_gbuzz_large" displayText="Google Buzz"></span><span class="st_email_large" displayText="Email"></span><span class="st_sharethis_large" displayText="ShareThis"></span>
+
           </div>
    
       </div>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Daniel Choi
@@ -71,6 +71,7 @@ files:
 - lib/vmail/imap_client.rb
 - lib/vmail/message_formatter.rb
 - lib/vmail/options.rb
+- lib/vmail/reply_template.rb
 - lib/vmail/string_ext.rb
 - lib/vmail/version.rb
 - test/base64_test.rb
@@ -79,10 +80,12 @@ files:
 - test/fixtures/google-affiliate.eml
 - test/fixtures/htmlbody.eml
 - test/fixtures/moleskine-html.eml
+- test/fixtures/reply_all.eml
 - test/fixtures/rfc_part.eml
 - test/fixtures/textbody-nocontenttype.eml
 - test/fixtures/with-attachments.eml
 - test/message_formatter_test.rb
+- test/reply_template_test.rb
 - test/test_helper.rb
 - test/time_format_test.rb
 - vmail.gemspec
@@ -158,9 +161,11 @@ test_files:
 - test/fixtures/google-affiliate.eml
 - test/fixtures/htmlbody.eml
 - test/fixtures/moleskine-html.eml
+- test/fixtures/reply_all.eml
 - test/fixtures/rfc_part.eml
 - test/fixtures/textbody-nocontenttype.eml
 - test/fixtures/with-attachments.eml
 - test/message_formatter_test.rb
+- test/reply_template_test.rb
 - test/test_helper.rb
 - test/time_format_test.rb