]> git.notmuchmail.org Git - notmuch/blobdiff - vim/notmuch.vim
vim: trivial cleanup
[notmuch] / vim / notmuch.vim
index 0ccaaf1ebebf32e5f82ec73389448f8bf278e8ce..9a45300f2683e210cbd21bf0446585819d74492d 100644 (file)
@@ -34,6 +34,7 @@ let g:notmuch_rb_show_maps = {
        \ 'o':          'show_open_msg()',
        \ 'e':          'show_extract_msg()',
        \ 's':          'show_save_msg()',
+       \ 'p':          'show_save_patches()',
        \ 'r':          'show_reply()',
        \ '?':          'show_info()',
        \ '<Tab>':      'show_next_msg()',
@@ -80,6 +81,7 @@ function! s:new_file_buffer(type, fname)
        exec printf('edit %s', a:fname)
        execute printf('set filetype=notmuch-%s', a:type)
        execute printf('set syntax=notmuch-%s', a:type)
+       ruby $curbuf.init(VIM::evaluate('a:type'))
        ruby $buf_queue.push($curbuf.number)
 endfunction
 
@@ -180,6 +182,20 @@ ruby << EOF
 EOF
 endfunction
 
+function! s:show_save_patches()
+ruby << EOF
+       q = $curbuf.query($cur_thread)
+       t = q.search_threads.first
+       n = 0
+       t.toplevel_messages.first.replies.each do |m|
+               next if not m['subject'] =~ /^\[PATCH.*\]/
+               file = "%04d.patch" % [n += 1]
+               system "notmuch show --format=mbox id:#{m.message_id} > #{file}"
+       end
+       vim_puts "Saved #{n} patches"
+EOF
+endfunction
+
 function! s:show_tag(intags)
        if empty(a:intags)
                let tags = input('tags: ')
@@ -192,9 +208,13 @@ endfunction
 
 function! s:search_search_prompt()
        let text = input('Search: ')
+       if text == ""
+         return
+       endif
        setlocal modifiable
 ruby << EOF
        $cur_search = VIM::evaluate('text')
+       $curbuf.reopen
        search_render($cur_search)
 EOF
        setlocal nomodifiable
@@ -206,6 +226,7 @@ endfunction
 
 function! s:search_refresh()
        setlocal modifiable
+       ruby $curbuf.reopen
        ruby search_render($cur_search)
        setlocal nomodifiable
 endfunction
@@ -218,7 +239,6 @@ function! s:search_tag(intags)
        endif
        ruby do_tag(get_thread_id, VIM::evaluate('l:tags'))
        norm j
-       call s:search_refresh()
 endfunction
 
 function! s:folders_search_prompt()
@@ -228,6 +248,7 @@ endfunction
 
 function! s:folders_refresh()
        setlocal modifiable
+       ruby $curbuf.reopen
        ruby folders_render()
        setlocal nomodifiable
 endfunction
@@ -255,11 +276,14 @@ function! s:show_next_thread()
 endfunction
 
 function! s:kill_this_buffer()
-       bdelete!
 ruby << EOF
-       $buf_queue.pop
-       b = $buf_queue.last
-       VIM::command("buffer #{b}") if b
+       if $buf_queue.size > 1
+               $curbuf.close
+               VIM::command("bdelete!")
+               $buf_queue.pop
+               b = $buf_queue.last
+               VIM::command("buffer #{b}") if b
+       end
 EOF
 endfunction
 
@@ -277,6 +301,7 @@ function! s:new_buffer(type)
        keepjumps 0d
        execute printf('set filetype=notmuch-%s', a:type)
        execute printf('set syntax=notmuch-%s', a:type)
+       ruby $curbuf.init(VIM::evaluate('a:type'))
        ruby $buf_queue.push($curbuf.number)
 endfunction
 
@@ -296,33 +321,31 @@ ruby << EOF
        $cur_thread = thread_id
        $messages.clear
        $curbuf.render do |b|
-               do_read do |db|
-                       q = db.query(get_cur_view)
-                       q.sort = 0
-                       msgs = q.search_messages
-                       msgs.each do |msg|
-                               m = Mail.read(msg.filename)
-                               part = m.find_first_text
-                               nm_m = Message.new(msg, m)
-                               $messages << nm_m
-                               date_fmt = VIM::evaluate('g:notmuch_rb_datetime_format')
-                               date = Time.at(msg.date).strftime(date_fmt)
-                               nm_m.start = b.count
-                               b << "%s %s (%s)" % [msg['from'], date, msg.tags]
-                               b << "Subject: %s" % [msg['subject']]
-                               b << "To: %s" % m['to']
-                               b << "Cc: %s" % m['cc']
-                               b << "Date: %s" % m['date']
-                               nm_m.body_start = b.count
-                               b << "--- %s ---" % part.mime_type
-                               part.convert.each_line do |l|
-                                       b << l.chomp
-                               end
-                               b << ""
-                               nm_m.end = b.count
+               q = $curbuf.query(get_cur_view)
+               q.sort = Notmuch::SORT_OLDEST_FIRST
+               msgs = q.search_messages
+               msgs.each do |msg|
+                       m = Mail.read(msg.filename)
+                       part = m.find_first_text
+                       nm_m = Message.new(msg, m)
+                       $messages << nm_m
+                       date_fmt = VIM::evaluate('g:notmuch_rb_datetime_format')
+                       date = Time.at(msg.date).strftime(date_fmt)
+                       nm_m.start = b.count
+                       b << "%s %s (%s)" % [msg['from'], date, msg.tags]
+                       b << "Subject: %s" % [msg['subject']]
+                       b << "To: %s" % msg['to']
+                       b << "Cc: %s" % msg['cc']
+                       b << "Date: %s" % msg['date']
+                       nm_m.body_start = b.count
+                       b << "--- %s ---" % part.mime_type
+                       part.convert.each_line do |l|
+                               b << l.chomp
                        end
-                       b.delete(b.count)
+                       b << ""
+                       nm_m.end = b.count
                end
+               b.delete(b.count)
        end
        $messages.each_with_index do |msg, i|
                VIM::command("syntax region nmShowMsg#{i}Desc start='\\%%%il' end='\\%%%il' contains=@nmShowMsgDesc" % [msg.start, msg.start + 1])
@@ -394,20 +417,21 @@ function! s:set_defaults()
        endif
 endfunction
 
-function! s:NotMuch()
+function! s:NotMuch(...)
        call s:set_defaults()
 
 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 = []
@@ -432,7 +456,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)
@@ -470,22 +496,12 @@ ruby << EOF
                end
        end
 
