[sup-devel] [PATCH] Implement moving message between Maildir sources based on label.

["Edward Z. Yang" <ezyang@MIT.EDU>]

From: "Edward Z. Yang" <ezyang@mit.edu>

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
---
 lib/sup/maildir.rb | 28 ++++++++++++++++++++++------
 lib/sup/message.rb |  9 +++++++--
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/lib/sup/maildir.rb b/lib/sup/maildir.rb
index 95305c2..ff8da23 100644
--- a/lib/sup/maildir.rb
+++ b/lib/sup/maildir.rb
@@ -77,8 +77,17 @@ class Maildir < Source
   end
 
   def sync_back id, labels
+    new_source = @id
+    $config[:maildir_labels].each do |k,v|
+      v.each do |lbl,i|
+        if lbl.nil? or labels.member? lbl
+          new_source = i
+          break
+        end
+      end if v.any? { |lbl,i| i == @id }
+    end if $config[:maildir_labels]
     flags = maildir_reconcile_flags id, labels
-    maildir_mark_file id, flags
+    maildir_move_file id, new_source, flags
   end
 
   def raw_header id
@@ -221,24 +230,31 @@ private
       new_flags.to_a.sort.join
   end
 
-  def maildir_mark_file orig_path, flags
+  def maildir_move_file orig_path, new_source_id, flags
     @mutex.synchronize do
       new_base = (flags.include?("S")) ? "cur" : "new"
       md_base, md_ver, md_flags = maildir_data orig_path
 
-      return if md_flags == flags
+      return if md_flags == flags and new_source_id == @id
+
+      new_source = SourceManager[new_source_id]
 
       new_loc = File.join new_base, "#{md_base}:#{md_ver},#{flags}"
       orig_path = File.join @dir, orig_path
-      new_path  = File.join @dir, new_loc
+      new_path  = File.join new_source.file_path, new_loc
       tmp_path  = File.join @dir, "tmp", "#{md_base}:#{md_ver},#{flags}"
 
       File.link orig_path, tmp_path
       File.unlink orig_path
-      File.link tmp_path, new_path
+      begin
+        File.link tmp_path, new_path
+      rescue SystemCallError
+        File.unlink new_path # XXX kinda unsafe eh
+        File.link tmp_path, new_path
+      end
       File.unlink tmp_path
 
-      new_loc
+      [new_source, new_loc]
     end
   end
 end
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 3eeea66..d6016df 100644
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -726,8 +726,13 @@ class Location
   end
 
   def sync_back labels
-    new_info = source.sync_back(@info, labels) if source.respond_to? :sync_back
-    @info = new_info if new_info
+    pair = source.sync_back(@info, labels) if source.respond_to? :sync_back
+    if pair
+      new_source, new_info = pair
+      @source = new_source if new_source
+      @info = new_info if new_info
+    end
+    pair
   end
 
   ## much faster than raw_message
-- 
1.7.11.3

_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel