larch 1.1.0.dev.20091203 → 1.1.0.dev.20091206

data/HISTORY

@@ -15,11 +15,15 @@ Version 1.1.0 (git)
   * Folders are now copied recursively by default.
   * Progress information is now displayed regularly while scanning large
     mailboxes.
+  * Added --sync-flags option to synchronize message flags (like Seen, Flagged,
+    etc.) from the source server to the destination server for messages that
+    already exist on the destination.
   * Added short versions of common command-line options.
   * The --fast-scan option has been removed.
   * The --to-folder option can now be used in conjunction with --all or
     --all-subscribed to copy messages from multiple source folders to a single
     destination folder.
+  * More concise log messages to reduce visual clutter in the log.
   * Fixed encoding issues when creating mailboxes and getting mailbox lists.
   * Fixed incorrect case-sensitive treatment of the 'INBOX' folder name.
   * Fixed a bug in which Larch would try to copy flags that weren't supported on

data/README.rdoc

@@ -28,42 +28,45 @@ Latest development version:
 
   larch [config section] [options]
   larch --from <uri> --to <uri> [options]
-
+  
   Server Options:
-         --from, -f <s>:   URI of the source IMAP server.
-  --from-folder, -F <s>:   Source folder to copy from (default: INBOX)
-    --from-pass, -p <s>:   Source server password (default: prompt)
-    --from-user, -u <s>:   Source server username (default: prompt)
-           --to, -t <s>:   URI of the destination IMAP server.
-    --to-folder, -T <s>:   Destination folder to copy to (default: INBOX)
-      --to-pass, -P <s>:   Destination server password (default: prompt)
-      --to-user, -U <s>:   Destination server username (default: prompt)
+           --from, -f <s>:   URI of the source IMAP server
+    --from-folder, -F <s>:   Source folder to copy from (default: INBOX)
+      --from-pass, -p <s>:   Source server password (default: prompt)
+      --from-user, -u <s>:   Source server username (default: prompt)
+             --to, -t <s>:   URI of the destination IMAP server
+      --to-folder, -T <s>:   Destination folder to copy to (default: INBOX)
+        --to-pass, -P <s>:   Destination server password (default: prompt)
+        --to-user, -U <s>:   Destination server username (default: prompt)
 
   Sync Options:
-              --all, -a:   Copy all folders recursively
-   --all-subscribed, -s:   Copy all subscribed folders recursively
-         --exclude <s+>:   List of mailbox names/patterns that shouldn't be
-                           copied
-     --exclude-file <s>:   Filename containing mailbox names/patterns that
-                           shouldn't be copied
+                --all, -a:   Copy all folders recursively
+     --all-subscribed, -s:   Copy all subscribed folders recursively
+           --exclude <s+>:   List of mailbox names/patterns that shouldn't be
+                             copied
+       --exclude-file <s>:   Filename containing mailbox names/patterns that
+                             shouldn't be copied
+         --sync-flags, -S:   Sync message flags from the source to the
+                             destination for messages that already exist at the
+                             destination
 
   General Options:
-       --config, -c <s>:   Specify a non-default config file to use (default:
-                           ~/.larch/config.yaml)
-         --database <s>:   Specify a non-default message database to use
-                           (default: ~/.larch/larch.db)
-          --dry-run, -n:   Don't actually make any changes
-      --max-retries <i>:   Maximum number of times to retry after a recoverable
-                           error (default: 3)
-     --no-create-folder:   Don't create destination folders that don't already
-                           exist
-        --ssl-certs <s>:   Path to a trusted certificate bundle to use to
-                           verify server SSL certificates
-           --ssl-verify:   Verify server SSL certificates
-    --verbosity, -V <s>:   Output verbosity: debug, info, warn, error, or fatal
-                           (default: info)
-          --version, -v:   Print version and exit
-             --help, -h:   Show this message
+         --config, -c <s>:   Specify a non-default config file to use (default:
+                             ~/.larch/config.yaml)
+           --database <s>:   Specify a non-default message database to use
+                             (default: ~/.larch/larch.db)
+            --dry-run, -n:   Don't actually make any changes
+        --max-retries <i>:   Maximum number of times to retry after a
+                             recoverable error (default: 3)
+       --no-create-folder:   Don't create destination folders that don't
+                             already exist
+          --ssl-certs <s>:   Path to a trusted certificate bundle to use to
+                             verify server SSL certificates
+             --ssl-verify:   Verify server SSL certificates
+      --verbosity, -V <s>:   Output verbosity: debug, info, warn, error, or
+                             fatal (default: info)
+            --version, -v:   Print version and exit
+               --help, -h:   Show this message
 
 == Usage Examples
 

