vmail 1.1.9 → 1.2.0

data/TODO

@@ -101,4 +101,8 @@ Sat Dec 25 09:07:28 EST 2010
 - change vmail to take a file or files (e.g. globbed) as argument and
   send them. This will let the user enter password on invocation.
 
+------------------------------------------------------------------------
+Thu Dec 30 11:28:05 EST 2010
+
+1/6 deadline for doing How I Work Screencast
 

data/lib/vmail.vim

@@ -75,6 +75,11 @@ function! s:show_message(stay_in_message_list)
     call s:more_messages()
     return
   endif
+  let s:uid = matchstr(line, '\d\+$')
+  if s:uid == ""
+    return
+  end
+  " mark as read
   let newline = substitute(line, '^\V*+', '* ', '')
   let newline = substitute(newline, '^\V+ ', '  ', '')
   setlocal modifiable
@@ -85,13 +90,8 @@ function! s:show_message(stay_in_message_list)
   " moving up when the next echo statement executes:
   " call feedkeys(":\<cr>") 
   " redraw
-  " substract 2: because lines numbers start at 1 & messages start at line 2
-  let s:current_message_index = line('.') - 2
-  if s:current_message_index < 0
-    return
-  endif
-  let command = s:show_message_command . s:current_message_index
-  echom "Loading message. Please wait..."
+  let command = s:show_message_command . s:uid
+  echom "Loading message ". s:uid .". Please wait..."
   redrawstatus
   let res = system(command)
   call s:focus_message_window()
@@ -243,15 +243,15 @@ function! s:update()
 endfunction
 
 function! s:toggle_star() range
-  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
-  let nummsgs = (a:lastline - a:firstline + 1)
+  let uid_set = s:collect_uids(a:firstline, a:lastline)
+  let nummsgs = len(uid_set)
   let flag_symbol = "^*"
   " check if starred already
   let action = " +FLAGS"
   if (match(getline(a:firstline), flag_symbol) != -1)
     let action = " -FLAGS"
   endif
-  let command = s:flag_command . uid_set . action . " Flagged" 
+  let command = s:flag_command . join(uid_set, ',') . action . " Flagged" 
   if nummsgs == 1
     echom "toggling flag on message" 
   else
@@ -288,13 +288,13 @@ endfunction
 
 " flag can be Deleted or [Gmail]/Spam
 func! s:delete_messages(flag) range
-  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
-  let command = s:flag_command . uid_set . " +FLAGS " . a:flag
-  let nummsgs = (a:lastline - a:firstline + 1)
+  let uid_set = s:collect_uids(a:firstline, a:lastline)
+  let nummsgs = len(uid_set)
+  let command = s:flag_command . join(uid_set, ',') . " +FLAGS " . a:flag
   if nummsgs == 1
     echom "deleting message" 
   else
-    echom "deleting " . (a:lastline - a:firstline + 1) . " messages"
+    echom "deleting " . nummsgs . " messages"
   endif
   let res = system(command)
   setlocal modifiable
@@ -311,9 +311,9 @@ func! s:delete_messages(flag) range
 endfunc
 
 func! s:archive_messages() range
-  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
-  let command = s:move_to_command . uid_set . ' ' . "all"
-  let nummsgs = (a:lastline - a:firstline + 1)
+  let uid_set = s:collect_uids(a:firstline, a:lastline)
+  let nummsgs = len(uid_set)
+  let command = s:move_to_command . join(uid_set, ',') . ' ' . "all"
   echo "archiving message" . (nummsgs == 1 ? '' : 's')
   let res = system(command)
   setlocal modifiable
@@ -331,15 +331,15 @@ endfunc
 
 " append text bodies of a set of messages to a file
 func! s:append_messages_to_file() range
-  let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
-  let nummsgs = (a:lastline - a:firstline + 1)
+  let uid_set = s:collect_uids(a:firstline, a:lastline)
+  let nummsgs = len(uid_set)
   let append_file = input("print messages to file: ", s:append_file)
   if append_file == ''
     echom "canceled"
     return
   endif
   let s:append_file = append_file
