lib/sup/poll.rb in sup-0.7 vs lib/sup/poll.rb in sup-0.8

- old
+ new

@@ -38,11 +38,11 @@ self.class.i_am_the_instance self end def buffer - b, new = BufferManager.spawn_unless_exists("<poll for new messages>", :hidden => true) { PollMode.new } + b, new = BufferManager.spawn_unless_exists("poll for new messages", :hidden => true, :system => true) { PollMode.new } b end def poll return if @polling @@ -84,28 +84,28 @@ @mutex.synchronize do Index.usual_sources.each do |source| # yield "source #{source} is done? #{source.done?} (cur_offset #{source.cur_offset} >= #{source.end_offset})" begin - yield "Loading from #{source}... " unless source.done? || source.has_errors? + yield "Loading from #{source}... " unless source.done? || (source.respond_to?(:has_errors?) && source.has_errors?) rescue SourceError => e Redwood::log "problem getting messages from #{source}: #{e.message}" Redwood::report_broken_sources :force_to_top => true next end num = 0 numi = 0 add_messages_from source do |m, offset, entry| ## always preserve the labels on disk. - m.labels = entry[:label].split(/\s+/).map { |x| x.intern } if entry + m.labels = ((m.labels - [:unread, :inbox]) + entry[:label].symbolistize).uniq if entry yield "Found message at #{offset} with labels {#{m.labels * ', '}}" unless entry num += 1 - from_and_subj << [m.from.longname, m.subj] + from_and_subj << [m.from && m.from.longname, m.subj] if m.has_label?(:inbox) && ([:spam, :deleted, :killed] & m.labels).empty? - from_and_subj_inbox << [m.from.longname, m.subj] + from_and_subj_inbox << [m.from && m.from.longname, m.subj] numi += 1 end end m end @@ -135,34 +135,32 @@ ## the index labels, if they exist, so that state is not lost when ## e.g. a new version of a message from a mailing list comes in. def add_messages_from source, opts={} begin return if source.done? || source.has_errors? - + source.each do |offset, labels| if source.has_errors? Redwood::log "error loading messages from #{source}: #{source.error.message}" return end - + labels.each { |l| LabelManager << l } labels = labels + (source.archived? ? [] : [:inbox]) - begin - m = Message.new :source => source, :source_info => offset, :labels => labels - if m.source_marked_read? - m.remove_label :unread - labels.delete :unread - end + m = Message.new :source => source, :source_info => offset, :labels => labels + m.load_from_source! - docid, entry = Index.load_entry_for_id m.id - HookManager.run "before-add-message", :message => m - m = yield(m, offset, entry) or next if block_given? - Index.sync_message m, docid, entry, opts - UpdateManager.relay self, :added, m unless entry - rescue MessageFormatError => e - Redwood::log "ignoring erroneous message at #{source}##{offset}: #{e.message}" + if m.source_marked_read? + m.remove_label :unread + labels.delete :unread end + + docid, entry = Index.load_entry_for_id m.id + HookManager.run "before-add-message", :message => m + m = yield(m, offset, entry) or next if block_given? + times = Index.sync_message m, false, docid, entry, opts + UpdateManager.relay self, :added, m unless entry end rescue SourceError => e Redwood::log "problem getting messages from #{source}: #{e.message}" Redwood::report_broken_sources :force_to_top => true end