data/bin/larch

@@ -20,11 +20,11 @@ Usage:
 
 Server Options:
 EOS
-    opt :from,        "URI of the source IMAP server.", :short => '-f', :type => :string
+    opt :from,        "URI of the source IMAP server", :short => '-f', :type => :string
     opt :from_folder, "Source folder to copy from (default: INBOX)", :short => '-F', :default => Config::DEFAULT['from-folder'], :type => :string
     opt :from_pass,   "Source server password (default: prompt)", :short => '-p', :type => :string
     opt :from_user,   "Source server username (default: prompt)", :short => '-u', :type => :string
-    opt :to,          "URI of the destination IMAP server.", :short => '-t', :type => :string
+    opt :to,          "URI of the destination IMAP server", :short => '-t', :type => :string
     opt :to_folder,   "Destination folder to copy to (default: INBOX)", :short => '-T', :default => Config::DEFAULT['to-folder'], :type => :string
     opt :to_pass,     "Destination server password (default: prompt)", :short => '-P', :type => :string
     opt :to_user,     "Destination server username (default: prompt)", :short => '-U', :type => :string
@@ -34,6 +34,7 @@ EOS
     opt :all_subscribed,   "Copy all subscribed folders recursively", :short => '-s'
     opt :exclude,          "List of mailbox names/patterns that shouldn't be copied", :short => :none, :type => :strings, :multi => true
     opt :exclude_file,     "Filename containing mailbox names/patterns that shouldn't be copied", :short => :none, :type => :string
+    opt :sync_flags,       "Sync message flags from the source to the destination for messages that already exist at the destination", :short => '-S'
 
     text "\nGeneral Options:"
     opt :config,           "Specify a non-default config file to use", :short => '-c', :default => Config::DEFAULT['config']