-  let command = s:append_to_file_command . s:append_file . ' ' . uid_set 
+  let command = s:append_to_file_command . s:append_file . ' ' . join(uid_set, ',')
   echo "appending " . nummsgs . " message" . (nummsgs == 1 ? '' : 's') . " to " . s:append_file . ". please wait..."
   let res = system(command)
   echo res
@@ -350,8 +350,9 @@ endfunc
 " move to another mailbox
 function! s:move_to_mailbox(copy) range
   let s:copy_to_mailbox = a:copy
-  let s:uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
-  let s:nummsgs = (a:lastline - a:firstline + 1)
+  let uid_set = s:collect_uids(a:firstline, a:lastline)
+  let s:nummsgs = len(uid_set)
+  let s:uid_set = join(uid_set, ',')
   " now prompt use to select mailbox
   if !exists("s:mailboxes")
     call s:get_mailbox_list()
@@ -551,7 +552,8 @@ endfunction
 
 function! s:more_messages()
   let line = getline(line('.'))
-  let command = s:more_messages_command 
+  let seqno = get(split(matchstr(line, '\d\+:\d\+$'), ':'), 0)
+  let command = s:more_messages_command . seqno
   echo "fetching more messages. please wait..."
   let res = system(command)
   setlocal modifiable
@@ -746,7 +748,16 @@ endfunc
 " -------------------------------------------------------------------------------- 
 " CONVENIENCE FUNCS
 
-
+function! s:collect_uids(startline, endline)
+  let uid_set = []
+  let lnum = a:startline
+  while lnum <= a:endline
+    let uid = matchstr(getline(lnum), '\d\+$')
+    call add(uid_set, uid)
+    let lnum += 1
+  endwhile
+  return uid_set
+endfunc
 
 " -------------------------------------------------------------------------------- 
 " MAPPINGS

data/lib/vmail/imap_client.rb

@@ -20,6 +20,8 @@ module Vmail
       'trash' => '[Gmail]/Trash'
     }
 
+    attr_accessor :max_seqno # of current mailbox
+
     def initialize(config)
       @username, @password = config['username'], config['password']
       @name = config['name']
@@ -30,11 +32,10 @@ module Vmail
       @imap_server = config['server'] || 'imap.gmail.com'
       @imap_port = config['port'] || 993
       @current_mail = nil
-      @current_message_index = nil
+      @current_message_uid = nil
     end
 
     # holds mail objects keyed by [mailbox, uid]
-    # TODO come up with a way to purge periodically
     def message_cache
       @message_cache ||= {}
       size = @message_cache.values.reduce(0) {|sum, x| sum + x[:size]}
@@ -45,20 +46,6 @@ module Vmail
       @message_cache
     end
 
-    # keys are [mailbox, limit, query]
-    def message_list_cache
-      @message_list_cache ||= {}
-    end
-
-    def current_message_list_cache
-      # third key is the non id_set/range part of query
-      (message_list_cache[[@mailbox, @limit, @query[1..-1], @all_search]] ||= [])
-    end
-
-    def current_message_list_cache=(val)
-      message_list_cache[[@mailbox, @limit, @query[1..-1], @all_search]] ||= val
-    end
-
     def open
       @imap = Net::IMAP.new(@imap_server, @imap_port, true, nil, false)
       log @imap.login(@username, @password)
@@ -101,7 +88,7 @@ module Vmail
     def clear_cached_message
       log "CLEARING CACHED MESSAGE"
       @current_mail = nil
-      @current_message_index = nil
+      @current_message_uid = nil
       @current_message = nil
     end
 
@@ -137,7 +124,6 @@ module Vmail
         # this is just to prime the IMAP connection
         # It's necessary for some reason before update and deliver. 
         log "priming connection"
-        
         res = @imap.fetch(@ids[-1], ["ENVELOPE"])
         if res.nil?
           # just go ahead, just log
@@ -193,33 +179,11 @@ module Vmail
         log(error) && raise(error)
       end
       log "- extracting headers"
-      log "- current message list cache has #{current_message_list_cache.size} items"
       new_message_rows = results.map {|x| extract_row_data(x) }
