It looks like the current patchset will *destroy* all labels you have
on messages, so be careful! (This was masked for me since most of my
labels are from before-add-message.rb, and that hook gets reapplied)
Edward
Excerpts from Edward Z. Yang's message of Wed Aug 22 16:09:40 -0400 2012:
> Here is an improved version that handles the thread/message distinction
> better; previously, if you archived something, it's possible only some of
> the messages got moved if you hadn't run sup-sync-back-maildir.
>
> commit a25c345c15c8859a041cc9dc13090d7b8feb3d58
> Author: Edward Z. Yang <ezy...@mit.edu>
> Date: Tue Aug 21 23:40:03 2012 -0400
>
> Implement moving message between Maildir sources based on label.
>
> Signed-off-by: Edward Z. Yang <ezy...@mit.edu>
>
> diff --git a/lib/sup/maildir.rb b/lib/sup/maildir.rb
> index 95305c2..a7bf567 100644
> --- a/lib/sup/maildir.rb
> +++ b/lib/sup/maildir.rb
> @@ -76,9 +76,23 @@ class Maildir < Source
> with_file_for(id) { |f| RMail::Parser.read f }
> end
>
> + def wrong_source? labels
> + new_source = nil
> + $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]
> + new_source
> + end
> +
> def sync_back id, labels
> + new_source = wrong_source? labels || @id
> 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 +235,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..4139f3e 100644
> --- a/lib/sup/message.rb
> +++ b/lib/sup/message.rb
> @@ -285,6 +285,10 @@ EOS
> location.each_raw_message_line &b
> end
>
> + def wrong_source?
> + $config[:sync_back_to_maildir] and @locations.any? { |l| l.valid? and
> l.source.is_a? Maildir and l.wrong_source? @labels}
> + end
> +
> def sync_back
> if @locations.map { |l|
> l.sync_back @labels if l.valid? and $config[:sync_back_to_maildir] and
> l.source.is_a? Maildir
> @@ -726,8 +730,17 @@ 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
> +
> + def wrong_source? labels
> + source.wrong_source? labels if source.respond_to? :wrong_source
> end
>
> ## much faster than raw_message
> diff --git a/lib/sup/thread.rb b/lib/sup/thread.rb
> index b08bae2..c1e4b40 100644
> --- a/lib/sup/thread.rb
> +++ b/lib/sup/thread.rb
> @@ -113,7 +113,7 @@ class Thread
>
> def set_labels l; each { |m, *o| m && m.labels = l }; end
> def has_label? t; any? { |m, *o| m && m.has_label?(t) }; end
> - def each_dirty_message; each { |m, *o| m && m.dirty? && yield(m) }; end
> + def each_dirty_message; each { |m, *o| m && (m.dirty? || m.wrong_source?)
> && yield(m) }; end
>
> def direct_participants
> map { |m, *o| [m.from] + m.to if m }.flatten.compact.uniq
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
