## unused
def dump f=$stdout
- f.puts "=== start thread #{self} with #{@containers.length} trees ==="
- @containers.each { |c| c.dump_recursive f }
+ f.puts "=== start thread with #{@containers.length} trees ==="
+ @containers.each { |c| c.dump_recursive f; f.puts }
f.puts "=== end thread ==="
end
def to_s
"<thread containing: #{@containers.join ', '}>"
end
-
- def prune_dangling_container_trees!
- @containers.delete_if { |c| c.dangling? }
- end
end
## recursive structure used internally to represent message trees as
end
end
- def dangling?
- if @children.any? { |c| !c.empty? }
- false
- elsif @children.any? { |c| !c.dangling? }
- false
- else
- true
- end
- end
-
def descendant_of? o
if o == self
true
def subj; find_attr :subj; end
def date; find_attr :date; end
- def is_reply?; subj && Message.subject_is_reply?(subj); end
+ def is_reply?; subj && Message.subj_is_reply?(subj); end
def to_s
[ "<#{id}",
f.print " " * indent
f.print "+->"
end
- line = #"[#{useful? ? 'U' : ' '}] " +
+ line = "[#{thread.nil? ? ' ' : '*'}] " + #"[#{useful? ? 'U' : ' '}] " +
if @message
- "[#{thread}] #{@message.subj} " ##{@message.refs.inspect} / #{@message.replytos.inspect}"
+ message.subj ##{@message.refs.inspect} / #{@message.replytos.inspect}"
else
"<no message>"
end
## helpful for crappy MUAs that don't set In-reply-to: or References:
## headers, but means that messages may be threaded unnecessarily.
##
-## The following invariants should be maintained: every Thread
-## should have at least one Container tree, and every Container tree
-## should have at least one Message.
+## The following invariants are maintained: every Thread has at least one
+## Container tree, and every Container tree has at least one Message.
class ThreadSet
attr_reader :num_messages
bool_reader :thread_by_subj
@thread_by_subj = thread_by_subj
end
- def thread_for_id mid; (c = @messages[mid]) && c.root.thread end
+ def thread_for_id mid; @messages.member?(mid) && @messages[mid].root.thread end
def contains_id? id; @messages.member?(id) && !@messages[id].empty? end
def thread_for m; thread_for_id m.id end
def contains? m; contains_id? m.id end
def threads; @threads.values end
def size; @threads.size end
- ## unused
- def dump f
+ def dump f=$stdout
@threads.each do |s, t|
f.puts "**********************"
f.puts "** for subject #{s} **"
## link two containers
def link p, c, overwrite=false
if p == c || p.descendant_of?(c) || c.descendant_of?(p) # would create a loop
-# puts "*** linking parent #{p} and child #{c} would create a loop"
+ #puts "*** linking parent #{p.id} and child #{c.id} would create a loop"
return
end
- if c.parent.nil? || overwrite
- remove_container c
- p.children << c
- c.parent = p
- end
+ #puts "in link for #{p.id} to #{c.id}, perform? #{c.parent.nil?} || #{overwrite}"
+
+ return unless c.parent.nil? || overwrite
+ remove_container c
+ p.children << c
+ c.parent = p
+
+ ## if the child was previously a top-level container, it now ain't,
+ ## so ditch our thread and kill it if necessary
+ prune_thread_of c
end
private :link
def remove_container c
c.parent.children.delete c if c.parent # remove from tree
- thread = c.root.thread # find containing thread
- if thread
- thread.prune_dangling_container_trees!
- if thread.empty? # kill the thread
- @threads.delete_if { |key, thread| thread.empty? }
- c.root.thread = nil
- end
- end
end
private :remove_container
- ## remove a single message id
+ def prune_thread_of c
+ return unless c.thread
+ c.thread.drop c
+ @threads.delete_if { |k, v| v == c.thread } if c.thread.empty?
+ c.thread = nil
+ end
+ private :prune_thread_of
+
def remove_id mid
- return unless(c = @messages[mid])
+ return unless @messages.member?(mid)
+ c = @messages[mid]
remove_container c
+ prune_thread_of c
+ end
+
+ def remove_thread_containing_id mid
+ return unless @messages.member?(mid)
+ c = @messages[mid]
+ t = c.root.thread
+ @threads.delete_if { |key, thread| t == thread }
end
## load in (at most) num number of threads from the index
def load_n_threads num, opts={}
@index.each_id_by_date opts do |mid, builder|
- break if size >= num
+ break if size >= num unless num == -1
next if contains_id? mid
m = builder.call
t.each { |m, *o| add_message m }
end
+ ## merges two threads together. both must be members of this threadset.
+ ## does its best, heuristically, to determine which is the parent.
+ def join_threads threads
+ return if threads.size < 2
+
+ containers = threads.map do |t|
+ c = @messages.member?(t.first.id) ? @messages[t.first.id] : nil
+ raise "not in threadset: #{t.first.id}" unless c && c.message
+ c
+ end
+
+ ## use subject headers heuristically
+ parent = containers.find { |c| !c.is_reply? }
+
+ ## no thread was rooted by a non-reply, so make a fake parent
+ parent ||= @messages["joining-ref-" + containers.map { |c| c.id }.join("-")]
+
+ containers.each do |c|
+ next if c == parent
+ c.message.add_ref parent.id
+ link parent, c
+ end
+
+ true
+ end
+
def is_relevant? m
m.refs.any? { |ref_id| @messages.member? ref_id }
end
el = @messages[message.id]
return if el.message # we've seen it before
+ #puts "adding: #{message.id}, refs #{message.refs.inspect}"
+
el.message = message
oldroot = el.root
## link via references:
- prev = nil
- message.refs.each do |ref_id|
+ (message.refs + [el.id]).inject(nil) do |prev, ref_id|
ref = @messages[ref_id]
link prev, ref if prev
- prev = ref
+ ref
end
- link prev, el, true if prev
## link via in-reply-to:
message.replytos.each do |ref_id|
end
root = el.root
-
- ## new root. need to drop old one and put this one in its place
- if root != oldroot && oldroot.thread
- oldroot.thread.drop oldroot
- oldroot.thread = nil
- end
-
key =
if thread_by_subj?
Message.normalize_subj root.subj
## that we first added a child message with a different
## subject)
if root.thread
- unless @threads[key] == root.thread
- if @threads[key]
- root.thread.empty!
- @threads[key] << root
- root.thread = @threads[key]
- else
- @threads[key] = root.thread
- end
+ if @threads.member?(key) && @threads[key] != root.thread
+ @threads.delete key
end
else
thread = @threads[key]
projects / sup / blobdiff