vmail 2.6.5 → 2.6.6

data/README.markdown

@@ -71,10 +71,21 @@ The `.vmailrc` file should look something like this. Substitute your own values.
     username: dhchoi@gmail.com
     password: password
     name: Daniel Choi
+    date_format: wordy
     signature: |
       -- 
       Sent from Vmail. http://danielchoi.com/software/vmail.html
 
+
+### Configuration file - optional parameters
+`date_format: wordy | numerical`
+
+`wordy`: The email arrival date is shown as for example 'Dec 15 11:59pm' or 'Dec 15 2008'.
+This is the default value of the date_format parameter.
+
+`numerical`: The email arrival date is shown as for example '15.12 23:59' or '15.12 2008'.
+It saves two characters - useful on devices with really small displays.
+
 This file should be formatted in [YAML syntax][1].
 
 [1]:http://www.yaml.org/spec/1.2/spec.html
@@ -93,6 +104,7 @@ If you want to use a shell script to print the signature, use the
     username: dhchoi@gmail.com
     password: password
     name: Daniel Choi
+    date_format: wordy
     signature_script: /home/choi/bin/vmail_signature.sh
 
 You can add a `vim_opts:` key-value pair to run arbitrary Vim commands when Vmail starts up.

data/lib/vmail.vim

@@ -69,9 +69,9 @@ function! s:create_list_window()
 endfunction
 
 " the message display buffer window
-function! s:create_message_window() 
+function! s:create_message_window()
   exec "split " . s:message_bufname
-  setlocal modifiable 
+  setlocal modifiable
   setlocal buftype=nofile
   let s:message_window_bufnr = bufnr('%')
   call s:message_window_mappings()
@@ -109,7 +109,7 @@ function! s:show_message(stay_in_message_list)
   write
   " this just clears the command line and prevents the screen from
   " moving up when the next echo statement executes:
-  " call feedkeys(":\<cr>") 
+  " call feedkeys(":\<cr>")
   " redraw
   let command = s:show_message_command . s:uid
   echom "Loading message ". s:uid .". Please wait..."
@@ -120,7 +120,7 @@ function! s:show_message(stay_in_message_list)
   1,$delete
   put =res
   " critical: don't call execute 'normal \<cr>'
-  " call feedkeys("<cr>") 
+  " call feedkeys("<cr>")
   1delete
   normal 1Gjk
   set nomodifiable
@@ -149,7 +149,7 @@ endfunction
 function! s:show_previous_message()
   let fullscreen = (bufwinnr(s:listbufnr) == -1) " we're in full screen message mode
   if fullscreen
-    3split 
+    3split
     exec 'b'. s:listbufnr
   else
     call s:focus_list_window()
@@ -194,10 +194,10 @@ function! s:show_raw()
 endfunction
 
 function! s:focus_list_window()
-  if bufwinnr(s:listbufnr) == winnr() 
+  if bufwinnr(s:listbufnr) == winnr()
     return
   end
-  let winnr = bufwinnr(s:listbufnr) 
+  let winnr = bufwinnr(s:listbufnr)
   if winnr == -1
     " create window
     split
@@ -247,7 +247,7 @@ function! s:update()
     call cursor(num, 0)
     normal z.
     redraw
-    echom "You have " . num . " new message" . (num == 1 ? '' : 's') . "!" 
+    echom "You have " . num . " new message" . (num == 1 ? '' : 's') . "!"
   else
     redraw
     echom "No new messages"
@@ -294,9 +294,9 @@ function! s:toggle_star() range
   if (match(getline(a:firstline), flag_symbol) != -1)
     let action = " -FLAGS"
   endif
-  let command = s:flag_command . shellescape(join(uid_set, ',')) . action . " Flagged" 
+  let command = s:flag_command . shellescape(join(uid_set, ',')) . action . " Flagged"
   if nummsgs == 1
-    echom "Toggling flag on message" 
+    echom "Toggling flag on message"
   else
     echom "Toggling flags on " . nummsgs . " messages"
   endif
@@ -320,7 +320,7 @@ function! s:toggle_star() range
   write
   redraw
   if nummsgs == 1
-    echom "Toggled flag on message" 
+    echom "Toggled flag on message"
   else
     echom "Toggled flags on " . nummsgs . " messages"
   endif
@@ -332,7 +332,7 @@ func! s:delete_messages(flag) range
   let nummsgs = len(uid_set)
   let command = s:flag_command . shellescape(join(uid_set, ',')) . " +FLAGS " . a:flag
   if nummsgs == 1
