vmail 0.5.7 → 0.5.8

data/lib/vmail.vim

@@ -1,5 +1,5 @@
 if !exists("g:vmail_flagged_color")
-  let g:vmail_flagged_color = "ctermfg=green ctermbg=black"
+  let g:vmail_flagged_color = "ctermfg=green ctermbg=black guifg=green guibg=grey"
 endif
 let s:mailbox = $VMAIL_MAILBOX
 let s:query = $VMAIL_QUERY
@@ -25,7 +25,6 @@ let s:new_message_template_command = s:client_script . "new_message_template "
 let s:reply_template_command = s:client_script . "reply_template "
 let s:forward_template_command = s:client_script . "forward_template "
 let s:deliver_command = s:client_script . "deliver "
-let s:save_draft_command = s:client_script . "save_draft "
 let s:save_attachments_command = s:client_script . "save_attachments "
 let s:open_html_part_command = s:client_script . "open_html_part "
 let s:show_help_command = s:client_script . "show_help"
@@ -606,17 +605,6 @@ function! s:send_message()
   redraw
 endfunction
 
-func! s:save_draft()
-  let mail = join(getline(1,'$'), "\n")
-  echo "saving draft"
-  call system(s:save_draft_command, mail)
-  redraw
-  call s:focus_list_window()
-  wincmd p
-  close!
-  echo "draft saved"
-endfunc
-
 " -------------------------------------------------------------------------------- 
 
 " call from inside message window with <Leader>h
@@ -737,7 +725,6 @@ 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>
-  nnoremap <silent> <leader>vd :call <SID>save_draft()<CR>
   noremap <silent> <leader>o :call <SID>open_href()<cr> 
   noremap <silent> <leader>? :call <SID>show_help()<cr>
 endfunc

data/lib/vmail/imap_client.rb

@@ -91,7 +91,8 @@ module Vmail
         log "priming connection for delivering"
         res = @imap.fetch(@ids[-1], ["ENVELOPE"])
         if res.nil?
-          raise IOError, "IMAP connection seems broken"
+          # just go ahead, just log
+          log "priming connection didn't work, connection seems broken, but still going ahead..."
         end
       end 
     end
@@ -283,9 +284,11 @@ module Vmail
         @imap.search(update_query.join(' ')) 
       }
       # TODO change this. will throw error now
-      new_ids = ids.select {|x| x > @ids.max}
+      max_seqno = @message_list[-1][:seqno]
+      log "lookind for seqnos > #{max_seqno}"
+      new_ids = ids.select {|seqno| seqno > max_seqno}
       @ids = @ids + new_ids
-      log "UPDATE: NEW UIDS: #{new_ids.inspect}"
+      log "update: new uids: #{new_ids.inspect}"
       if !new_ids.empty?
         res = fetch_envelopes(new_ids)
         res
@@ -380,17 +383,22 @@ EOF
         # for delete, do in a separate thread because deletions are slow
         Thread.new do 
           unless @mailbox == '[Gmail]/Trash'
-            @imap.uid_copy(uid_set, "[Gmail]/Trash")
+            log "@imap.uid_copy #{uid_set.inspect} to trash"
+            log @imap.uid_copy(uid_set, "[Gmail]/Trash")
           end
-          res = @imap.uid_store(uid_set, action, [flg.to_sym])
+          log "@imap.uid_store #{uid_set.inspect} #{action} [#{flg.to_sym}]"
+          log @imap.uid_store(uid_set, action, [flg.to_sym])
           remove_uid_set_from_cached_lists(uid_set)
           reload_mailbox
         end
+
       elsif flg == '[Gmail]/Spam'
         log "Marking as spam index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
         Thread.new do 
-          @imap.uid_copy(uid_set, "[Gmail]/Spam")
-          res = @imap.uid_store(uid_set, action, [:Deleted])
+          log "@imap.uid_copy #{uid_set.inspect} to spam"
+          log @imap.uid_copy(uid_set, "[Gmail]/Spam")
+          log "@imap.uid_store #{uid_set.inspect} #{action} [:Deleted]"
+          log @imap.uid_store(uid_set, action, [:Deleted])
           remove_uid_set_from_cached_lists(uid_set)
           reload_mailbox
         end
@@ -398,8 +406,8 @@ EOF
       else
         log "Flagging index_range: #{index_range.inspect}; uid_set: #{uid_set.inspect}"
         Thread.new do
-          res = @imap.uid_store(uid_set, action, [flg.to_sym])
-          log res.inspect
+          log "@imap.uid_store #{uid_set.inspect} #{action} [#{flg.to_sym}]"
+          log @imap.uid_store(uid_set, action, [flg.to_sym])
         end
       end
     end
@@ -415,18 +423,36 @@ EOF
 
     def remove_uid_set_from_cached_lists(uid_set)
       # delete from cached @ids and @message_list
+      seqnos_to_delete = []
       uid_set.each {|uid| 
-        @message_list.
-          select {|row| row[:uid] == uid}.
-          each {|row| 
-            seqno = row[:seqno]
-            log "deleting seqno #{seqno} from @ids"
-            @ids.delete seqno
-            log "deleting msg uid #{row[:uid]} from @message_list"
-            @message_list.delete(row)
-          }
+        row = @message_list.detect {|row| row[:uid] == uid}
+        seqno = row[:seqno]
+        log "deleting seqno #{seqno} from @ids"
+        @ids.delete seqno
+        seqnos_to_delete << seqno
       }
-
+      log "seqnos_to_delete: #{seqnos_to_delete.inspect}"
+      seqnos_to_delete.reverse.each do |seqno|
+        startsize = @message_list.size 
+        log "deleting row with seqno #{seqno}"
+        @message_list = @message_list.delete_if {|x| x[:seqno] == seqno}
+        endsize = @message_list.size
+        log "deleted #{startsize - endsize} rows"
+      end
+      # now we need to decrement all the higher sequence numbers!
+      basenum = seqnos_to_delete.min  # this is the lowested seqno deleted
+      diff = seqnos_to_delete.size # substract this from all seqnos >= basenum
+      changes = []
+      @message_list.each do |row|
+        if row[:seqno] >= basenum
+          changes << "#{row[:seqno]}->#{row[:seqno] - diff}"
+          row[:seqno] -= diff
+        end
+      end
+      log "seqno decremented: #{changes.join(";")}"
+    rescue
+      log "error removing uid set from cached lists"
+      log $!
     end
 
     def move_to(id_set, mailbox)
@@ -444,6 +470,7 @@ EOF
       Thread.new do 
         log @imap.uid_copy(uid_set, mailbox)
         log @imap.uid_store(uid_set, '+FLAGS', [:Deleted])
+        remove_uid_set_from_cached_lists(uid_set)
         reload_mailbox
         log "moved uid_set #{uid_set.inspect} to #{mailbox}"
       end
@@ -468,7 +495,8 @@ EOF
         log "current mailboxes: #{current_mailboxes.inspect}"
         log "creating mailbox #{mailbox}"
         log @imap.create(mailbox) 
-        mailboxes = nil # force reload next fime list_mailboxes() called
+        @mailboxes = nil # force reload ...
+        list_mailboxes
       end
     end
 
@@ -537,15 +565,6 @@ EOF
       "message '#{mail.subject}' sent"
     end
 
-    def save_draft(text)
-      mail = new_mail_from_input(text)
-      log "saving draft"
-      reconnect_if_necessary do 
-        log "saving draft"
-        log @imap.append("[Gmail]/Drafts", text.gsub(/\n/, "\r\n"), [:Seen], Time.now)
-      end
-    end
-
     # TODO
     def resume_draft
       # chop off top three lines (this is hackey, fix later)
@@ -664,8 +683,11 @@ EOF
       log "error: #{$!}"
       log "attempting to reconnect"
       log(revive_connection)
-      # try just once
-      block.call
+      # hope this isn't an endless loop
+      reconnect_if_necessary do 
+        close
+        block.call
+      end
     rescue
       log "error: #{$!}"
       raise

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Daniel Choi