-      if are_uids
-        # replace old row_text values
-        new_message_rows.each {|new_row_data|
-          current_message_list_cache.
-            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
-        if is_update
-          log "- adding messages from update to end of list"
-          current_message_list_cache.concat new_message_rows
-        else
-          # this adds old messages to the top of the list
-          # put new rows before the current ones
-          log "- adding more messages to head of list"
-          self.current_message_list_cache.unshift(*new_message_rows)
-        end
-      end
-      log "- new current message list cache has #{current_message_list_cache.size} items"
-      # current_message_list_cache is automatically cached to keyed message_list_cache
       log "- returning #{new_message_rows.size} new rows and caching result"  
       new_message_rows
     end
 
-
     # TODO extract this to another class or module and write unit tests
     def extract_row_data(fetch_data)
       seqno = fetch_data.seqno
@@ -262,11 +226,13 @@ module Vmail
       mid_width = @width - 38
       address_col_width = (mid_width * 0.3).ceil
       subject_col_width = (mid_width * 0.7).floor
+      seqno_uid = [seqno.to_i, uid.to_i].join(':')
       row_text = [ flags.col(2),
                    (date_formatted || '').col(14),
                    address.col(address_col_width),
                    subject.col(subject_col_width), 
-                   number_to_human_size(size).rcol(6)
+                   number_to_human_size(size).rcol(7), 
+                   seqno_uid.to_s
       ].join(' | ')
       {:uid => uid, :seqno => seqno, :row_text => row_text}
     rescue 
@@ -317,13 +283,6 @@ module Vmail
       @query = query.map {|x| x.to_s.downcase}
       @limit = limit
       log "search query: #{@query.inspect}"
-      if !current_message_list_cache.empty?
-        log "- CACHE HIT"
-        res = current_message_list_cache.map {|x| x[:row_text]}.join("\n")
-        @ids = current_message_list_cache.map {|x| x[:seqno]}
-        return add_more_message_line(res, current_message_list_cache[0][:seqno])
-      end
-      log "- CACHE MISS" 
       log "- @all_search #{@all_search}"
       @query = query
       @ids = reconnect_if_necessary(180) do # increase timeout to 3 minutes
@@ -336,14 +295,18 @@ module Vmail
                     @start_index = [@ids.length - limit, 0].max
                     @ids[@start_index..-1]
                   end
-      log "- search query got #{@ids.size} results" 
-      # this will hold all the data extracted from these message envelopes
-      current_message_list_cache = [] 
+      self.max_seqno = @ids[-1]
+      log "- search query got #{@ids.size} results; max seqno: #{self.max_seqno}" 
       clear_cached_message
       res = fetch_row_text(fetch_ids)
       add_more_message_line(res, fetch_ids[0])
     end
 
+    def decrement_max_seqno(num)
+      log "Decremented max seqno from #{self.max_seqno} to #{self.max_seqno - num}"
+      self.max_seqno -= num
+    end
+
     def update
       prime_connection
       old_num_messages = @num_messages
@@ -357,11 +320,9 @@ module Vmail
         log "search #update_query"
         @imap.search(update_query.join(' ')) 
       }
-      # TODO change this. will throw error now
-      max_seqno = current_message_list_cache[-1][:seqno]
       log "- got seqnos: #{ids.inspect}"
-      log "- getting seqnos > #{max_seqno}"
-      new_ids = ids.select {|seqno| seqno > max_seqno}
+      log "- getting seqnos > #{self.max_seqno}"
+      new_ids = ids.select {|seqno| seqno > self.max_seqno}
       @ids = @ids + new_ids
       log "- update: new uids: #{new_ids.inspect}"
       if !new_ids.empty?
@@ -373,13 +334,13 @@ module Vmail
     end
 
     # gets 100 messages prior to id
-    def more_messages(limit=100)
-      message_id = current_message_list_cache[0][:seqno]
+    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_row_text((x..y))
         add_more_message_line(res, x)
       else # filter search query
@@ -392,63 +353,53 @@ module Vmail
       end
     end
 
-    def add_more_message_line(res, start_id)
-      log "add_more_message_line for start_id #{start_id}"
+    def add_more_message_line(res, start_seqno)
+      log "add_more_message_line for start_seqno #{start_seqno}"
       if @all_search
-        return res if start_id.nil?
-        remaining = start_id - 1
+        return res if start_seqno.nil?
+        remaining = start_seqno - 1
       else # filter search