@@ -87,6 +88,7 @@ EOS
 
   imap_from = Larch::IMAP.new(uri_from,
       :dry_run     => config[:dry_run],
+      :log_label   => '[<]',
       :max_retries => config[:max_retries],
       :ssl_certs   => config[:ssl_certs] || nil,
       :ssl_verify  => config[:ssl_verify]
@@ -95,6 +97,7 @@ EOS
   imap_to = Larch::IMAP.new(uri_to,
       :create_mailbox => !config[:no_create_folder] && !config[:dry_run],
       :dry_run        => config[:dry_run],
+      :log_label      => '[>]',
       :max_retries    => config[:max_retries],
       :ssl_certs      => config[:ssl_certs] || nil,
       :ssl_verify     => config[:ssl_verify]

data/lib/larch/config.rb

@@ -19,6 +19,7 @@ class Config
     'no-create-folder' => false,
     'ssl-certs'        => nil,
     'ssl-verify'       => false,
+    'sync-flags'       => false,
     'to'               => nil,
     'to-folder'        => nil, # actually INBOX; see validate()
     'to-pass'          => nil,

data/lib/larch/db/account.rb

@@ -2,11 +2,30 @@ module Larch; module Database
 
 class Account < Sequel::Model(:accounts)
   plugin :hook_class_methods
+
   one_to_many :mailboxes, :class => Larch::Database::Mailbox
 
+  before_create do
+    now = Time.now.to_i
+
+    self.created_at = now
+    self.updated_at = now
+  end
+
   before_destroy do
     Mailbox.filter(:account_id => id).destroy
   end
+
+  before_save do
+    now = Time.now.to_i
+
+    self.created_at = now if self.created_at.nil?
+    self.updated_at = now
+  end
+
+  def touch
+    update(:updated_at => Time.now.to_i)
+  end
 end
 
 end; end

data/lib/larch/db/message.rb

@@ -1,6 +1,20 @@
 module Larch; module Database
 
 class Message < Sequel::Model(:messages)
+  def flags
+    self[:flags].split(',').sort.map do |f|
+      # Flags beginning with $ should be strings; all others should be symbols.
+      f[0,1] == '$' ? f : f.to_sym
+    end
+  end
+
+  def flags_str
+    self[:flags]
+  end
+
+  def flags=(flags)
+    self[:flags] = flags.map{|f| f.to_s }.join(',')
+  end
 end
 
 end; end

data/lib/larch/db/migrate/002_add_timestamps.rb

@@ -0,0 +1,15 @@
+class AddTimestamps < Sequel::Migration
+  def down
+    alter_table :accounts do
+      drop_column :created_at
+      drop_column :updated_at
+    end
+  end
+
+  def up
+    alter_table :accounts do
+      add_column :created_at, :integer
+      add_column :updated_at, :integer
+    end
+  end
+end

data/lib/larch/imap/mailbox.rb

@@ -54,7 +54,7 @@ class Mailbox
 
       Mailbox.class_eval do
         define_method(level) do |msg|
-          Larch.log.log(level, "#{@imap.username}@#{@imap.host}: #{@name}: #{msg}")
+          Larch.log.log(level, "#{@imap.options[:log_label]} #{@name}: #{msg}")
         end
 
         private level
@@ -95,11 +95,17 @@ class Mailbox
   end
   alias << append
 
+  # Iterates through messages in this mailbox, yielding a
+  # Larch::Database::Message object for each to the provided block.
+  def each_db_message # :yields: db_message
+    scan
+    @db_mailbox.messages_dataset.all {|db_message| yield db_message }
+  end
+
   # Iterates through messages in this mailbox, yielding the Larch message guid
   # of each to the provided block.
   def each_guid # :yields: guid
-    scan
-    @db_mailbox.messages_dataset.each {|db_message| yield db_message.guid }
+    each_db_message {|db_message| yield db_message.guid }
   end
 
   # Iterates through mailboxes that are first-level children of this mailbox,
@@ -114,7 +120,7 @@ class Mailbox
   def fetch(guid, peek = false)
     scan
 
-    unless db_message = @db_mailbox.messages_dataset.filter(:guid => guid).first
+    unless db_message = fetch_db_message(guid)
       warn "message not found in local db: #{guid}"
       return nil
     end
@@ -134,6 +140,14 @@ class Mailbox
   end
   alias [] fetch
 
+  # Returns a Larch::Database::Message object representing the message with the
+  # specified Larch _guid_, or +nil+ if the specified guide was not found in
+  # this mailbox. 
+  def fetch_db_message(guid)
+    scan
+    @db_mailbox.messages_dataset.filter(:guid => guid).first
+  end
+
   # Returns +true+ if a message with the specified Larch guid exists in this
   # mailbox, +false+ otherwise.
   def has_guid?(guid)
@@ -174,6 +188,7 @@ class Mailbox
   def scan
     now = Time.now.to_i
     return if @last_scan && (now - @last_scan) < SCAN_INTERVAL
+
     first_scan = @last_scan.nil?
     @last_scan = now
 
@@ -212,118 +227,33 @@ class Mailbox
     end
 
     @db_mailbox.update(:uidvalidity => status['UIDVALIDITY'])
-
     return unless flag_range || full_range.last - full_range.first > 0
 
-    # Open the mailbox for read-only access.
-    return unless imap_examine
-
-    if flag_range && flag_range.last - flag_range.first > 0
-      info "fetching latest message flags..."
-
-      # Load the expected UIDs and their flags into a Hash for quicker lookups.
-      expected_uids = {}
-      @db_mailbox.messages_dataset.each do |db_message|
-        expected_uids[db_message.uid] = db_message.flags.split(',').map{|f| f.to_sym }
-      end
-
-      imap_uid_fetch(flag_range, "(UID FLAGS)", 16384) do |fetch_data|
-        # Check the fields in the first response to ensure that everything we
-        # asked for is there.
-        check_response_fields(fetch_data.first, 'UID', 'FLAGS') unless fetch_data.empty?
-
-        Larch.db.transaction do
-          fetch_data.each do |data|
-            uid         = data.attr['UID']
-            flags       = data.attr['FLAGS']
-            local_flags = expected_uids[uid]
-
-            # If we haven't seen this message before, or if its flags have
-            # changed, update the database.
-            unless local_flags && local_flags == flags
-              @db_mailbox.messages_dataset.filter(:uid => uid).update(
-                  :flags => flags.map{|f| f.to_s }.join(','))
-            end
-
-            expected_uids.delete(uid)
-          end
-        end
-      end
-
-      # Any UIDs that are in the database but weren't in the response have been
-      # deleted from the server, so we need to delete them from the database as
-      # well.
-      unless expected_uids.empty?
-        debug "removing #{expected_uids.length} deleted messages from the database..."
-
-        Larch.db.transaction do
-          expected_uids.each_key do |uid|
-            @db_mailbox.messages_dataset.filter(:uid => uid).destroy
-          end
-        end
-      end
-
-      expected_uids = nil
-      fetch_data    = nil
-    end
+    fetch_flags(flag_range) if flag_range && flag_range.last - flag_range.first > 0
 
     if full_range && full_range.last - full_range.first > 0
-      start    = @db_mailbox.messages_dataset.count + 1
-      total    = status['MESSAGES']
-      fetched  = 0
-      progress = 0
-
-      show_progress = total - start > FETCH_BLOCK_SIZE * 4
-
-      info "fetching message headers #{start} through #{total}..."
-
-      begin
-        last_good_uid = nil
-
-        imap_uid_fetch(full_range, "(UID BODY.PEEK[HEADER.FIELDS (MESSAGE-ID)] RFC822.SIZE INTERNALDATE FLAGS)") do |fetch_data|
-          check_response_fields(fetch_data, 'UID', 'RFC822.SIZE', 'INTERNALDATE', 'FLAGS')
-
-          Larch.db.transaction do
-            fetch_data.each do |data|
-              uid = data.attr['UID']
-
-              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(',')
-              )
-
-              last_good_uid = uid
-            end
+      fetch_headers(full_range, {
+        :progress_start => @db_mailbox.messages_dataset.count + 1,
+        :progress_total => status['MESSAGES']
+      })
+    end
 
-            @db_mailbox.update(:uidnext => last_good_uid + 1)
-          end
+    @db_mailbox.update(:uidnext => status['UIDNEXT'])
+    return
+  end
 
-          if show_progress
-            fetched       += fetch_data.length
-            last_progress  = progress
-            progress       = ((100 / (total - start).to_f) * fetched).round
+  # Sets the IMAP flags for the message specified by _guid_, replacing any
+  # existing flags (except <code>:Recent</code>). _flags_ should be an array of
+  # symbols. Returns +true+ on success, +false+ on failure.
+  def set_flags(guid, flags)
+    raise ArgumentError, "flags must be an Array" unless flags.is_a?(Array)
 
-            info "#{progress}% complete" if progress > last_progress
-          end
-        end
+    db_message = fetch_db_message(guid)
+    return false if db_message.nil? || !imap_select
 
-      rescue => e
-        # Set this mailbox's uidnext value to the last known good UID that was
-        # stored in the database, plus 1. This will allow Larch to resume where
-        # the error occurred on the next attempt rather than having to start
-        # over.
-        @db_mailbox.update(:uidnext => last_good_uid + 1) if last_good_uid
-        raise
-      end
-    end
+    @imap.safely { @imap.conn.uid_store(db_message.uid, 'FLAGS.SILENT', flags) } unless @imap.options[:dry_run]
 
-    @db_mailbox.update(:uidnext => status['UIDNEXT'])
-    return
+    true
   end
 
   # Subscribes to this mailbox.
@@ -387,6 +317,115 @@ class Mailbox
     end
   end
 
+  # Fetches the latest flags from the server for the specified range of message
+  # UIDs.
+  def fetch_flags(flag_range)
+    return unless imap_examine
+
+    info "fetching latest message flags..."
+
+    # Load the expected UIDs and their flags into a Hash for quicker lookups.
+    expected_uids = {}
+    @db_mailbox.messages_dataset.all do |db_message|
+      expected_uids[db_message.uid] = db_message.flags
+    end
+
+    imap_uid_fetch(flag_range, "(UID FLAGS)", 16384) do |fetch_data|
+      # Check the fields in the first response to ensure that everything we
+      # asked for is there.
+      check_response_fields(fetch_data.first, 'UID', 'FLAGS') unless fetch_data.empty?
+
+      Larch.db.transaction do
+        fetch_data.each do |data|
+          uid         = data.attr['UID']
+          flags       = data.attr['FLAGS']
+          local_flags = expected_uids[uid]
+
+          # If we haven't seen this message before, or if its flags have
+          # changed, update the database.
+          unless local_flags && local_flags == flags
+            @db_mailbox.messages_dataset.filter(:uid => uid).update(:flags => flags.map{|f| f.to_s }.join(','))
+          end
+
+          expected_uids.delete(uid)
+        end
+      end
+    end
+
+    # Any UIDs that are in the database but weren't in the response have been
+    # deleted from the server, so we need to delete them from the database as
+    # well.
+    unless expected_uids.empty?
+      debug "removing #{expected_uids.length} deleted messages from the database..."
+
+      Larch.db.transaction do
+        expected_uids.each_key do |uid|
+          @db_mailbox.messages_dataset.filter(:uid => uid).destroy
+        end
+      end
+    end
+
+    expected_uids = nil
+    fetch_data    = nil
+  end
+
+  # Fetches the latest headers from the server for the specified range of
+  # message UIDs.
+  def fetch_headers(header_range, options = {})
+    return unless imap_examine
+
+    options = {
+      :progress_start => 0,
+      :progress_total => 0
+    }.merge(options)
+
+    fetched       = 0
+    progress      = 0
+    show_progress = options[:progress_total] - options[:progress_start] > FETCH_BLOCK_SIZE * 4
+
+    info "fetching message headers #{options[:progress_start]} through #{options[:progress_total]}..."
+
+    last_good_uid = nil
+
+    imap_uid_fetch(header_range, "(UID BODY.PEEK[HEADER.FIELDS (MESSAGE-ID)] RFC822.SIZE INTERNALDATE FLAGS)") do |fetch_data|
+      # Check the fields in the first response to ensure that everything we
+      # asked for is there.
+      check_response_fields(fetch_data, 'UID', 'RFC822.SIZE', 'INTERNALDATE', 'FLAGS')
+
+      Larch.db.transaction do
+        fetch_data.each do |data|
+          uid = data.attr['UID']
+
+          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']
+          )
+
+          last_good_uid = uid
+        end
+
+        # Set this mailbox's uidnext value to the last known good UID that
+        # was stored in the database, plus 1. This will allow Larch to
+        # resume where the error occurred on the next attempt rather than
+        # having to start over.
+        @db_mailbox.update(:uidnext => last_good_uid + 1)
+      end
+
+      if show_progress
+        fetched       += fetch_data.length
+        last_progress  = progress
+        progress       = ((100 / (options[:progress_total] - options[:progress_start]).to_f) * fetched).round
+
+        info "#{progress}% complete" if progress > last_progress
+      end
+    end
+  end
+
   # Examines this mailbox. If _force_ is true, the mailbox will be examined even
   # if it is already selected (which isn't necessary unless you want to ensure
   # that it's in a read-only state).