-    echom "Deleting message" 
+    echom "Deleting message"
   else
     echom "Deleting " . nummsgs . " messages"
   endif
@@ -371,7 +371,7 @@ func! s:append_messages_to_file() range
     return
   endif
   let s:append_file = append_file
-  let command = s:append_to_file_command . shellescape(join(uid_set, ',')) . ' ' . s:append_file 
+  let command = s:append_to_file_command . shellescape(join(uid_set, ',')) . ' ' . s:append_file
   echo "Appending " . nummsgs . " message" . (nummsgs == 1 ? '' : 's') . " to " . s:append_file . ". Please wait..."
   let res = s:system_with_error_handling(command)
   echo res
@@ -397,11 +397,11 @@ function! s:move_to_mailbox(copy) range
   let prompt = "select mailbox to " . (a:copy ? 'copy' : 'move') . " to: "
   call setline(1, prompt)
   normal $
-  inoremap <silent> <buffer> <cr> <Esc>:call <SID>complete_move_to_mailbox()<CR> 
+  inoremap <silent> <buffer> <cr> <Esc>:call <SID>complete_move_to_mailbox()<CR>
   inoremap <silent> <buffer> <esc> <Esc>:q<cr>
   setlocal completefunc=CompleteMoveMailbox
   " c-p clears the line
-  let s:firstline = a:firstline 
+  let s:firstline = a:firstline
   let s:lastline = a:lastline
   call feedkeys("a\<c-x>\<c-u>\<c-p>", 't')
   " save these in script scope to delete the lines when move completes
@@ -410,13 +410,13 @@ endfunction
 function! s:complete_move_to_mailbox()
   let mailbox = get(split(getline(line('.')), ": "), 1)
   close
-  if s:copy_to_mailbox 
+  if s:copy_to_mailbox
     let command = s:copy_to_command . s:uid_set . ' ' . shellescape(mailbox)
   else
     let command = s:move_to_command . s:uid_set . ' ' . shellescape(mailbox)
   endif
   redraw
-  echo "Moving uids ". s:uid_set . " to mailbox " . mailbox 
+  echo "Moving uids ". s:uid_set . " to mailbox " . mailbox
   let res = s:system_with_error_handling(command)
   setlocal modifiable
   if !s:copy_to_mailbox
@@ -425,7 +425,7 @@ function! s:complete_move_to_mailbox()
   setlocal nomodifiable
   write
   redraw
-  echo s:nummsgs .  " message" . (s:nummsgs == 1 ? '' : 's') . ' ' . (s:copy_to_mailbox ? 'copied' : 'moved') . ' to ' . mailbox 
+  echo s:nummsgs .  " message" . (s:nummsgs == 1 ? '' : 's') . ' ' . (s:copy_to_mailbox ? 'copied' : 'moved') . ' to ' . mailbox
 endfunction
 
 function! CompleteMoveMailbox(findstart, base)
@@ -474,7 +474,7 @@ function! s:mailbox_window()
   setlocal noswapfile
   setlocal modifiable
   resize 1
-  inoremap <silent> <buffer> <cr> <Esc>:call <SID>select_mailbox()<CR> 
+  inoremap <silent> <buffer> <cr> <Esc>:call <SID>select_mailbox()<CR>
   inoremap <silent> <buffer> <esc> <Esc>:q<cr>
   setlocal completefunc=CompleteMailbox
   " c-p clears the line
@@ -526,19 +526,19 @@ function! s:select_mailbox()
   " reset window width now
   call s:system_with_error_handling(s:set_window_width_command . winwidth(1))
   " now get latest 100 messages
-  call s:focus_list_window()  
+  call s:focus_list_window()
   setlocal modifiable
   let command = s:search_command . shellescape("all")
   echo "Loading messages..."
   let res = s:system_with_error_handling(command)
   silent 1,$delete
   silent! put! =res
-  execute "normal Gdd\<c-y>" 
+  execute "normal Gdd\<c-y>"
   setlocal nomodifiable
   write
   normal gg
   redraw
-  echom "Current mailbox: ". s:mailbox 
+  echom "Current mailbox: ". s:mailbox
 endfunction
 
 func! s:search_query()
@@ -559,37 +559,37 @@ function! s:do_search()
   close
   let command = s:search_command . shellescape(s:query)
   redraw
-  call s:focus_list_window()  
+  call s:focus_list_window()
   setlocal modifiable
   echo "Running query on " . s:mailbox . ": " . s:query . ". Please wait..."
   let res = s:system_with_error_handling(command)
   silent! 1,$delete
   silent! put! =res
-  execute "silent normal Gdd\<c-y>" 
+  execute "silent normal Gdd\<c-y>"
   setlocal nomodifiable
   write
   normal gg
 endfunction
 
 function! s:more_messages()
-  let command = s:more_messages_command 
+  let command = s:more_messages_command
   echo "Fetching more messages. Please wait..."
   let res = s:system_with_error_handling(command)
   setlocal modifiable
   let lines =  split(res, "\n")
   call append(line('$'), lines)
-  " execute "normal Gdd\<c-y>" 
+  " execute "normal Gdd\<c-y>"
   setlocal nomodifiable
   normal j
   redraw
   echo "Done"
 endfunction
 
-" --------------------------------------------------------------------------------  
+" --------------------------------------------------------------------------------
 "  compose reply, compose, forward, save draft
 
 function! s:compose_reply(all)
-  let command = s:reply_template_command 
+  let command = s:reply_template_command
   if a:all
     let command = command . ' 1'
   endif
@@ -602,14 +602,14 @@ function! s:compose_message()
   let command = s:new_message_template_command
   call s:open_compose_window(command)
   " position cursor after to:
-"  call search("^to:") 
+"  call search("^to:")
 "  normal A
 endfunction
 
 function! s:compose_forward()
-  let command = s:forward_template_command 
+  let command = s:forward_template_command
   call s:open_compose_window(command)
-"  call search("^to:") 
+"  call search("^to:")
 "  normal A
 endfunction
 
@@ -637,7 +637,7 @@ func! s:turn_into_compose_window()
   setlocal completefunc=CompleteContact
 endfunc
 
-" contacts.txt file should be generated. 
+" contacts.txt file should be generated.
 " grep works well, does partial matches
 function! CompleteContact(findstart, base)
   if !exists("s:mailboxes")
@@ -652,7 +652,7 @@ function! CompleteContact(findstart, base)
     endwhile
     return start
   else
-    " find contacts 
+    " find contacts
     " model regex: match at beginning of line, or inside < > wrapping
     " email addr
     "  '\(^ho\|<ho\)'
@@ -683,11 +683,11 @@ function! s:send_message()
   redraw
 endfunction
 
-" -------------------------------------------------------------------------------- 
+" --------------------------------------------------------------------------------
 
 " call from inside message window with <Leader>h
 func! s:open_html_part()
-  let command = s:open_html_part_command 
+  let command = s:open_html_part_command
   " the command saves the html part to a local file
   let outfile = s:system_with_error_handling(command)
   " todo: allow user to change open in browser command?
@@ -712,7 +712,7 @@ func! s:attach_file(file)
 endfunc
 
 
-" -------------------------------------------------------------------------------- 
+" --------------------------------------------------------------------------------
 
 func! s:toggle_maximize_window()
   if winnr('$') > 1
@@ -743,7 +743,7 @@ func! s:open_href(all) range
       endif
       let lnum += 1
     endwhile
-    echom 'opened '.n.' links' 
+    echom 'opened '.n.' links'
     return
   end
   let line = search(pattern, 'cw')
@@ -755,7 +755,7 @@ func! s:open_href(all) range
       let n += 1
       let line = search('https\?:', 'W')
     endwhile
-    echom 'opened '.n.' links' 
+    echom 'opened '.n.' links'
   else
     let href = matchstr(getline(line('.')), pattern)
     let command = s:browser_command ." ".shellescape(href)." &"
@@ -764,7 +764,7 @@ func! s:open_href(all) range
   endif
 endfunc
 
-" -------------------------------------------------------------------------------- 
+" --------------------------------------------------------------------------------
 "  HELP
 func! s:show_help()
   let command = s:browser_command . ' ' . shellescape('http://danielchoi.com/software/vmail.html')
@@ -773,7 +773,7 @@ func! s:show_help()
   "exec "split " . helpfile
 endfunc
 
-" -------------------------------------------------------------------------------- 
+" --------------------------------------------------------------------------------
 " CONVENIENCE FUNCS
 
 function! s:collect_uids(startline, endline)
@@ -787,7 +787,7 @@ function! s:collect_uids(startline, endline)
   return uid_set
 endfunc
 
