rgrove-larch 0.0.1.3 → 0.0.1.4

data/bin/larch

@@ -27,21 +27,25 @@ EOS
     # opt :dry_run,          "Don't actually do anything.", :short => '-n'
     opt :fast_scan,        "Use a faster (but less accurate) method to scan mailboxes. This may result in messages being re-copied.", :short => :none
     opt :from_folder,      "Source folder to copy from.", :short => :none, :default => 'INBOX'
-    opt :from_pass,        "Source server password (will prompt if not specified).", :short => :none, :type => :string
-    opt :from_user,        "Source server username (will prompt if not specified).", :short => :none, :type => :string
+    opt :from_pass,        "Source server password (Default: prompt).", :short => :none, :type => :string
+    opt :from_user,        "Source server username (Default: prompt).", :short => :none, :type => :string
     opt :no_create_folder, "Don't create destination folders that don't already exist.", :short => :none
     opt :to_folder,        "Destination folder to copy to.", :short => :none, :default => 'INBOX'
-    opt :to_pass,          "Destination server password (will prompt if not specified).", :short => :none, :type => :string
-    opt :to_user,          "Destination server username (will prompt if not specified).", :short => :none, :type => :string
+    opt :to_pass,          "Destination server password (Default: prompt).", :short => :none, :type => :string
+    opt :to_user,          "Destination server username (Default: prompt).", :short => :none, :type => :string
     opt :verbosity,        "Output verbosity: debug, info, warn, error, or fatal.", :short => '-V', :default => 'info'
   end
 
   # Validate command-line options.
   [:from, :to].each do |sym|
-    Trollop.die sym, "must be a valid IMAP URI (e.g. imap://example.com)" unless options[sym] =~ IMAP::REGEX_URI
+    unless options[sym] =~ IMAP::REGEX_URI
+      Trollop.die sym, "must be a valid IMAP URI (e.g. imap://example.com)"
+    end
   end
 
-  Trollop.die :verbosity, "must be one of: #{Logger::LEVELS.keys.join(', ')}" unless Logger::LEVELS.has_key?(options[:verbosity].to_sym)
+  unless Logger::LEVELS.has_key?(options[:verbosity].to_sym)
+    Trollop.die :verbosity, "must be one of: #{Logger::LEVELS.keys.join(', ')}"
+  end
 
   # Create URIs.
   options[:from]      = URI(options[:from])