data/lib/larch/imap.rb

@@ -30,6 +30,10 @@ class IMAP
   #   that it's not actually possible to simulate mailbox creation, so
   #   +:dry_run+ mode always behaves as if +:create_mailbox+ is +false+.
   #
+  # [:log_label]
+  #   Label to use for this connection in log output. If not specified, the
+  #   default label is "[username@host]".
+  #
   # [:max_retries]
   #   After a recoverable error occurs, retry the operation up to this many
   #   times. Default is 3.
@@ -49,8 +53,12 @@ class IMAP
     raise ArgumentError, "not an IMAP URI: #{uri}" unless uri.is_a?(URI) || uri =~ REGEX_URI
     raise ArgumentError, "options must be a Hash" unless options.is_a?(Hash)
 
-    @options = {:max_retries => 3, :ssl_verify => false}.merge(options)
     @uri     = uri.is_a?(URI) ? uri : URI(uri)
+    @options = {
+      :log_label   => "[#{username}@#{host}]",
+      :max_retries => 3,
+      :ssl_verify  => false
+    }.merge(options)
 
     raise ArgumentError, "must provide a username and password" unless @uri.user && @uri.password
 
@@ -65,6 +73,8 @@ class IMAP
       :username => username
     )
 
+    @db_account.touch
+
     # Create private convenience methods (debug, info, warn, etc.) to make
     # logging easier.
     Logger::LEVELS.each_key do |level|
