rgrove-larch 0.0.1.2 → 0.0.1.3

data/lib/larch/imap.rb

@@ -86,16 +86,18 @@ class IMAP
     return false if has_message?(message)
 
     safely do
-      begin
-        @imap.select(mailbox)
-      rescue Net::IMAP::NoResponseError => e
-        if @options[:create_mailbox]
-          info "creating mailbox: #{mailbox}"
-          @imap.create(mailbox)
-          retry
-        end
+      @mutex.synchronize do
+        begin
+          @imap.select(mailbox)
+        rescue Net::IMAP::NoResponseError => e
+          if @options[:create_mailbox]
+            info "creating mailbox: #{mailbox}"
+            @imap.create(mailbox)
+            retry
+          end
 
-        raise
+          raise
+        end
       end
 
       debug "appending message: #{message.id}"
@@ -112,7 +114,6 @@ class IMAP
     return if @imap
     safely {} # connect, but do nothing else
   end
-  synchronized :connect
 
   # Closes the IMAP connection if one is currently open.
   def disconnect
@@ -138,10 +139,8 @@ class IMAP
 
   # Gets a Net::IMAP::Envelope for the specified message id.
   def envelope(message_id)
-    uid = @mutex.synchronize do
-      unsync_scan_mailbox
-      @ids[message_id]
-    end
+    scan_mailbox
+    uid = @ids[message_id]
 
     raise NotFoundError, "message not found: #{message_id}" if uid.nil?
 
@@ -152,10 +151,8 @@ class IMAP
   # Fetches a Larch::Message instance representing the message with the
   # specified Larch message id.
   def fetch(message_id, peek = false)
-    uid = @mutex.synchronize do
-      unsync_scan_mailbox
-      @ids[message_id]
-    end
+    scan_mailbox
+    uid = @ids[message_id]
 
     raise NotFoundError, "message not found: #{message_id}" if uid.nil?
 
@@ -170,10 +167,9 @@ class IMAP
   # Returns +true+ if a message with the specified Larch <em>message_id</em>
   # exists in this mailbox, +false+ otherwise.
   def has_message?(message_id)
-    unsync_scan_mailbox
+    scan_mailbox
     @ids.has_key?(message_id)
   end
-  synchronized :has_message?
 
   def host
     @uri.host
@@ -181,10 +177,9 @@ class IMAP
 
   # Gets the number of messages in this mailbox.
   def length
-    unsync_scan_mailbox
+    scan_mailbox
     @ids.length
   end
-  synchronized :length
   alias size length
 
   # Same as fetch, but doesn't mark the message as seen.
@@ -239,9 +234,9 @@ class IMAP
         next
       end
 
-      if @ids.has_key?(id)
+      if @ids.has_key?(id) && Larch.log.level == :debug
         envelope = imap_uid_fetch([uid], 'ENVELOPE').first.attr['ENVELOPE']
-        warn "duplicate message? #{id} (Subject: #{envelope.subject})"
+        debug "duplicate message? #{id} (Subject: #{envelope.subject})"
       end
 
       @ids[id] = uid
@@ -336,7 +331,6 @@ class IMAP
 
     begin
       unsafe_connect unless @imap
-      yield
     rescue *RECOVERABLE_ERRORS => e
       raise unless (retries += 1) <= 3
 
@@ -345,6 +339,17 @@ class IMAP
       retry
     end
 
+    retries = 0
+
+    begin
+      yield
+    rescue *RECOVERABLE_ERRORS => e
+      raise unless (retries += 1) <= 3
+
+      sleep 2 * retries
+      retry
+    end
+
   rescue IOError, Net::IMAP::Error, OpenSSL::SSL::SSLError, SocketError, SystemCallError => e
     raise FatalError, "while communicating with IMAP server (#{e.class.name}): #{e.message}"
   end
@@ -395,7 +400,6 @@ class IMAP
 
     raise exception if exception
   end
-
 end
 
 end

data/lib/larch.rb

@@ -25,7 +25,6 @@ module Larch
 
       @copied    = 0
       @failed    = 0
-      @untouched = 0
       @total     = 0
     end
 
@@ -39,7 +38,6 @@ module Larch
 
       @copied    = 0
       @failed    = 0
-      @untouched = 0
       @total     = 0
 
       @log.info "copying messages from #{source.uri} to #{dest.uri}"
@@ -54,11 +52,7 @@ module Larch
           @total = source.length
 
           source.each do |id|
-            if dest.has_message?(id)
-              @untouched += 1
-              next
-            end
-
+            next if dest.has_message?(id)
             msgq << source.peek(id)
           end
 
@@ -101,7 +95,7 @@ module Larch
     end
 
     def summary
-      @log.info "#{@copied} message(s) copied, #{@failed} failed, #{@untouched} untouched out of #{@total} total"
+      @log.info "#{@copied} message(s) copied, #{@failed} failed, #{@total - @copied - @failed} untouched out of #{@total} total"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rgrove-larch
 version: !ruby/object:Gem::Version 
-  version: 0.0.1.2
+  version: 0.0.1.3
 platform: ruby
 authors: 
 - Ryan Grove