-" -------------------------------------------------------------------------------- 
+" --------------------------------------------------------------------------------
 " MAPPINGS
 
 func! s:message_window_mappings()
@@ -1071,8 +1071,8 @@ func! s:global_mappings()
   " NOTE send_message is a global mapping, so user can load a saved
   " message from a file and send it
   nnoremap <silent> <leader>vs :call <SID>send_message()<CR>
-  noremap <silent> <leader>o :call <SID>open_href(0)<cr> 
-  noremap <silent> <leader>O :call <SID>open_href(1)<cr> 
+  noremap <silent> <leader>o :call <SID>open_href(0)<cr>
+  noremap <silent> <leader>O :call <SID>open_href(1)<cr>
   noremap <silent> <leader>? :call <SID>show_help()<cr>
   noremap <silent> <leader>qq :qal!<cr>
 endfunc
@@ -1087,7 +1087,14 @@ func! s:set_list_colors()
   syn match vmailFirstColAnswered /An/ contained containedin=vmailFirstCol
   syn match vmailFirstColForward /\$F/ contained containedin=vmailFirstCol
   syn match vmailFirstColNotJunk /No/ contained containedin=vmailFirstCol
-  syn match vmailDateCol /\s\+... \d\d \(\(\d\d:\d\d..\)\|\(\d\{4}\)\)\s\+|/ nextgroup=vmailFromCol contains=vmailSeperator
+
+  " Examples matched by vmailDateCol:
+  " | Dec 15 11:59pm |
+  " | Dec 15 2008    |
+  " | 15.12 23:59 |
+  " | 15.12 2008  |
+  syn match vmailDateCol /\s\+\(... \d\d \(\(\d\d:\d\d..\)\|\(\d\{4}\)\)\)\|\(\d\d\.\d\d \(\(\d\d:\d\d\)\|\(\d\{4}\)\)\)\s\+|/ nextgroup=vmailFromCol contains=vmailSeperator
+
   syn match vmailFromCol /\s.\{-}|\@=/ contained nextgroup=vmailFromSeperator
   syn match vmailFromColEmail /<[^ ]*/ contained containedin=vmailFromCol
   syn match vmailFromSeperator /|/ contained nextgroup=vmailSubject

data/lib/vmail/imap_client.rb

@@ -46,6 +46,20 @@ module Vmail
       @smtp_domain = config['smtp_domain'] || 'gmail.com'
       @authentication = config['authentication'] || 'plain'
       @width = 100
+      @date_format = config['date_format'] || 'wordy'
+      if @date_format == 'numerical'
+         @date_formatter_this_year = '%d.%m %H:%M'
+         @date_formatter_prev_years = '%d.%m %Y'
+         @formatted_date_with = 11
+      else
+         if @date_format != 'wordy'
+            @logger.warn "Unknown date_format: #{@date_format}; Using default value: wordy"
+            @date_format = 'wordy'
+         end
+         @date_formatter_this_year = '%b %d %I:%M%P'
+         @date_formatter_prev_years = '%b %d %Y'
+         @formatted_date_with = 14
+      end
       current_message = nil
     end
 

data/lib/vmail/showing_headers.rb

@@ -1,5 +1,7 @@
 require 'iconv'
+
 module Vmail
+
   module ShowingHeaders
 
     def get_message_headers(message_ids)
@@ -76,9 +78,9 @@ module Vmail
     def format_header_for_list(message)
       date = DateTime.parse(message.date)
       formatted_date = if date.year != Time.now.year
-                         date.strftime "%b %d %Y" 
+                         date.strftime @date_formatter_prev_years
                        else 
-                         date.strftime "%b %d %I:%M%P"
+                         date.strftime @date_formatter_this_year
                        end
       address = if @mailbox == mailbox_aliases['sent']
                   message.recipients
@@ -90,7 +92,7 @@ module Vmail
       address_col_width = (mid_width * 0.3).ceil
       subject_col_width = (mid_width * 0.7).floor
       row_text = [ format_flags(message.flags).col(2),
-                   (formatted_date || '').col(14),
+                   (formatted_date || '').col(@formatted_date_with),
                    address.col(address_col_width),
                    message.subject.col(subject_col_width), 
                    number_to_human_size(message.size).rcol(7), 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.6.5'
+  VERSION = '2.6.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
   prerelease: 
 platform: ruby
 authors: