vmail 0.3.9 → 0.4.0

data/lib/vmail/imap_client.rb

@@ -70,6 +70,18 @@ module Vmail
       @imap.select(@mailbox)
     end
 
+    def prime_connection
+      reconnect_if_necessary(4) do 
+        # this is just to prime the IMAP connection
+        # It's necessary for some reason before update and deliver. 
+        log "priming connection for delivering"
+        res = @imap.fetch(@ids[-1], ["ENVELOPE"])
+        if res.nil?
+          raise IOError, "IMAP connection seems broken"
+        end
+      end 
+    end
+
     def list_mailboxes
       @mailboxes ||= (@imap.list("[Gmail]/", "%") + @imap.list("", "%")).
         select {|struct| struct.attr.none? {|a| a == :Noselect} }.
@@ -90,6 +102,7 @@ module Vmail
 
     # id_set may be a range, array, or string
     def fetch_envelopes(id_set)
+      log "fetch_envelopes: #{id_set.inspect}"
       if id_set.is_a?(String)
         id_set = id_set.split(',')
       end
@@ -206,19 +219,18 @@ module Vmail
         query.unshift "1:#@num_messages"
         @all_search = false
       end
+      log "@all_search #{@all_search}"
       @query = query.join(' ')
       log "search query: #@query"
-      ids = reconnect_if_necessary do
+      @ids = reconnect_if_necessary do
         @imap.search(@query)
       end
-      fetch_ids = if ids.size > limit 
-                    log "truncating returned set to #{limit}"
-                    @start_index = ids.index(ids[-1]) - limit
-                    # save ids in @ids
-                    @ids = ids
-                    ids[@start_index..ids[-1]]
-                  else
-                    ids
+      # save ids in @ids, because filtered search relies on it
+      fetch_ids = if @all_search
+                    @ids
+                  else #filtered search
+                    @start_index = [@ids.length - limit, 0].max
+                    @ids[@start_index..-1]
                   end
       log "search query result: #{fetch_ids.inspect}"
       res = fetch_envelopes(fetch_ids)
@@ -226,31 +238,24 @@ module Vmail
     end
 
     def update
-      reconnect_if_necessary(4) do 
-        # this is just to prime the IMAP connection
-        # It's necessary for some reason.
-        log "priming connection for update"
-        res = @imap.fetch(@all_ids[-1], ["ENVELOPE"])
-        if res.nil?
-          raise IOError, "IMAP connection seems broken"
-        end
-      end
+      prime_connection
       ids = reconnect_if_necessary { 
         log "search #@query"
         @imap.search(@query) 
       }
       # TODO change this. will throw error now
-      new_ids = ids - @all_ids
+      new_ids = ids.select {|x| x > @ids.max}
+      @ids = @ids + new_ids
       log "UPDATE: NEW UIDS: #{new_ids.inspect}"
       if !new_ids.empty?
         res = fetch_envelopes(new_ids)
-        @all_ids = ids
         res
       end
     end
 
     # gets 100 messages prior to id
     def more_messages(message_id, limit=100)
+      log "more_messages: message_id #{message_id}"
       message_id = message_id.to_i
       if @all_search 
         x = [(message_id - limit), 0].max
@@ -259,26 +264,31 @@ module Vmail
         add_more_message_line(res, x)
       else
         # filter search query
+        log "@start_index #@start_index"
         x = [(@start_index - limit), 0].max
         y = [@start_index - 1, 0].max
         @start_index = x
+        log "fetch_envelopes @ids[#{x}..#{y}]"
         res = fetch_envelopes(@ids[x..y]) 
         add_more_message_line(res, @ids[x])
       end
     end
 
     def add_more_message_line(res, start_id)
+      log "add_more_message_line for start_id #{start_id}"
       if @all_search
         return res if start_id.nil?
         if start_id <= 1
           return res
         end
-        log "remaining = start_id - 1: #{start_id} - 1"
         remaining = start_id - 1
       else # filter search
-        log "remaining =  @ids.index(#{start_id}) - 1; @ids.size: #{@ids.size}"
         remaining = @ids.index(start_id) - 1
       end
+      if remaining < 1
+        log "none remaining"
+        return res
+      end
       log "remaining messages: #{remaining}"
       "> Load #{[100, remaining].min} more messages. #{remaining} remaining.\n" + res
     end
@@ -465,15 +475,7 @@ EOF
     def deliver(text)
       # parse the text. The headers are yaml. The rest is text body.
       require 'net/smtp'
-      reconnect_if_necessary(4) do 
-        # this is just to prime the IMAP connection
-        # It's necessary for some reason.
-        log "priming connection for delivering"
-        res = @imap.fetch(@all_ids[-1], ["ENVELOPE"])
-        if res.nil?
-          raise IOError, "IMAP connection seems broken"
-        end
-      end 
+      prime_connection
       mail = new_mail_from_input(text)
       mail.delivery_method(*smtp_settings)
       log mail.deliver!

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Choi