@@ -50,16 +54,31 @@ EOS
   options[:to].path   = '/' + CGI.escape(options[:to_folder].gsub(/^\//, ''))
 
   # Prompt for usernames and passwords if necessary.
-  options[:from_user] = ask("Source username (#{options[:from].host}): ") unless options[:from_user]
-  options[:from_pass] = ask("Source password (#{options[:from].host}): ") {|q| q.echo = false } unless options[:from_pass]
-  options[:to_user] = ask("Destination username (#{options[:to].host}): ") unless options[:to_user]
-  options[:to_pass] = ask("Destination password (#{options[:to].host}): ") {|q| q.echo = false } unless options[:to_pass]
+  unless options[:from_user]
+    options[:from_user] = ask("Source username (#{options[:from].host}): ")
+  end
+
+  unless options[:from_pass]
+    options[:from_pass] = ask("Source password (#{options[:from].host}): ") {|q| q.echo = false }
+  end
+
+  unless options[:to_user]
+    options[:to_user] = ask("Destination username (#{options[:to].host}): ")
+  end
+
+  unless options[:to_pass]
+    options[:to_pass] = ask("Destination password (#{options[:to].host}): ") {|q| q.echo = false }
+  end
 
   # Go go go!
   init(options[:verbosity])
 
-  source = IMAP.new(options[:from], options[:from_user], options[:from_pass], :fast_scan => options[:fast_scan])
-  dest   = IMAP.new(options[:to], options[:to_user], options[:to_pass], :create_mailbox => !options[:no_create_folder], :fast_scan => options[:fast_scan])
+  source = IMAP.new(options[:from], options[:from_user], options[:from_pass],
+      :fast_scan => options[:fast_scan])
+
+  dest = IMAP.new(options[:to], options[:to_user], options[:to_pass],
+      :create_mailbox => !options[:no_create_folder],
+      :fast_scan => options[:fast_scan])
 
   for sig in [:SIGINT, :SIGQUIT, :SIGTERM]
     trap(sig) { @log.fatal "Interrupted (#{sig})"; summary; exit }

data/lib/larch/imap.rb

@@ -145,7 +145,7 @@ class IMAP
     raise NotFoundError, "message not found: #{message_id}" if uid.nil?
 
     debug "fetching envelope: #{message_id}"
-    safely { imap_uid_fetch([uid], 'ENVELOPE').first.attr['ENVELOPE'] }
+    imap_uid_fetch([uid], 'ENVELOPE').first.attr['ENVELOPE']
   end
 
   # Fetches a Larch::Message instance representing the message with the
@@ -157,7 +157,7 @@ class IMAP
     raise NotFoundError, "message not found: #{message_id}" if uid.nil?
 
     debug "#{peek ? 'peeking at' : 'fetching'} message: #{message_id}"
-    data = safely { imap_uid_fetch([uid], [(peek ? 'BODY.PEEK[]' : 'BODY[]'), 'FLAGS', 'INTERNALDATE', 'ENVELOPE']) }.first
+    data = imap_uid_fetch([uid], [(peek ? 'BODY.PEEK[]' : 'BODY[]'), 'FLAGS', 'INTERNALDATE', 'ENVELOPE']).first
 
     Message.new(message_id, data.attr['ENVELOPE'], data.attr['BODY[]'],
         data.attr['FLAGS'], Time.parse(data.attr['INTERNALDATE']))
@@ -332,6 +332,7 @@ class IMAP
     begin
       unsafe_connect unless @imap
     rescue *RECOVERABLE_ERRORS => e
+      info "#{e.class.name}: #{e.message} (will retry)"
       raise unless (retries += 1) <= 3
 
       @imap = nil
@@ -344,14 +345,18 @@ class IMAP
     begin
       yield
     rescue *RECOVERABLE_ERRORS => e
+      info "#{e.class.name}: #{e.message} (will retry)"
       raise unless (retries += 1) <= 3
 
       sleep 2 * retries
       retry
     end
 
+  rescue Net::IMAP::NoResponseError => e
+    raise Error, "#{e.class.name}: #{e.message} (giving up)"
+
   rescue IOError, Net::IMAP::Error, OpenSSL::SSL::SSLError, SocketError, SystemCallError => e
-    raise FatalError, "while communicating with IMAP server (#{e.class.name}): #{e.message}"
+    raise FatalError, "#{e.class.name}: #{e.message} (giving up)"
   end
 
   def unsafe_connect

data/lib/larch.rb

@@ -34,7 +34,8 @@ module Larch
       raise ArgumentError, "source must be a Larch::IMAP instance" unless source.is_a?(IMAP)
       raise ArgumentError, "dest must be a Larch::IMAP instance" unless dest.is_a?(IMAP)
 
-      msgq = SizedQueue.new(32)
+      msgq  = SizedQueue.new(32)
+      mutex = Mutex.new
 
       @copied    = 0
       @failed    = 0
@@ -42,18 +43,30 @@ module Larch
 
       @log.info "copying messages from #{source.uri} to #{dest.uri}"
 
-      # Note that the stats variables are being accessed without synchronization
-      # in the following threads. This is currently safe because the threads
-      # never access the same variables. If we end up adding additional threads,
-      # these accesses need to be synchronized.
+      source_scan = Thread.new do
+        source.scan_mailbox
+      end
+
+      dest_scan = Thread.new do
+        dest.scan_mailbox
+      end
 
-      source_thread = Thread.new do
+      source_scan.join
+      dest_scan.join
+
+      source_copy = Thread.new do
         begin
-          @total = source.length
+          mutex.synchronize { @total = source.length }
 
           source.each do |id|
             next if dest.has_message?(id)
-            msgq << source.peek(id)
+
+            begin
+              msgq << source.peek(id)
+            rescue Larch::IMAP::Error => e
+              mutex.synchronize { @failed += 1 }
+              next
+            end
           end
 
         rescue => e
@@ -64,29 +77,35 @@ module Larch
         end
       end
 
-      dest_thread = Thread.new do
+      dest_copy = Thread.new do
         begin
           while msg = msgq.pop do
             break if msg == :finished
 
-            from = msg.envelope.from.first
-            @log.info "copying message: #{from.mailbox}@#{from.host} - #{msg.envelope.subject}"
+            if msg.envelope.from
+              env_from = msg.envelope.from.first
+              from = "#{env_from.mailbox}@#{env_from.host}"
+            else
+              from = '?'
+            end
+
+            @log.info "copying message: #{from} - #{msg.envelope.subject}"
             dest << msg
 
-            @copied += 1
+            mutex.synchronize { @copied += 1 }
           end
 
         rescue IMAP::FatalError => e
           @log.fatal e.message
 
         rescue => e
-          @failed += 1
+          mutex.synchronize { @failed += 1 }
           @log.error e.message
           retry
         end
       end
 
-      dest_thread.join
+      dest_copy.join
 
       source.disconnect
       dest.disconnect

metadata

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