-        remaining = (@ids.index(start_id) || 1) - 1
+        remaining = (@ids.index(start_seqno) || 1) - 1
       end
       if remaining < 1
         log "none remaining"
         return "showing all matches\n" + res
       end
       log "remaining messages: #{remaining}"
-      ">  Load #{[100, remaining].min} more messages. #{remaining} remaining.\n" + res
+      ">  Load #{[100, remaining].min} more messages. #{remaining} remaining. end seqno: #{start_seqno}\n" + res
     end
 
-    def show_message(index, raw=false)
-      log "show message: #{index}; current message list cache size: #{current_message_list_cache.size}"
-      return if index.to_i < 0
+    def show_message(uid, raw=false)
+      log "show message: #{uid}"
       return @current_mail.to_s if raw 
-      index = index.to_i
-      if index == @current_message_index 
+      uid = uid.to_i
+      if uid == @current_message_uid 
         return @current_message 
       end
 
-      if index >= current_message_list_cache.size
-        index -= 1
-        log "index beyond bounds, setting index to #{index}"
-      end
-      prefetch_adjacent(index) # TODO mark these as unread
+      #prefetch_adjacent(index) # deprecated
 
-      envelope_data = current_message_list_cache[index]
-      if envelope_data.nil?
-        log "missing envelope_data at index #{index}"
-      end
-      # TODO factor this gsubbing stuff out into own function
-      envelope_data[:row_text] = envelope_data[:row_text].gsub(/^\+ /, '  ').gsub(/^\*\+/, '* ') # mark as read in cache
-      seqno = envelope_data[:seqno]
-      uid = envelope_data[:uid] 
-      log "showing message index: #{index} seqno: #{seqno} uid #{uid}"
+      # TODO keep state in vim buffers, instead of on Vmail Ruby client
+      # envelope_data[:row_text] = envelope_data[:row_text].gsub(/^\+ /, '  ').gsub(/^\*\+/, '* ') # mark as read in cache
+      #seqno = envelope_data[:seqno]
 
+      log "showing message 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(index)
+               fetch_and_cache(uid)
              end
       if data.nil?
         # retry, though this is a hack!
         log "- data is nil. retrying..."
-        return show_message(index, raw)
+        return show_message(uid, raw)
       end
       # make this more DRY later by directly using a ref to the hash
       mail = data[:mail]
       size = data[:size] 
-      @current_message_index = index
+      @current_message_uid = uid
       log "- setting @current_mail"
       @current_mail = mail # used later to show raw message or extract attachments if any
       @current_message = data[:message_text]
@@ -457,14 +408,11 @@ module Vmail
       "Error encountered parsing this message:\n#{$!}\n#{$!.backtrace.join("\n")}"
     end
 
-    def fetch_and_cache(index)
-      envelope_data = current_message_list_cache[index]
-      return unless envelope_data
-      seqno = envelope_data[:seqno]
-      uid = envelope_data[:uid] 
-      return if message_cache[[@mailbox, uid]] 
+    def fetch_and_cache(uid)
+      if data = message_cache[[@mailbox, uid]] 
+        return data
+      end
       fetch_data = reconnect_if_necessary do 
-        # log "@imap.uid_fetch #{uid}"
         res = @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])
         if res.nil?
           # retry one more time ( find a more elegant way to do this )
@@ -472,32 +420,29 @@ module Vmail
         end
         res[0] 
       end
-      # TODO keep these marked unread; test this
-      if envelope_data[:row_text] =~ /^\*?\+/ # not seen
-        log "reflagging index #{index} uid #{uid} as not seen"
-        flag("#{index}..#{index}", '-FLAGS', :Seen) # change flag() method to accept a single index later
-      end
+      # USE THIS
       size = fetch_data.attr["RFC822.SIZE"]
       mail = Mail.new(fetch_data.attr['RFC822'])
       formatter = Vmail::MessageFormatter.new(mail)
       message_text = <<-EOF
-#{@mailbox} seqno:#{envelope_data[:seqno]} uid:#{uid} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
+#{@mailbox} uid:#{uid} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
 #{divider '-'}
 #{format_headers(formatter.extract_headers)}
 
 #{formatter.process_body}
 EOF
       # log "storing message_cache[[#{@mailbox}, #{uid}]]"
