X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fnotmuch.vim;h=71d4b321de58490bce0e8e3ad2c601832498b2cb;hp=aa1b7ef6677b7543728b180a08f3e635f190e77e;hb=8d3b4ffb562fb7625304622d4a7421a7b1923135;hpb=a760e4ab47e152a9d3b4fa9b733f82723ebaaefe diff --git a/vim/notmuch.vim b/vim/notmuch.vim index aa1b7ef6..71d4b321 100644 --- a/vim/notmuch.vim +++ b/vim/notmuch.vim @@ -1,4 +1,4 @@ -if exists("g:loaded_notmuch_rb") +if exists("g:loaded_notmuch") finish endif @@ -6,15 +6,16 @@ if !has("ruby") || version < 700 finish endif -let g:loaded_notmuch_rb = "yep" +let g:loaded_notmuch = "yep" -let g:notmuch_rb_folders_maps = { +let g:notmuch_folders_maps = { \ '': 'folders_show_search()', \ 's': 'folders_search_prompt()', \ '=': 'folders_refresh()', + \ 'c': 'compose()', \ } -let g:notmuch_rb_search_maps = { +let g:notmuch_search_maps = { \ 'q': 'kill_this_buffer()', \ '': 'search_show_thread(1)', \ '': 'search_show_thread(2)', @@ -24,9 +25,10 @@ let g:notmuch_rb_search_maps = { \ 's': 'search_search_prompt()', \ '=': 'search_refresh()', \ '?': 'search_info()', + \ 'c': 'compose()', \ } -let g:notmuch_rb_show_maps = { +let g:notmuch_show_maps = { \ 'q': 'kill_this_buffer()', \ 'A': 'show_tag("-inbox -unread")', \ 'I': 'show_tag("-unread")', @@ -38,44 +40,25 @@ let g:notmuch_rb_show_maps = { \ 'r': 'show_reply()', \ '?': 'show_info()', \ '': 'show_next_msg()', + \ 'c': 'compose()', \ } -let g:notmuch_rb_compose_maps = { +let g:notmuch_compose_maps = { \ ',s': 'compose_send()', \ ',q': 'compose_quit()', \ } -let s:notmuch_rb_folders_default = [ +let s:notmuch_folders_default = [ \ [ 'new', 'tag:inbox and tag:unread' ], \ [ 'inbox', 'tag:inbox' ], \ [ 'unread', 'tag:unread' ], \ ] -let s:notmuch_rb_date_format_default = '%d.%m.%y' -let s:notmuch_rb_datetime_format_default = '%d.%m.%y %H:%M:%S' -let s:notmuch_rb_reader_default = 'mutt -f %s' -let s:notmuch_rb_sendmail_default = 'sendmail' -let s:notmuch_rb_folders_count_threads_default = 0 - -if !exists('g:notmuch_rb_date_format') - let g:notmuch_rb_date_format = s:notmuch_rb_date_format_default -endif - -if !exists('g:notmuch_rb_datetime_format') - let g:notmuch_rb_datetime_format = s:notmuch_rb_datetime_format_default -endif - -if !exists('g:notmuch_rb_reader') - let g:notmuch_rb_reader = s:notmuch_rb_reader_default -endif - -if !exists('g:notmuch_rb_sendmail') - let g:notmuch_rb_sendmail = s:notmuch_rb_sendmail_default -endif - -if !exists('g:notmuch_rb_folders_count_threads') - let g:notmuch_rb_folders_count_threads = s:notmuch_rb_folders_count_threads_default -endif +let s:notmuch_date_format_default = '%d.%m.%y' +let s:notmuch_datetime_format_default = '%d.%m.%y %H:%M:%S' +let s:notmuch_reader_default = 'mutt -f %s' +let s:notmuch_sendmail_default = 'sendmail' +let s:notmuch_folders_count_threads_default = 0 function! s:new_file_buffer(type, fname) exec printf('edit %s', a:fname) @@ -143,7 +126,15 @@ endfunction function! s:show_reply() ruby open_reply get_message.mail let b:compose_done = 0 - call s:set_map(g:notmuch_rb_compose_maps) + call s:set_map(g:notmuch_compose_maps) + autocmd BufUnload call s:compose_unload() + startinsert! +endfunction + +function! s:compose() + ruby open_compose + let b:compose_done = 0 + call s:set_map(g:notmuch_compose_maps) autocmd BufUnload call s:compose_unload() startinsert! endfunction @@ -168,7 +159,7 @@ function! s:show_open_msg() ruby << EOF m = get_message mbox = File.expand_path('~/.notmuch/vim_mbox') - cmd = VIM::evaluate('g:notmuch_rb_reader') % mbox + cmd = VIM::evaluate('g:notmuch_reader') % mbox system "notmuch show --format=mbox id:#{m.message_id} > #{mbox} && #{cmd}" EOF endfunction @@ -208,6 +199,9 @@ endfunction function! s:search_search_prompt() let text = input('Search: ') + if text == "" + return + endif setlocal modifiable ruby << EOF $cur_search = VIM::evaluate('text') @@ -326,7 +320,7 @@ ruby << EOF part = m.find_first_text nm_m = Message.new(msg, m) $messages << nm_m - date_fmt = VIM::evaluate('g:notmuch_rb_datetime_format') + date_fmt = VIM::evaluate('g:notmuch_datetime_format') date = Time.at(msg.date).strftime(date_fmt) nm_m.start = b.count b << "%s %s (%s)" % [msg['from'], date, msg.tags] @@ -351,7 +345,7 @@ ruby << EOF end EOF setlocal nomodifiable - call s:set_map(g:notmuch_rb_show_maps) + call s:set_map(g:notmuch_show_maps) endfunction function! s:search_show_thread(mode) @@ -374,7 +368,7 @@ ruby << EOF search_render($cur_search) EOF call s:set_menu_buffer() - call s:set_map(g:notmuch_rb_search_maps) + call s:set_map(g:notmuch_search_maps) autocmd CursorMoved call s:show_cursor_moved() endfunction @@ -390,27 +384,42 @@ function! s:folders() call s:new_buffer('folders') ruby folders_render() call s:set_menu_buffer() - call s:set_map(g:notmuch_rb_folders_maps) + call s:set_map(g:notmuch_folders_maps) endfunction "" root function! s:set_defaults() - if exists('g:notmuch_rb_custom_search_maps') - call extend(g:notmuch_rb_search_maps, g:notmuch_rb_custom_search_maps) + if !exists('g:notmuch_date_format') + let g:notmuch_date_format = s:notmuch_date_format_default endif - if exists('g:notmuch_rb_custom_show_maps') - call extend(g:notmuch_rb_show_maps, g:notmuch_rb_custom_show_maps) + if !exists('g:notmuch_datetime_format') + let g:notmuch_datetime_format = s:notmuch_datetime_format_default endif - " TODO for now lets check the old folders too - if !exists('g:notmuch_rb_folders') - if exists('g:notmuch_folders') - let g:notmuch_rb_folders = g:notmuch_folders - else - let g:notmuch_rb_folders = s:notmuch_rb_folders_default - endif + if !exists('g:notmuch_reader') + let g:notmuch_reader = s:notmuch_reader_default + endif + + if !exists('g:notmuch_sendmail') + let g:notmuch_sendmail = s:notmuch_sendmail_default + endif + + if !exists('g:notmuch_folders_count_threads') + let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default + endif + + if exists('g:notmuch_custom_search_maps') + call extend(g:notmuch_search_maps, g:notmuch_custom_search_maps) + endif + + if exists('g:notmuch_custom_show_maps') + call extend(g:notmuch_show_maps, g:notmuch_custom_show_maps) + endif + + if !exists('g:notmuch_folders') + let g:notmuch_folders = s:notmuch_folders_default endif endfunction @@ -421,13 +430,14 @@ ruby << EOF require 'notmuch' require 'rubygems' require 'tempfile' + require 'socket' begin require 'mail' rescue LoadError end $db_name = nil - $email_address = nil + $email = $email_name = $email_address = nil $searches = [] $buf_queue = [] $threads = [] @@ -452,7 +462,9 @@ ruby << EOF end $db_name = $config['database.path'] - $email_address = "%s <%s>" % [$config['user.name'], $config['user.primary_email']] + $email_name = $config['user.name'] + $email_address = $config['user.primary_email'] + $email = "%s <%s>" % [$email_name, $email_address] end def vim_puts(s) @@ -490,77 +502,114 @@ ruby << EOF end end - def open_reply(orig) + def generate_message_id + t = Time.now + random_tag = sprintf('%x%x_%x%x%x', + t.to_i, t.tv_usec, + $$, Thread.current.object_id.abs, rand(255)) + return "<#{random_tag}@#{Socket.gethostname}.notmuch>" + end + + def open_compose_helper(lines, cur) help_lines = [ 'Notmuch-Help: Type in your message here; to help you use these bindings:', 'Notmuch-Help: ,s - send the message (Notmuch-Help lines will be removed)', 'Notmuch-Help: ,q - abort the message', ] + + dir = File.expand_path('~/.notmuch/compose') + FileUtils.mkdir_p(dir) + Tempfile.open(['nm-', '.mail'], dir) do |f| + f.puts(help_lines) + f.puts + f.puts(lines) + + sig_file = File.expand_path('~/.signature') + if File.exists?(sig_file) + f.puts("-- ") + f.write(File.read(sig_file)) + end + + f.flush + + cur += help_lines.size + 1 + + VIM::command("let s:reply_from='%s'" % $email_address) + VIM::command("call s:new_file_buffer('compose', '#{f.path}')") + VIM::command("call cursor(#{cur}, 0)") + end + end + + def open_reply(orig) reply = orig.reply do |m| # fix headers if not m[:reply_to] m.to = [orig[:from].to_s, orig[:to].to_s] end m.cc = orig[:cc] - m.from = $email_address + m.from = $email + m.message_id = generate_message_id m.charset = 'utf-8' m.content_transfer_encoding = '7bit' end - dir = File.expand_path('~/.notmuch/compose') - FileUtils.mkdir_p(dir) - Tempfile.open(['nm-', '.mail'], dir) do |f| - lines = [] - - lines += help_lines - lines << '' - - body_lines = [] - if $mail_installed - addr = Mail::Address.new(orig[:from].value) - name = addr.name - name = addr.local + "@" if name.nil? && !addr.local.nil? - else - name = orig[:from] - end - name = "somebody" if name.nil? - - body_lines << "%s wrote:" % name - part = orig.find_first_text - part.convert.each_line do |l| - body_lines << "> %s" % l.chomp - end - body_lines << "" - body_lines << "" - body_lines << "" + lines = [] - reply.body = body_lines.join("\n") + body_lines = [] + if $mail_installed + addr = Mail::Address.new(orig[:from].value) + name = addr.name + name = addr.local + "@" if name.nil? && !addr.local.nil? + else + name = orig[:from] + end + name = "somebody" if name.nil? - lines += reply.to_s.lines.map { |e| e.chomp } - lines << "" + body_lines << "%s wrote:" % name + part = orig.find_first_text + part.convert.each_line do |l| + body_lines << "> %s" % l.chomp + end + body_lines << "" + body_lines << "" + body_lines << "" - old_count = lines.count - 1 + reply.body = body_lines.join("\n") - f.puts(lines) + lines += reply.to_s.lines.map { |e| e.chomp } + lines << "" - sig_file = File.expand_path('~/.signature') - if File.exists?(sig_file) - f.puts("-- ") - f.write(File.read(sig_file)) - end + cur = lines.count - 1 - f.flush + open_compose_helper(lines, cur) + end - VIM::command("let s:reply_from='%s'" % reply.from.first.to_s) - VIM::command("call s:new_file_buffer('compose', '#{f.path}')") - VIM::command("call cursor(#{old_count}, 0)") - end + def open_compose() + lines = [] + + lines << "Date: #{Time.now().strftime('%a, %-d %b %Y %T %z')}" + lines << "From: #{$email}" + lines << "To: " + cur = lines.count + + lines << "Cc: " + lines << "Bcc: " + lines << "Message-Id: #{generate_message_id}" + lines << "Subject: " + lines << "Mime-Version: 1.0" + lines << "Content-Type: text/plain; charset=utf-8" + lines << "Content-Transfer-Encoding: 7bit" + lines << "" + lines << "" + lines << "" + + open_compose_helper(lines, cur) end def folders_render() $curbuf.render do |b| - folders = VIM::evaluate('g:notmuch_rb_folders') - count_threads = VIM::evaluate('g:notmuch_rb_folders_count_threads') + folders = VIM::evaluate('g:notmuch_folders') + count_threads = VIM::evaluate('g:notmuch_folders_count_threads') $searches.clear folders.each do |name, search| q = $curbuf.query(search) @@ -572,7 +621,7 @@ ruby << EOF end def search_render(search) - date_fmt = VIM::evaluate('g:notmuch_rb_date_format') + date_fmt = VIM::evaluate('g:notmuch_date_format') q = $curbuf.query(search) q.sort = Notmuch::SORT_NEWEST_FIRST $threads.clear