rgrove-larch 1.0.2.1 → 1.0.2.2

data/HISTORY

@@ -6,6 +6,7 @@ Version 1.1.0 (git)
     database, which allows Larch to resync and resume interrupted syncs much
     more quickly without having to rescan all messages. As a result, SQLite 3 is
     now a dependency.
+  * Folders are now copied recursively by default.
   * Progress information is now displayed regularly while scanning large
     mailboxes.
 

data/lib/larch/db/mailbox.rb

@@ -5,7 +5,7 @@ class Mailbox < Sequel::Model
   one_to_many :messages, :class => Larch::Database::Message
 
   before_destroy do
-    Message.filter(:mailbox_id => id).destroy
+    Larch::Database::Message.filter(:mailbox_id => id).destroy
   end
 end
 

data/lib/larch/imap/mailbox.rb

@@ -88,11 +88,17 @@ class Mailbox
 
   # Iterates through messages in this mailbox, yielding the Larch message guid
   # of each to the provided block.
-  def each_guid
+  def each_guid # :yields: guid
     scan
     @db_mailbox.messages.each {|db_message| yield db_message.guid }
   end
 
+  # Iterates through mailboxes that are first-level children of this mailbox,
+  # yielding a Larch::IMAP::Mailbox object for each to the provided block.
+  def each_mailbox # :yields: mailbox
+    mailboxes.each {|mb| yield mb }
+  end
+
   # Returns a Larch::IMAP::Message struct representing the message with the
   # specified Larch _guid_, or +nil+ if the specified guid was not found in this
   # mailbox.
@@ -133,6 +139,18 @@ class Mailbox
   end
   alias size length
 
+  # Returns an Array of Larch::IMAP::Mailbox objects representing mailboxes that
+  # are first-level children of this mailbox.
+  def mailboxes
+    return [] if @attr.include?(:Noinferiors)
+
+    all        = @imap.safely{ @imap.conn.list('', "#{@name_utf7}#{@delim}%") } || []
+    subscribed = @imap.safely{ @imap.conn.lsub('', "#{@name_utf7}#{@delim}%") } || []
+
+    all.map{|mb| Mailbox.new(@imap, mb.name, mb.delim,
+        subscribed.any?{|s| s.name == mb.name}, mb.attr) }
+  end
+
   # Same as fetch, but doesn't mark the message as seen.
   def peek(message_id)
     fetch(message_id, true)
@@ -220,6 +238,9 @@ class Mailbox
           end
         end
       end
+
+      expected_uids = nil
+      fetch_data    = nil
     end
 
     if full_range && full_range.last - full_range.first > 0
@@ -242,16 +263,16 @@ class Mailbox
             fetch_data.each do |data|
               uid = data.attr['UID']
 
-              message_data = {
+              Database::Message.create(
+                :mailbox_id   => @db_mailbox.id,
                 :guid         => create_guid(data),
                 :uid          => uid,
                 :message_id   => parse_message_id(data.attr['BODY[HEADER.FIELDS (MESSAGE-ID)]']),
                 :rfc822_size  => data.attr['RFC822.SIZE'].to_i,
                 :internaldate => Time.parse(data.attr['INTERNALDATE']).to_i,
                 :flags        => data.attr['FLAGS'].map{|f| f.to_s }.join(',')
-              }
+              )
 
-              @db_mailbox.add_message(Database::Message.create(message_data))
               last_good_uid = uid
             end
 

data/lib/larch/imap.rb

@@ -6,7 +6,7 @@ module Larch
 # required reading if you're doing anything with IMAP in Ruby:
 # http://sup.rubyforge.org
 class IMAP
-  attr_reader :conn, :db_account, :options
+  attr_reader :conn, :db_account, :mailboxes, :options
 
   # URI format validation regex.
   REGEX_URI = URI.regexp(['imap', 'imaps'])

data/lib/larch/version.rb

@@ -1,6 +1,6 @@
 module Larch
   APP_NAME      = 'Larch'
-  APP_VERSION   = '1.0.2.1'
+  APP_VERSION   = '1.0.2.2'
   APP_AUTHOR    = 'Ryan Grove'
   APP_EMAIL     = 'ryan@wonko.com'
   APP_URL       = 'http://github.com/rgrove/larch/'

data/lib/larch.rb

