vmail 0.4.6 → 0.4.7

data/README.markdown

@@ -130,7 +130,7 @@ top of the list that looks something like this:
 
 Put the cursor on this line and press ENTER to load more of these messages.
 
-Unread messages are marked with a `[+]` symbol.
+Unread messages are marked with a `+` symbol.
 
 To view the raw RFC822 version of a message, type `,R` while viewing the message.
 
@@ -138,7 +138,7 @@ To view the raw RFC822 version of a message, type `,R` while viewing the message
 
 To star a message, put the cursor on it and type `,*`.  (Note that the comma
 before the * is part of the key sequence.) Starring a message copies it to the
-`starred` mailbox.  Starred messages are marked with a `[*]` symbol and
+`starred` mailbox.  Starred messages are marked with a `*` symbol and
 color-highlighted.
 
 To delete a message, put the cursor on it and type `,#`.  Deleting a message
@@ -419,6 +419,17 @@ Then you can create an SSH tunnel, e.g.
 
 [davebolton]:https://github.com/lightningdb
 
+
+## Customizing colors
+
+By default, vmail highlights starred messages in bold green against a black
+background. You can customize this setting by adding a line to your ~/.vimrc
+file like so:
+    
+    let g:vmail_flagged_color = "ctermfg=yellow ctermbg=black cterm=bold"
+
+Type `:help highlight-args` in Vim for more details.
+
 ## Bug reports, feature requests
 
 Please file bug reports and feature requests in the [vmail github issue tracker][tracker].

data/lib/vmail.vim

@@ -1,3 +1,6 @@
+if !exists("g:vmail_flagged_color")
+  let g:vmail_flagged_color = "ctermfg=green ctermbg=black"
+endif
 let s:mailbox = $VMAIL_MAILBOX
 let s:query = $VMAIL_QUERY
 let s:browser_command = $VMAIL_BROWSER
@@ -67,14 +70,15 @@ endfunction
 
 function! s:show_message()
   let line = getline(line("."))
-  if match(line, '^> Load') != -1
+  if match(line, '^>  Load') != -1
     setlocal modifiable
     delete
     call s:more_messages()
     return
   endif
-  " remove the unread flag  [+]
-  let newline = substitute(line, "\\[+\]\\s*", "", '')
+  " remove the unread flag +
+  " TODO!
+  let newline = substitute(line, '^**+', ' ', '')
   setlocal modifiable
   call setline(line('.'), newline)
   setlocal nomodifiable
@@ -156,8 +160,9 @@ function! s:focus_list_window()
   " set up syntax highlighting
   if has("syntax")
     syn clear
-    syn match BufferFlagged /^.*[*].*$/hs=s
-    hi def BufferFlagged ctermfg=red 
+    " colorize whole line
+    syn match VmailBufferFlagged /^*.*/hs=s
+    exec "hi def VmailBufferFlagged " . g:vmail_flagged_color
   endif
   " vertically center the cursor line
   " normal z.
@@ -199,32 +204,46 @@ endfunction
 
 function! s:toggle_star() range
   let uid_set = (a:firstline - 2) . '..' . (a:lastline - 2)
-  let flag_symbol = "[*]"
+  let nummsgs = (a:lastline - a:firstline + 1)
+  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" 
-  if (a:lastline - a:firstline + 1) == 1
+  if nummsgs == 1
     echom "toggling flag on message" 
   else
-    echom "toggling flags on " . (a:lastline - a:firstline + 1) . " messages"
+    echom "toggling flags on " . nummsgs . " messages"
   endif
-  " toggle [*] on lines; TODO: do this all in vimscript and do the starring
-  " in a thread in imap_client
+  " toggle * on lines
   let res = system(command)
   setlocal modifiable
-  exec a:firstline . "," . a:lastline . "delete"
-  exec (a:firstline - 1). "put =res"
+  let lnum = a:firstline
+  while lnum <= a:lastline
+    let line = getline(lnum)
+    if action == " +FLAGS"
+      let newline = substitute(line, '^ ', '*', '')
+      let newline = substitute(newline, '^+ ', '*+', '')
+    else
+      let newline = substitute(line, '^*+', '+ ', '')
+      let newline = substitute(newline, '^* ', '  ', '')
+    endif
+    call setline(lnum, newline)
+    let lnum += 1
+  endwhile
   setlocal nomodifiable
   write
-  " if more than 2 lines change, vim forces us to look at a message.
-  " dismiss it.
-  if len(split(res, "\n")) > 2
-    call feedkeys("\<cr>")
+  if nummsgs > 2
+    " call feedkeys("\<cr>")
+  endif
+  redraw
+  if nummsgs == 1
+    echom "toggled flag on message" 
+  else
+    echom "toggled flags on " . nummsgs . " messages"
   endif