-      d = {:mail => mail, :size => size, :message_text => message_text}
+      d = {:mail => mail, :size => size, :message_text => message_text, :seqno => fetch_data.seqno}
       message_cache[[@mailbox, uid]] = d
     rescue
-      msg = "Error encountered parsing message index #{index} seqno #{seqno} uid #{uid}:\n#{$!}\n#{$!.backtrace.join("\n")}" + 
+      msg = "Error encountered parsing message uid  #{uid}:\n#{$!}\n#{$!.backtrace.join("\n")}" + 
         "\n\nRaw message:\n\n" + mail.to_s
       log msg
       log message_text
       {:message_text => msg}
     end
 
+    # deprecated
     def prefetch_adjacent(index)
       Thread.new do 
         [index + 1, index - 1].each do |idx|
@@ -515,11 +460,12 @@ EOF
 
     # id_set is a string comming from the vim client
     # action is -FLAGS or +FLAGS
-    def flag(index_range, action, flg)
-      uid_set = uids_from_index_range(index_range)
+    def flag(uid_set, action, flg)
+      uid_set = uid_set.split(',').map(&:to_i)
       log "flag #{uid_set.inspect} #{flg} #{action}"
       if flg == 'Deleted'
-        log "Deleting index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
+        log "Deleting uid_set: #{uid_set.inspect}"
+        decrement_max_seqno(uid_set.size)
         # for delete, do in a separate thread because deletions are slow
         Thread.new do 
           unless @mailbox == '[Gmail]/Trash'
@@ -528,87 +474,34 @@ EOF
           end
           log "@imap.uid_store #{uid_set.inspect} #{action} [#{flg.to_sym}]"
           log @imap.uid_store(uid_set, action, [flg.to_sym])
-          remove_uid_set_from_cached_lists(uid_set)
           reload_mailbox
           clear_cached_message
         end
       elsif flg == '[Gmail]/Spam'
-        log "Marking as spam index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
+        log "Marking as spam uid_set: #{uid_set.inspect}"
+        decrement_max_seqno(uid_set.size)
         Thread.new do 
           log "@imap.uid_copy #{uid_set.inspect} to spam"
           log @imap.uid_copy(uid_set, "[Gmail]/Spam")
           log "@imap.uid_store #{uid_set.inspect} #{action} [:Deleted]"
           log @imap.uid_store(uid_set, action, [:Deleted])
-          remove_uid_set_from_cached_lists(uid_set)
           reload_mailbox
           clear_cached_message
         end
         "#{id} deleted"
       else
-        log "Flagging index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
+        log "Flagging uid_set: #{uid_set.inspect}"
         Thread.new do
           log "@imap.uid_store #{uid_set.inspect} #{action} [#{flg.to_sym}]"
           log @imap.uid_store(uid_set, action, [flg.to_sym])
         end
-
-        # mark cached versions of the rows with flag/unflag
-        uid_set.each do |uid|
-          envelope_data = current_message_list_cache.detect {|x| x[:uid] == uid}
-          if action == '+FLAGS' && flg == 'Flagged'
-            envelope_data[:row_text] = envelope_data[:row_text].gsub(/^\+ /, '*+').gsub(/^  /, '* ') # mark as read in cache
-          elsif action == '-FLAGS' && flg == 'Flagged'
-            envelope_data[:row_text] = envelope_data[:row_text].gsub(/^\*\+/, '+ ').gsub(/^\* /, '  ') # mark as read in cache
-          end
-        end
-
-      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 = current_message_list_cache[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 current_message_list_cache
-      seqnos_to_delete = []
-      uid_set.each {|uid| 
-        row = current_message_list_cache.detect {|row| row[:uid] == uid}
-        seqno = row[:seqno]
-        log "deleting seqno #{seqno} from @ids"
-        @ids.delete seqno
-        seqnos_to_delete << seqno
-      }
-      log "seqnos_to_delete: #{seqnos_to_delete.inspect}"
-      seqnos_to_delete.reverse.each do |seqno|
-        startsize = current_message_list_cache.size 
-        log "deleting row with seqno #{seqno}"
-        current_message_list_cache.delete_if {|x| x[:seqno] == seqno}
-        endsize = current_message_list_cache.size
-        log "deleted #{startsize - endsize} rows"
-      end
-      # now we need to decrement all the higher sequence numbers!
-      basenum = seqnos_to_delete.min  # this is the lowested seqno deleted
-      diff = seqnos_to_delete.size # substract this from all seqnos >= basenum
-      changes = []
-      current_message_list_cache.each do |row|
-        if row[:seqno] >= basenum
-          changes << "#{row[:seqno]}->#{row[:seqno] - diff}"
-          row[:seqno] -= diff
-        end
       end
-      log "seqno decremented: #{changes.join(";")}"
-    rescue
-      log "error removing uid set from cached lists"
-      log $!
     end
 
-    def move_to(id_set, mailbox)
-      log "move #{id_set.inspect} to #{mailbox}"
+    def move_to(uid_set, mailbox)
+      uid_set = uid_set.split(',').map(&:to_i)
+      decrement_max_seqno(uid_set.size)
+      log "move #{uid_set.inspect} to #{mailbox}"
       if mailbox == 'all'
         log "archiving messages"
       end
@@ -616,25 +509,22 @@ EOF
         mailbox = MailboxAliases[mailbox]
       end
       create_if_necessary mailbox
-      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])
-        remove_uid_set_from_cached_lists(uid_set)
         reload_mailbox
         clear_cached_message
         log "moved uid_set #{uid_set.inspect} to #{mailbox}"
       end
     end
 
