vmail 0.0.5 → 0.0.6

data/NOTES

@@ -480,17 +480,15 @@ DONE
 - sending an attachment
   - can specify a directory, then all the items in the directory get
     attached and sent
+- extract and append text of all selected messages into file (append)
 
 next:
-- forwarding with attachments
-  - could be "attach: [uid] attachments to signal"
+- tweak contacts list script (plus instruction for how to use)
 - help doc: just return readme file, or a vim version of it (vim filetype later)
 - follow mysql and use -u and -p flags on startup of server?
   - omitting -p flag forces prompt
-- print all selected messages into file (append)
 - ,s s confusion? Star vs search
-- enhance contacts auto fix with more advanced vim script
-  - sort contacts by frequency, then take first 10 or so of any match
+- note dependence on lynx in README
 
 later:
 - mvim - starred messages not syntax colored
@@ -504,8 +502,11 @@ later:
   - need to bundle macvim
 - if move to unknown mailbox, create the mailbox, then do the move
 - some lingering encoding issues
+- forwarding with attachments
+  - could be "attach: [uid] attachments to signal"
 - something is wrong with cursorline sometimes
 - try flashing progress in echo line
+- sort contacts by frequency, then take first 10 or so of any match
   - straight to switch mailbox, etc from message window
 - allow deliver command from any buffer or window, as long as headers are at top
 - range selection from : prompt
@@ -519,6 +520,8 @@ later:
   - tempname()
   - system() allows a parameters that is written to tmp file and passed
     to stdin
+- enhance contacts auto fix with more advanced vim script
+- create contacts database on first startup
 
 
 

data/lib/vmail.rb

@@ -29,7 +29,7 @@ module Vmail
     buffer_file = "vmailbuffer.txt"
     puts "using buffer file: #{buffer_file}"
     File.open(buffer_file, "w") do |file|
-      file.puts "just a moment..."  
+      file.puts "fetching messages. please wait..."  
     end
 
     # invoke vim

data/lib/vmail.vim

@@ -1,5 +1,6 @@
 let s:mailbox = $VMAIL_MAILBOX
 let s:query = $VMAIL_QUERY
+let s:append_file = ''
 
 let s:drb_uri = $DRB_URI
 
@@ -13,6 +14,7 @@ let s:select_mailbox_command = s:client_script . "select_mailbox "
 let s:search_command = s:client_script . "search "
 let s:more_messages_command = s:client_script . "more_messages "
 let s:flag_command = s:client_script . "flag "
+let s:append_to_file_command = s:client_script . "append_to_file "
 let s:move_to_command = s:client_script . "move_to "
 let s:new_message_template_command = s:client_script . "new_message_template "
 let s:reply_template_command = s:client_script . "reply_template "
@@ -180,6 +182,7 @@ function! s:update()
     let line = line('$')
     $put =res
     setlocal nomodifiable
+    write
     let num = len(split(res, '\n', ''))
     redraw
     call cursor(line + 1, 0)
@@ -221,6 +224,7 @@ function! s:toggle_star() range
   exec a:firstline . "," . a:lastline . "delete"
   exec (a:firstline - 1). "put =res"
   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
@@ -246,6 +250,7 @@ func! s:delete_messages(flag) range
   setlocal modifiable
   exec a:firstline . "," . a:lastline . "delete"
   setlocal nomodifiable
+  write
   " if more than 2 lines change, vim forces us to look at a message.
   " dismiss it.
   if len(uids) > 2
@@ -253,6 +258,27 @@ func! s:delete_messages(flag) range
   endif
 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 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
+  let res = system(command)
+  echo res
+  redraw
+endfunc
+
 " --------------------------------------------------------------------------------
 " move to another mailbox
 function! s:move_to_mailbox() range
@@ -465,7 +491,6 @@ function! s:compose_reply(all)
 endfunction
 
 function! s:compose_message()
-  write
   let command = s:new_message_template_command
   call s:open_compose_window(command)
   " position cursor after to:
@@ -475,7 +500,6 @@ function! s:compose_message()
 endfunction
 
 function! s:compose_forward()
-  write
   let command = s:forward_template_command . s:current_uid
   call s:open_compose_window(command)
   call search("^to:")
@@ -487,10 +511,12 @@ func! s:open_compose_window(command)
   redraw
   echo a:command
   let res = system(a:command)
-  split ComposeMessage
-  wincmd p 
-  close
+  split compose-message
+  setlocal buftype=nofile
+  setlocal noswapfile
   setlocal modifiable
+  wincmd p 
+  close!
   1,$delete
   put! =res
   normal 1G
@@ -526,23 +552,22 @@ function! s:cancel_compose()
 endfunction
 
 function! s:send_message()
-  write
   let mail = join(getline(1,'$'), "\n")
-  exec ":!" . s:deliver_command . " < ComposeMessage" 
+  echo "sending message"
+  call system(s:deliver_command, mail)
   redraw
-  call s:focus_list_window()
-  wincmd p
-  close!
+  echo "sent! press q to go back to message list"
 endfunction
 
 func! s:save_draft()
-  write
   let mail = join(getline(1,'$'), "\n")
-  exec ":!" . s:save_draft_command . " < ComposeMessage" 
+  echo "saving draft"
+  call system(s:save_draft_command, mail)
   redraw
   call s:focus_list_window()
   wincmd p
   close!
+  echo "draft saved"
 endfunc
 
 " -------------------------------------------------------------------------------- 
@@ -616,6 +641,7 @@ func! s:message_list_window_mappings()
   noremap <silent> <buffer> <leader>! :call <SID>delete_messages("[Gmail]/Spam")<CR>
   "open a link browser (os x)
   "autocmd CursorMoved <buffer> call <SID>show_message()
+  noremap <silent> <buffer> <leader>vp :call <SID>append_messages_to_file()<CR>
   noremap <silent> <buffer> u :call <SID>update()<CR>
   noremap <silent> <buffer> <Leader>s :call <SID>search_query()<CR>
   noremap <silent> <buffer> <Leader>m :call <SID>mailbox_window()<CR>

data/lib/vmail/imap_client.rb

@@ -224,8 +224,11 @@ module Vmail
 
     def show_message(uid, raw=false, forwarded=false)
       uid = uid.to_i
+      if forwarded
+        return @current_message.split(/\n-{20,}\n/, 2)[1]
+      end
       return @current_mail.to_s if raw 
-      return @current_message if uid == @current_uid
+      return @current_message if uid == @current_uid 
       log "fetching #{uid.inspect}" 
       fetch_data = reconnect_if_necessary do 
         @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])[0]
@@ -240,8 +243,8 @@ module Vmail
       out = formatter.process_body 
       size = fetch_data.attr["RFC822.SIZE"]
       @current_message = <<-EOF
-#{@mailbox} #{uid} #{number_to_human_size size} #{forwarded ? nil : format_parts_info(formatter.list_parts)}
-----------------------------------------
+#{@mailbox} #{uid} #{number_to_human_size size} #{format_parts_info(formatter.list_parts)}
+---------------------------------------
 #{format_headers(formatter.extract_headers)}
 
 #{out}
@@ -295,7 +298,20 @@ EOF
       log @imap.uid_store(uid_set, '+FLAGS', [:Deleted])
     end
 
-    # TODO mark spam
+    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)
+        divider = "#{'=' * 39}\n"
+        File.open(file, 'a') {|f| f.puts(divider + message + "\n\n")}
+        log "appended uid #{uid}"
+      end
+      "printed #{uid_set.size} message#{uid_set.size == 1 ? '' : 's'} to #{file.strip}"
+    end
+
 
     def new_message_template
       headers = {'from' => "#{@name} <#{@username}>",
@@ -349,7 +365,6 @@ EOF
       "\n\n#@signature"
     end
 
-    # TODO, forward with attachments 
     def forward_template(uid)
       original_body = show_message(uid, false, true)
       new_message_template + 
@@ -397,7 +412,7 @@ EOF
       if (attachments = raw_body.split(/\n\s*\n/, 2)[0]) =~ /^attach(ment|ments)*:/
         # TODO
         files = YAML::load(attachments).values.flatten
-        log "attachments: #{files}"
+        log "attach: #{files}"
         files.each do |file|
           if File.directory?(file)
             Dir.glob("#{file}/*").each {|f| mail.add_file(f) if File.size?(f)}
@@ -408,6 +423,7 @@ EOF
         mail.text_part do
           body raw_body.split(/\n\s*\n/, 2)[1]
         end
+
       else
         mail.text_part do
           body raw_body

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Daniel Choi