-  echom "done" 
 endfunction
 
 " flag can be Deleted or [Gmail]/Spam
@@ -442,6 +461,7 @@ function! s:select_mailbox()
   setlocal nomodifiable
   write
   normal z.
+  echom "done"
 endfunction
 
 func! s:search_query()
@@ -478,15 +498,14 @@ function! s:do_search()
   1,$delete
   put! =res
   execute "normal Gdd\<c-y>" 
-  normal z.
   setlocal nomodifiable
   write
+  normal z.
 endfunction
 
 function! s:more_messages()
   let line = getline(line('.'))
-  let uid = matchstr(line, '^\d\+')
-  let command = s:more_messages_command . uid
+  let command = s:more_messages_command 
   echo "fetching more messages. please wait..."
   let res = system(command)
   setlocal modifiable
@@ -743,5 +762,3 @@ autocmd bufreadpost *.txt call <SID>turn_into_compose_window()
 call system(s:select_mailbox_command . shellescape(s:mailbox))
 call s:do_search()
 
-
-

data/lib/vmail/imap_client.rb

@@ -120,7 +120,6 @@ module Vmail
       if id_set.is_a?(String)
         id_set = id_set.split(',')
       end
-      max_id = id_set.to_a[-1]
       if id_set.to_a.empty?
         log "empty set"
         return ""
@@ -137,7 +136,7 @@ module Vmail
         log(error) && raise(error)
       end
       log "extracting headers"
-      new_message_rows = results.map {|x| extract_row_data(x, max_id) }
+      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|
@@ -156,7 +155,7 @@ module Vmail
     end
 
     # TODO extract this to another class or module and write unit tests
-    def extract_row_data(fetch_data, max_id=nil)
+    def extract_row_data(fetch_data)
       seqno = fetch_data.seqno
       uid = fetch_data.attr['UID']
       # log "fetched seqno #{seqno} uid #{uid}"
@@ -194,21 +193,18 @@ module Vmail
       subject = envelope.subject || ''
       subject = Mail::Encodings.unquote_and_convert_to(subject, 'UTF-8')
       flags = format_flags(flags)
-      first_col_width = max_id.to_s.length 
-      mid_width = @width - (first_col_width + 33)
+      mid_width = @width - 38
       address_col_width = (mid_width * 0.3).ceil
       subject_col_width = (mid_width * 0.7).floor
-      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(' ')
+      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) ].join(' ')
       {:uid => uid, :seqno => seqno, :row_text => row_text}
     rescue 
       log "error extracting header for uid #{uid} seqno #{seqno}: #$!"
-      row_text =i "#{seqno.to_s} : error extracting this header"
+      row_text = "#{seqno.to_s} : error extracting this header"
       {:uid => uid, :seqno => seqno, :row_text => row_text}
     end
 
@@ -224,16 +220,16 @@ module Vmail
         exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
         number  /= 1024 ** exponent
         unit = UNITS[exponent]
-        "#{number} #{unit}"
+        "#{number}#{unit}"
       end
     end
 
-    FLAGMAP = {:Flagged => '[*]'}
+    FLAGMAP = {:Flagged => '*'}
     # flags is an array like [:Flagged, :Seen]
     def format_flags(flags)
       flags = flags.map {|flag| FLAGMAP[flag] || flag}
       if flags.delete(:Seen).nil?
-        flags << '[+]' # unread
+        flags << '+' # unread
       end
       flags.join('')
     end
@@ -294,7 +290,8 @@ module Vmail
     end
 
     # gets 100 messages prior to id
-    def more_messages(message_id, limit=100)
+    def more_messages(limit=100)
+      message_id = @message_list[0][:seqno]
       log "more_messages: message_id #{message_id}"
       message_id = message_id.to_i
       if @all_search 
@@ -329,7 +326,7 @@ module Vmail
         return res
       end
       log "remaining messages: #{remaining}"
-      "> Load #{[100, remaining].min} more messages. #{remaining} remaining.\n" + res
+      ">  Load #{[100, remaining].min} more messages. #{remaining} remaining.\n" + res
     end
 
     def show_message(index, raw=false)
@@ -352,7 +349,7 @@ module Vmail
       out = formatter.process_body 
       size = fetch_data.attr["RFC822.SIZE"]
       @current_message = <<-EOF
-#{@mailbox} #{index} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
+#{@mailbox} seqno:#{index} uid:#{uid} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
 ---------------------------------------
 #{format_headers(formatter.extract_headers)}
 
@@ -397,9 +394,10 @@ EOF
         "#{id} deleted"
       else
         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_envelopes(uid_set, true).tap {|x| log x}
+        Thread.new do
+          res = @imap.uid_store(uid_set, action, [flg.to_sym])
+          log res.inspect
+        end
       end
     end
 

data/lib/vmail/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Daniel Choi