larch 1.1.0.dev.20100208 → 1.1.0.dev.20100209

data/lib/larch/imap/mailbox.rb

@@ -82,6 +82,21 @@ class Mailbox
   end
   alias << append
 
+  # Deletes the message in this mailbox with the specified guid. Returns +true+
+  # on success, +false+ on failure.
+  def delete_message(guid)
+    if @imap.quirks[:gmail]
+      return false unless db_message = fetch_db_message(guid)
+
+      debug "moving message to Gmail trash: #{guid}"
+
+      @imap.safely { @imap.conn.uid_copy(db_message.uid, '[Gmail]/Trash') } &&
+          set_flags(guid, [:Deleted], true)
+    else
+      set_flags(guid, [:Deleted], true)
+    end
+  end
+
   # 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
@@ -142,7 +157,7 @@ class Mailbox
 
   # 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. 
+  # this mailbox.
   def fetch_db_message(guid)
     scan
     @db_mailbox.messages_dataset.filter(:guid => guid).first
@@ -227,11 +242,13 @@ class Mailbox
     end
 
     @db_mailbox.update(:uidvalidity => status['UIDVALIDITY'])
-    return unless flag_range || full_range.last - full_range.first > 0
 
-    fetch_flags(flag_range) if flag_range && flag_range.last - flag_range.first > 0
+    need_flag_scan = flag_range && flag_range.max && flag_range.min && flag_range.max - flag_range.min > 0
+    need_full_scan = full_range && full_range.max && full_range.min && full_range.max - full_range.min > 0
+
+    fetch_flags(flag_range) if need_flag_scan
 
-    if full_range && full_range.last - full_range.first > 0
+    if need_full_scan
       fetch_headers(full_range, {
         :progress_start => @db_mailbox.messages_dataset.count + 1,
         :progress_total => status['MESSAGES']

data/lib/larch/version.rb

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

data/lib/larch.rb

@@ -205,9 +205,9 @@ module Larch
 
             if @config['delete'] && !from_db_message.flags.include?(:Deleted)
               @log.info "[<] deleting uid #{uid} (already exists at destination)"
-              mailbox_from.set_flags(guid, [:Deleted], true)
-              @deleted += 1
+              @deleted += 1 if mailbox_from.delete_message(guid)
             end
+
           rescue Larch::IMAP::Error => e
             @log.error e.message
           end
@@ -232,8 +232,7 @@ module Larch
 
           if @config['delete']
             @log.info "[<] deleting uid #{uid}"
-            mailbox_from.set_flags(guid, [:Deleted], true)
-            @deleted += 1
+            @deleted += 1 if mailbox_from.delete_message(guid)
           end
 
         rescue Larch::IMAP::Error => e
@@ -251,6 +250,10 @@ module Larch
           @log.error e.message
         end
       end
+
+    rescue Larch::IMAP::Error => e
+      @log.error e.message
+
     end
 
     def db_maintenance

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: larch
 version: !ruby/object:Gem::Version 
-  version: 1.1.0.dev.20100208
+  version: 1.1.0.dev.20100209
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -08:00
+date: 2010-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency