finally do imap flags the right way, and clean up mbox and imap source flag duplicati...

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@593 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb
index 42937bd6e04e06b9abd75fd134313c61f6a3b53c..6f4b7c01ceaec8199ce4a6963863a2ecf39afae2 100644 (file)
--- a/lib/sup/imap.rb
+++ b/lib/sup/imap.rb
@@ -62,10 +62,10 @@ class IMAP < Source
     @username = username
     @password = password
     @imap = nil
-    @imap_ids = {}
+    @imap_state = {}
     @ids = []
     @last_scan = nil
-    @labels = (labels || []).freeze
+    @labels = ((labels || []) - LabelManager::RESERVED_LABELS).uniq.freeze
     @say_id = nil
     @mutex = Mutex.new
   end
@@ -111,9 +111,7 @@ class IMAP < Source
 
   def raw_header id
     unsynchronized_scan_mailbox
-    header, flags = get_imap_fields id, 'RFC822.HEADER', 'FLAGS'
-    ## very bad. this is very very bad. very bad bad bad.
-    header = header + "Status: RO\n" if flags.include? :Seen # fake an mbox-style read header # TODO: improve source-marked-as-read reporting system
+    header, flags = get_imap_fields id, 'RFC822.HEADER'
     header.gsub(/\r\n/, "\n")
   end
   synchronized :raw_header
@@ -142,10 +140,10 @@ class IMAP < Source
 
     range = (@ids.length + 1) .. last_id
     Redwood::log "fetching IMAP headers #{range}"
-    fetch(range, ['RFC822.SIZE', 'INTERNALDATE']).each do |v|
+    fetch(range, ['RFC822.SIZE', 'INTERNALDATE', 'FLAGS']).each do |v|
       id = make_id v
       @ids << id
-      @imap_ids[id] = v.seqno
+      @imap_state[id] = { :id => v.seqno, :flags => v.attr["FLAGS"] }
     end
   end
   synchronized :scan_mailbox
@@ -161,10 +159,18 @@ class IMAP < Source
 
     start = ids.index(cur_offset || start_offset) or raise OutOfSyncSourceError, "Unknown message id #{cur_offset || start_offset}."
 
-    start.upto(ids.length - 1) do |i|         
+    start.upto(ids.length - 1) do |i|
       id = ids[i]
-      self.cur_offset = id
-      yield id, @labels
+      state = @mutex.synchronize { @imap_state[id] } or next
+      self.cur_offset = id 
+      labels = { :Seen => :unread, 
+                 :Flagged => :starred,
+                 :Deleted => :deleted
+               }.inject(@labels) do |cur, (imap, sup)|
+        cur + (state[:flags].include?(imap) ? [sup] : [])
+      end
+
+      yield id, labels
     end
   end
 
@@ -263,7 +269,7 @@ private
   end
 
   def get_imap_fields id, *fields
-    imap_id = @imap_ids[id] or raise OutOfSyncSourceError, "Unknown message id #{id}"
+    imap_id = @imap_state[id][:id] or raise OutOfSyncSourceError, "Unknown message id #{id}"
 
     retried = false
     result = fetch(imap_id, (fields + ['RFC822.SIZE', 'INTERNALDATE']).uniq).first

diff --git a/lib/sup/mbox/loader.rb b/lib/sup/mbox/loader.rb
index db6b16492aa761c6f61018ff7653d99bdc36f12b..c1392654e17aa7e00fe471efa2c978e41458d46b 100644 (file)
--- a/lib/sup/mbox/loader.rb
+++ b/lib/sup/mbox/loader.rb
@@ -10,7 +10,7 @@ class Loader < Source
   ## uri_or_fp is horrific. need to refactor.
   def initialize uri_or_fp, start_offset=nil, usual=true, archived=false, id=nil, labels=[]
     @mutex = Mutex.new
-    @labels = ((labels || []) + [:unread]).freeze
+    @labels = ((labels || []) - LabelManager::RESERVED_LABELS).uniq.freeze
 
     case uri_or_fp
     when String
@@ -142,7 +142,7 @@ class Loader < Source
     end
 
     self.cur_offset = next_offset
-    [returned_offset, @labels]
+    [returned_offset, (@labels + [:unread]).uniq]
   end
 end