end
def save
+ Redwood::log "saving index and sources..."
FileUtils.mkdir_p @dir unless File.exists? @dir
save_sources
save_index
end
end
- ## Update the message state on disk, by deleting and re-adding it.
- ## The message must exist in the index. docid and entry are found
- ## unless given.
- def update_message m, docid=nil, entry=nil
- unless docid && entry
- docid, entry = load_entry_for_id m.id
- raise ArgumentError, "cannot find #{m.id} in the index" unless entry
- end
-
- raise "no entry and no source info for message #{m.id}" unless m.source && m.source_info
-
- raise "deleting non-corresponding entry #{docid}" unless @index[docid][:message_id] == m.id
-
- @index.delete docid
- add_message m
- docid, entry = load_entry_for_id m.id
- end
+ ## Syncs the message to the index: deleting if it's already there,
+ ## and adding either way. Index state will be determined by m.labels.
+ ##
+ ## docid and entry can be specified if they're already known.
+ def sync_message m, docid=nil, entry=nil
+ docid, entry = load_entry_for_id m.id unless docid && entry
- ## for each new message form the source, yields a bunch of stuff,
- ## gets the message back from the block, and adds it or updates it.
- def add_new_messages_from source
- found = {}
- return if source.done? || source.broken?
+ raise "no source info for message #{m.id}" unless m.source && m.source_info
+ raise "trying deleting non-corresponding entry #{docid}" if docid && @index[docid][:message_id] != m.id
- source.each do |offset, labels|
- if source.broken?
- Redwood::log "error loading messages from #{source}: #{source.broken_msg}"
- return
+ source_id =
+ if m.source.is_a? Integer
+ raise "Debugging: integer source set"
+ m.source
+ else
+ m.source.id or raise "unregistered source #{m.source} (id #{m.source.id.inspect})"
end
-
- labels.each { |l| LabelManager << l }
-
- begin
- m = Message.new :source => source, :source_info => offset, :labels => labels
- if found[m.id]
- Redwood::log "skipping duplicate message #{m.id}"
- next
- else
- found[m.id] = true
- end
- if m.source_marked_read?
- m.remove_label :unread
- labels.delete :unread
- end
+ to = (m.to + m.cc + m.bcc).map { |x| x.email }.join(" ")
+ d = {
+ :message_id => m.id,
+ :source_id => source_id,
+ :source_info => m.source_info,
+ :date => m.date.to_indexable_s,
+ :body => m.content,
+ :snippet => m.snippet,
+ :label => m.labels.join(" "),
+ :from => m.from ? m.from.email : "",
+ :to => (m.to + m.cc + m.bcc).map { |x| x.email }.join(" "),
+ :subject => wrap_subj(Message.normalize_subj(m.subj)),
+ :refs => (m.refs + m.replytos).uniq.join(" "),
+ }
- docid, entry = load_entry_for_id m.id
- m = yield m, offset, labels, entry
- next unless m
- if entry
- update_message m, docid, entry
- else
- add_message m
- UpdateManager.relay :add, m
- end
- rescue MessageFormatError, SourceError => e
- Redwood::log "ignoring erroneous message at #{source}##{offset}: #{e.message}"
- end
- end
+ @index.delete docid if docid
+ @index.add_document d
+
+ docid, entry = load_entry_for_id m.id
+ ## this hasn't been triggered in a long time. TODO: decide whether it's still a problem.
+ raise "just added message #{m.id} but couldn't find it in a search" unless docid
+ true
end
def save_index fn=File.join(@dir, "ferret")
end
## yield all messages in the thread containing 'm' by repeatedly
- ## querying the index. uields pairs of message ids and
+ ## querying the index. yields pairs of message ids and
## message-building lambdas, so that building an unwanted message
## can be skipped in the block if desired.
##
## stops loading any thread if a message with a :killed flag is found.
-
SAME_SUBJECT_DATE_LIMIT = 7
def each_message_in_thread_for m, opts={}
+ Redwood::log "Building thread for #{m.id}: #{m.subj}"
messages = {}
searched = {}
num_queries = 0
- ## todo: make subject querying configurable
- if true # do subject queries
+ if $config[:thread_by_subject] # do subject queries
date_min = m.date - (SAME_SUBJECT_DATE_LIMIT * 12 * 3600)
date_max = m.date + (SAME_SUBJECT_DATE_LIMIT * 12 * 3600)
break if opts[:limit] && messages.size >= opts[:limit]
break if @index[docid][:label].split(/\s+/).include? "killed" unless opts[:load_killed]
mid = @index[docid][:message_id]
- unless messages.member? mid
+ unless id == mid || messages.member?(mid)
+ Redwood::log "got #{mid} as a child of #{id}"
messages[mid] ||= lambda { build_message docid }
refs = @index[docid][:refs].split(" ")
pending += refs
end
end
end
- Redwood::log "ran #{num_queries} queries to build thread of #{messages.size} messages for #{m.id}" if num_queries > 0
+ Redwood::log "ran #{num_queries} queries to build thread of #{messages.size + 1} messages for #{m.id}" if num_queries > 0
messages.each { |mid, builder| yield mid, builder }
end
def wrap_subj subj; "__START_SUBJECT__ #{subj} __END_SUBJECT__"; end
def unwrap_subj subj; subj =~ /__START_SUBJECT__ (.*?) __END_SUBJECT__/ && $1; end
- ## Adds a message to the index. The message cannot already exist in
- ## the index.
- def add_message m
- raise ArgumentError, "index already contains #{m.id}" if contains? m
-
- source_id =
- if m.source.is_a? Integer
- m.source
- else
- m.source.id or raise "unregistered source #{m.source} (id #{m.source.id.inspect})"
- end
-
- to = (m.to + m.cc + m.bcc).map { |x| x.email }.join(" ")
- d = {
- :message_id => m.id,
- :source_id => source_id,
- :source_info => m.source_info,
- :date => m.date.to_indexable_s,
- :body => m.content,
- :snippet => m.snippet,
- :label => m.labels.join(" "),
- :from => m.from ? m.from.email : "",
- :to => (m.to + m.cc + m.bcc).map { |x| x.email }.join(" "),
- :subject => wrap_subj(Message.normalize_subj(m.subj)),
- :refs => (m.refs + m.replytos).uniq.join(" "),
- }
-
- @index.add_document d
-
- docid, entry = load_entry_for_id m.id
- ## this hasn't been triggered in a long time. TODO: decide whether it's still a problem.
- raise "just added message #{m.id} but couldn't find it in a search" unless docid
- true
- end
-
def drop_entry docno; @index.delete docno; end
def load_entry_for_id mid
contacts.keys.compact
end
+ def load_sources fn=Redwood::SOURCE_FN
+ source_array = (Redwood::load_yaml_obj(fn) || []).map { |o| Recoverable.new o }
+ @sources = Hash[*(source_array).map { |s| [s.id, s] }.flatten]
+ @sources_dirty = false
+ end
+
protected
def parse_user_query_string str; @qparser.parse str; end
query
end
- def load_sources fn=Redwood::SOURCE_FN
- @sources = Hash[*(Redwood::load_yaml_obj(fn) || []).map { |s| [s.id, s] }.flatten]
- @sources_dirty = false
- end
-
def save_sources fn=Redwood::SOURCE_FN
if @sources_dirty || @sources.any? { |id, s| s.dirty? }
bakfn = fn + ".bak"
projects / sup / blobdiff