@@ -70,7 +70,7 @@ module Larch
         mailbox_to = imap_to.mailbox(mailbox_from.name, mailbox_from.delim)
         mailbox_to.subscribe if mailbox_from.subscribed?
 
-        copy_messages(imap_from, mailbox_from.name, imap_to, mailbox_to.name)
+        copy_messages(mailbox_from, mailbox_to)
       end
 
     rescue => e
@@ -80,8 +80,8 @@ module Larch
       summary
     end
 
-    # Copies the messages in a single IMAP folder (non-recursively) from the
-    # source to the destination.
+    # Copies the messages in a single IMAP folder and all its subfolders
+    # (recursively) from the source to the destination.
     def copy_folder(imap_from, imap_to)
       raise ArgumentError, "imap_from must be a Larch::IMAP instance" unless imap_from.is_a?(IMAP)
       raise ArgumentError, "imap_to must be a Larch::IMAP instance" unless imap_to.is_a?(IMAP)
@@ -90,12 +90,10 @@ module Larch
       @failed = 0
       @total  = 0
 
-      from_mb_name = imap_from.uri_mailbox || 'INBOX'
-      to_mb_name   = imap_to.uri_mailbox || 'INBOX'
+      mailbox_from = imap_from.mailbox(imap_from.uri_mailbox || 'INBOX')
+      mailbox_to   = imap_to.mailbox(imap_to.uri_mailbox || 'INBOX')
 
-      return if excluded?(from_mb_name) || excluded?(to_mb_name)
-
-      copy_messages(imap_from, from_mb_name, imap_to, to_mb_name)
+      copy_mailbox(mailbox_from, mailbox_to)
 
       imap_from.disconnect
       imap_to.disconnect
@@ -152,19 +150,34 @@ module Larch
 
     private
 
-    def copy_messages(imap_from, mb_name_from, imap_to, mb_name_to)
-      raise ArgumentError, "imap_from must be a Larch::IMAP instance" unless imap_from.is_a?(IMAP)
-      raise ArgumentError, "imap_to must be a Larch::IMAP instance" unless imap_to.is_a?(IMAP)
+    def copy_mailbox(mailbox_from, mailbox_to)
+      raise ArgumentError, "mailbox_from must be a Larch::IMAP::Mailbox instance" unless mailbox_from.is_a?(Larch::IMAP::Mailbox)
+      raise ArgumentError, "mailbox_to must be a Larch::IMAP::Mailbox instance" unless mailbox_to.is_a?(Larch::IMAP::Mailbox)
+
+      return if excluded?(mailbox_from.name) || excluded?(mailbox_to.name)
+
+      mailbox_to.subscribe if mailbox_from.subscribed?
+      copy_messages(mailbox_from, mailbox_to)
 
-      return if excluded?(mb_name_from) || excluded?(mb_name_to)
+      mailbox_from.each_mailbox do |child_from|
+        next if excluded?(child_from.name)
+        child_to = mailbox_to.imap.mailbox(child_from.name, child_from.delim)
+        copy_mailbox(child_from, child_to)
+      end
+    end
 
-      @log.info "copying messages from #{imap_from.host}/#{mb_name_from} to #{imap_to.host}/#{mb_name_to}"
+    def copy_messages(mailbox_from, mailbox_to)
+      raise ArgumentError, "mailbox_from must be a Larch::IMAP::Mailbox instance" unless mailbox_from.is_a?(Larch::IMAP::Mailbox)
+      raise ArgumentError, "mailbox_to must be a Larch::IMAP::Mailbox instance" unless mailbox_to.is_a?(Larch::IMAP::Mailbox)
 
-      mailbox_from = imap_from.mailbox(mb_name_from)
+      return if excluded?(mailbox_from.name) || excluded?(mailbox_to.name)
 
-      @total += mailbox_from.length
+      imap_from = mailbox_from.imap
+      imap_to   = mailbox_to.imap
 
-      mailbox_to = imap_to.mailbox(mb_name_to)
+      @log.info "copying messages from #{imap_from.host}/#{mailbox_from.name} to #{imap_to.host}/#{mailbox_to.name}"
+
+      @total += mailbox_from.length
 
       mailbox_from.each_guid do |guid|
         next if mailbox_to.has_guid?(guid)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rgrove-larch
 version: !ruby/object:Gem::Version 
-  version: 1.0.2.1
+  version: 1.0.2.2
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-17 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: larch
 dependencies: 
 - !ruby/object:Gem::Dependency