@@ -72,7 +82,7 @@ class IMAP
 
       IMAP.class_eval do
         define_method(level) do |msg|
-          Larch.log.log(level, "#{username}@#{host}: #{msg}")
+          Larch.log.log(level, "#{@options[:log_label]} #{msg}")
         end
 
         private level
@@ -126,8 +136,8 @@ class IMAP
   def mailbox(name, delim = '/')
     retries = 0
 
-    name = name.gsub(delim, self.delim)
-    name = 'INBOX' if name.downcase == 'inbox'
+    name.gsub!(/^(inbox\/?)/i){ $1.upcase }
+    name.gsub!(delim, self.delim)
 
     # Gmail doesn't allow folders with leading or trailing whitespace.
     name.strip! if @quirks[:gmail]
@@ -298,7 +308,7 @@ class IMAP
             ssl? && @options[:ssl_verify] ? @options[:ssl_certs] : nil,
             @options[:ssl_verify])
 
-        info "connected on port #{port}" << (ssl? ? ' using SSL' : '')
+        info "connected to #{host} on port #{port}" << (ssl? ? ' using SSL' : '')
 
         check_quirks
 
@@ -339,6 +349,8 @@ class IMAP
   end
 
   def update_mailboxes
+    debug "updating mailboxes"
+
     all        = safely { @conn.list('', '*') } || []
     subscribed = safely { @conn.lsub('', '*') } || []
 