-       def do_write
-               db = Notmuch::Database.new($db_name, :mode => Notmuch::MODE_READ_WRITE)
-               begin
-                       yield db
-               ensure
-                       db.close
-               end
-       end
-
-       def do_read
-               db = Notmuch::Database.new($db_name)
-               begin
-                       yield db
-               ensure
-                       db.close
-               end
+       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_reply(orig)
@@ -500,7 +516,8 @@ ruby << EOF
                                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
@@ -549,7 +566,7 @@ ruby << EOF
 
                        f.flush
 
-                       VIM::command("let s:reply_from='%s'" % reply.from.first.to_s)
+                       VIM::command("let s:reply_from='%s'" % $email_address)
                        VIM::command("call s:new_file_buffer('compose', '#{f.path}')")
                        VIM::command("call cursor(#{old_count}, 0)")
                end
@@ -560,21 +577,19 @@ ruby << EOF
                        folders = VIM::evaluate('g:notmuch_rb_folders')
                        count_threads = VIM::evaluate('g:notmuch_rb_folders_count_threads')
                        $searches.clear
-                       do_read do |db|
-                               folders.each do |name, search|
-                                       q = db.query(search)
-                                       $searches << search
-                                       count = count_threads ? q.search_threads.count : q.search_messages.count
-                                       b << "%9d %-20s (%s)" % [count, name, search]
-                               end
+                       folders.each do |name, search|
+                               q = $curbuf.query(search)
+                               $searches << search
+                               count = count_threads ? q.search_threads.count : q.search_messages.count
+                               b << "%9d %-20s (%s)" % [count, name, search]
                        end
                end
        end
 
        def search_render(search)
                date_fmt = VIM::evaluate('g:notmuch_rb_date_format')
-               db = Notmuch::Database.new($db_name)
-               q = db.query(search)
+               q = $curbuf.query(search)
+               q.sort = Notmuch::SORT_NEWEST_FIRST
                $threads.clear
                t = q.search_threads
 
@@ -582,10 +597,11 @@ ruby << EOF
                        items.each do |e|
                                authors = e.authors.to_utf8.split(/[,|]/).map { |a| author_filter(a) }.join(",")
                                date = Time.at(e.newest_date).strftime(date_fmt)
+                               subject = e.messages.first['subject']
                                if $mail_installed
-                                       subject = Mail::Field.new("Subject: " + e.subject).to_s
+                                       subject = Mail::Field.new("Subject: " + subject).to_s
                                else
-                                       subject = e.subject.force_encoding('utf-8')
+                                       subject = subject.force_encoding('utf-8')
                                end
                                b << "%-12s %3s %-20.20s | %s (%s)" % [date, e.matched_messages, authors, subject, e.tags]
                                $threads << e.thread_id
@@ -594,7 +610,7 @@ ruby << EOF
        end
 
        def do_tag(filter, tags)
-               do_write do |db|
+               $curbuf.do_write do |db|
                        q = db.query(filter)
                        q.search_messages.each do |e|
                                e.freeze
@@ -611,6 +627,40 @@ ruby << EOF
                                e.thaw
                                e.tags_to_maildir_flags
                        end
+                       q.destroy!
+               end
+       end
+
+       module DbHelper
+               def init(name)
+                       @name = name
+                       @db = Notmuch::Database.new($db_name)
+                       @queries = []
+               end
+
+               def query(*args)
+                       q = @db.query(*args)
+                       @queries << q
+                       q
+               end
+
+               def close
+                       @queries.delete_if { |q| ! q.destroy! }
+                       @db.close
+               end
+
+               def reopen
+                       close if @db
+                       @db = Notmuch::Database.new($db_name)
+               end
+
+               def do_write
+                       db = Notmuch::Database.new($db_name, :mode => Notmuch::MODE_READ_WRITE)
+                       begin
+                               yield db
+                       ensure
+                               db.close
+                       end
                end
        end
 
@@ -659,6 +709,8 @@ ruby << EOF
        end
 
        class VIM::Buffer
+               include DbHelper
+
                def <<(a)
                        append(count(), a)
                end
@@ -828,9 +880,13 @@ ruby << EOF
 
        get_config
 EOF
-       call s:folders()
+       if a:0
+         call s:search(join(a:000))
+       else
+         call s:folders()
+       endif
 endfunction
 
-command NotMuch :call s:NotMuch()
+command -nargs=* NotMuch call s:NotMuch(<f-args>)
 
 " vim: set noexpandtab: