commit 67214e30d648ac9351b9898f8e1587d065264787
parent b505bce62b4a3fe21c0532a9299b81e403b326dd
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 24 Aug 2009 18:44:13 -0400
Merge branch 'after-add-message-hook' into next
Conflicts:
lib/sup/poll.rb
Diffstat:
1 file changed, 10 insertions(+), 0 deletions(-)
diff --git a/lib/sup/poll.rb b/lib/sup/poll.rb
@@ -11,6 +11,12 @@ Variables:
message: the new message
EOS
+ HookManager.register "after-add-message", <<EOS
+Executes after all messages are added to the index.
+Variables:
+ messages: an array of the new messages added
+EOS
+
HookManager.register "before-poll", <<EOS
Executes immediately before a poll for new messages commences.
No variables.
@@ -137,6 +143,7 @@ EOS
begin
return if source.done? || source.has_errors?
+ messages = []
source.each do |offset, source_labels|
if source.has_errors?
warn "error loading messages from #{source}: #{source.error.message}"
@@ -147,10 +154,13 @@ EOS
m.labels += source_labels + (source.archived? ? [] : [:inbox])
m.labels.delete :unread if m.source_marked_read? # preserve read status if possible
m.labels.each { |l| LabelManager << l }
+ messages.push m
HookManager.run "before-add-message", :message => m
yield m
end
+ HookManager.run "after-add-message", :messages => messages
+
rescue SourceError => e
warn "problem getting messages from #{source}: #{e.message}"
Redwood::report_broken_sources :force_to_top => true