@@ -355,7 +367,7 @@ class IMAP
     end
 
     # Remove mailboxes that no longer exist from the database.
-    @db_account.mailboxes.each do |db_mailbox|
+    @db_account.mailboxes_dataset.all do |db_mailbox|
       db_mailbox.destroy unless @mailboxes.has_key?(db_mailbox.name)
     end
   end

data/lib/larch/logger.rb

@@ -34,7 +34,7 @@ class Logger
 
   def log(level, msg)
     return true if LEVELS[level] > LEVELS[@level] || msg.nil? || msg.empty?
-    @output.puts "[#{Time.new.strftime('%b %d %H:%M:%S')}] [#{level}] #{msg}"
+    @output.puts "[#{Time.new.strftime('%H:%M:%S')}] [#{level}] #{msg}"
     true
 
   rescue => e

data/lib/larch/version.rb

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

data/lib/larch.rb

@@ -73,6 +73,7 @@ module Larch
 
     ensure
       summary
+      db_maintenance
     end
 
     # Copies the messages in a single IMAP folder and all its subfolders
@@ -98,6 +99,7 @@ module Larch
 
     ensure
       summary
+      db_maintenance
     end
 
     # Opens a connection to the Larch message database, creating it if
@@ -145,8 +147,10 @@ module Larch
       @log.info "#{@copied} message(s) copied, #{@failed} failed, #{@total - @copied - @failed} untouched out of #{@total} total"
     end
 
+
     private
 
+
     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)
@@ -172,12 +176,32 @@ module Larch
       imap_from = mailbox_from.imap
       imap_to   = mailbox_to.imap
 
-      @log.info "copying messages from #{imap_from.host}/#{mailbox_from.name} to #{imap_to.host}/#{mailbox_to.name}"
+      @log.info "#{imap_from.host}/#{mailbox_from.name} -> #{imap_to.host}/#{mailbox_to.name}"
 
       @total += mailbox_from.length
 
-      mailbox_from.each_guid do |guid|
-        next if mailbox_to.has_guid?(guid)
+      mailbox_from.each_db_message do |from_db_message|
+        guid = from_db_message.guid
+
+        if mailbox_to.has_guid?(guid)
+          next unless @config['sync_flags']
+
+          begin
+            to_db_message = mailbox_to.fetch_db_message(guid)
+
+            if to_db_message.flags != from_db_message.flags
+              new_flags = from_db_message.flags_str
+              new_flags = '(none)' if new_flags.empty?
+
+              @log.info "syncing flags: UID #{to_db_message.uid}: #{new_flags}"
+              mailbox_to.set_flags(guid, from_db_message.flags)
+            end
+          rescue Larch::IMAP::Error => e
+            @log.error e.message
+          end
+
+          next
+        end
 
         begin
           next unless msg = mailbox_from.peek(guid)
@@ -189,7 +213,7 @@ module Larch
             from = '?'
           end
 
-          @log.info "copying message: #{from} - #{msg.envelope.subject}"
+          @log.info "copying: #{from} - #{msg.envelope.subject}"
 
           mailbox_to << msg
           @copied += 1
@@ -202,6 +226,17 @@ module Larch
       end
     end
 
+    def db_maintenance
+      @log.debug 'performing database maintenance'
+
+      # Remove accounts that haven't been used in over 30 days.
+      Database::Account.filter(:updated_at => nil).destroy
+      Database::Account.filter('? - updated_at >= 2592000', Time.now.to_i).destroy
+
+      # Release unused disk space and defragment the database.
+      @db.run('VACUUM')
+    end
+
     def excluded?(name)
       name = name.downcase
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: larch
 version: !ruby/object:Gem::Version 
-  version: 1.1.0.dev.20091203
+  version: 1.1.0.dev.20091206
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -08:00
+date: 2009-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - lib/larch/db/mailbox.rb
 - lib/larch/db/message.rb
 - lib/larch/db/migrate/001_create_schema.rb
+- lib/larch/db/migrate/002_add_timestamps.rb
 - lib/larch/errors.rb
 - lib/larch/imap/mailbox.rb
 - lib/larch/imap.rb