-    def copy_to(id_set, mailbox)
+    def copy_to(uid_set, mailbox)
+      uid_set = uid_set.split(',').map(&:to_i)
       if MailboxAliases[mailbox]
         mailbox = MailboxAliases[mailbox]
       end
       create_if_necessary mailbox
-      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)
@@ -653,20 +543,18 @@ EOF
       end
     end
 
-    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)
+    def append_to_file(file, uid_set)
+      uid_set = uid_set.split(',').map(&:to_i)
+      log "append to file uid set #{uid_set.inspect} to file: #{file}"
+      uid_set.each do |uid|
+        message = show_message(uid)
         File.open(file, 'a') {|f| f.puts(divider('=') + "\n" + message + "\n\n")}
         subject = (message[/^subject:(.*)/,1] || '').strip
         log "appended message '#{subject}'"
       end
-      "printed #{index_range.to_a.size} message#{index_range.to_a.size == 1 ? '' : 's'} to #{file.strip}"
+      "printed #{uid_set.size} message#{uid_set.size == 1 ? '' : 's'} to #{file.strip}"
     end
 
-
     def new_message_template(subject = nil, append_signature = true)
       headers = {'from' => "#{@name} <#{@username}>",
         'to' => nil,
@@ -758,7 +646,6 @@ EOF
       # attachments are added as a snippet of YAML after a blank line
       # after the headers, and followed by a blank line
       if (attachments = raw_body.split(/\n\s*\n/, 2)[0]) =~ /^attach(ment|ments)*:/
-        # TODO
         files = YAML::load(attachments).values.flatten
         log "attach: #{files}"
         files.each do |file|

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "1.1.9"
+  VERSION = "1.2.0"
 end

data/website/stylesheets-vmail/site.css

@@ -56,3 +56,12 @@ code {
   font-size: 15px;
 }
 
+
+.also-by {
+  font-size: 11px;
+  margin-top: 20px;
+}
+
+.also-by h4 {
+  font-size: 13px;
+}

data/website/vmail-template.html

@@ -38,12 +38,23 @@
               <li><a href="https://github.com/danchoi/vmail/issues">issue tracker</a></li>
               <li><a href="https://github.com/danchoi/vmail/commits/master">commit history</a></li>
               <li><a href="https://github.com/danchoi/vmail/wiki">wiki</a></li>
-              <li><a href="http://twitter.com/#!/search/vmail%20gmail">tweets about</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 class="also-by">
+              <h4>also by this developer</h4>
+              <ul class="cross-promo">
+                <li><a href="http://instantwatcher.com">instantwatcher.com<a/></li>
+                <li><a href="http://openmbta.org">OpenMBTA<a/></li>
+                <li><a href="http://kindlefeeder.com">kindlefeeder.com<a/></li>
+              </ul>
+            </div>
+
+
           </div>
    
       </div>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 9
-  version: 1.1.9
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Daniel Choi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -05:00
+date: 2011-01-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency