class ThreadViewMode < LineCursorMode
## this holds all info we need to lay out a message
- class Layout
- attr_accessor :top, :bot, :prev, :next, :depth, :width, :state
+ class MessageLayout
+ attr_accessor :top, :bot, :prev, :next, :depth, :width, :state, :color, :star_color, :orig_new
+ end
+
+ class ChunkLayout
+ attr_accessor :state
end
DATE_FORMAT = "%B %e %Y %l:%M%P"
k.add :show_header, "Show full message header", 'H'
k.add :toggle_expanded, "Expand/collapse item", :enter
k.add :expand_all_messages, "Expand/collapse all messages", 'E'
- k.add :edit_message, "Edit message (drafts only)", 'e'
+ k.add :edit_draft, "Edit draft", 'e'
k.add :expand_all_quotes, "Expand/collapse all quotes in a message", 'o'
k.add :jump_to_next_open, "Jump to next open message", 'n'
k.add :jump_to_prev_open, "Jump to previous open message", 'p'
k.add :reply, "Reply to a message", 'r'
k.add :forward, "Forward a message", 'f'
k.add :alias, "Edit alias/nickname for a person", 'a'
- k.add :edit_as_new, "Edit message as new", 'd'
+ k.add :edit_as_new, "Edit message as new", 'D'
k.add :save_to_disk, "Save message/attachment to disk", 's'
k.add :search, "Search for messages from particular people", 'S'
+ k.add :compose, "Compose message to person", 'm'
+ k.add :archive_and_kill, "Archive thread and kill buffer", 'A'
end
- ## there are a couple important instance variables we hold to lay
- ## out the thread and to provide line-based functionality. @layout
- ## is a map from Message and Chunk objects to Layout objects. (for
- ## chunks, we only use the state field right now.) @message_lines is
- ## a map from row #s to Message objects. @chunk_lines is a map from
- ## row #s to Chunk objects. @person_lines is a map from row #s to
- ## Person objects.
+ ## there are a couple important instance variables we hold to format
+ ## the thread and to provide line-based functionality. @layout is a
+ ## map from Messages to MessageLayouts, and @chunk_layout from
+ ## Chunks to ChunkLayouts. @message_lines is a map from row #s to
+ ## Message objects. @chunk_lines is a map from row #s to Chunk
+ ## objects. @person_lines is a map from row #s to Person objects.
def initialize thread, hidden_labels=[]
super()
@thread = thread
@hidden_labels = hidden_labels
- @layout = {}
+ @layout = SavingHash.new { MessageLayout.new }
+ @chunk_layout = SavingHash.new { ChunkLayout.new }
earliest, latest = nil, nil
latest_date = nil
+ altcolor = false
+
@thread.each do |m, d, p|
next unless m
earliest ||= m
- @layout[m] = Layout.new
@layout[m].state = initial_state_for m
+ @layout[m].color = altcolor ? :alternate_patina_color : :message_patina_color
+ @layout[m].star_color = altcolor ? :alternate_starred_patina_color : :starred_patina_color
+ @layout[m].orig_new = m.has_label? :unread
+ altcolor = !altcolor
if latest_date.nil? || m.date > latest_date
latest_date = m.date
latest = m
@layout[latest].state = :open if @layout[latest].state == :closed
@layout[earliest].state = :detailed if earliest.has_label?(:unread) || @thread.size == 1
- BufferManager.say("Loading message bodies...") { regen_text }
+ regen_text
end
def draw_line ln, opts={}
def alias
p = @person_lines[curpos] or return
alias_contact p
- regen_text
+ update
end
def search
p = @person_lines[curpos] or return
mode = PersonSearchResultsMode.new [p]
- BufferManager.spawn "search for #{p.name}", mode
+ BufferManager.spawn "Search for #{p.name}", mode
mode.load_threads :num => mode.buffer.content_height
end
+ def compose
+ p = @person_lines[curpos]
+ mode =
+ if p
+ ComposeMode.new :to => [p]
+ else
+ ComposeMode.new
+ end
+ BufferManager.spawn "Compose message", mode
+ mode.edit
+ end
+
def toggle_starred
m = @message_lines[curpos] or return
if m.has_label? :starred
## TODO: don't recalculate EVERYTHING just to add a stupid little
## star to the display
update
- UpdateManager.relay :starred, m
+ UpdateManager.relay self, :starred, m
end
def toggle_expanded
chunk = @chunk_lines[curpos] or return
case chunk
- when Message, Message::Quote, Message::Signature
+ when Message
l = @layout[chunk]
l.state = (l.state != :closed ? :closed : :open)
cursor_down if l.state == :closed
+ when Message::Quote, Message::Signature
+ return if chunk.lines.length == 1
+ toggle_chunk_expansion chunk
when Message::Attachment
- view_attachment chunk
+ if chunk.inlineable?
+ toggle_chunk_expansion chunk
+ else
+ view_attachment chunk
+ end
end
update
end
case chunk
when Message::Attachment
fn = BufferManager.ask :filename, "Save attachment to file: ", chunk.filename
- save_to_file(fn) { |f| f.print chunk } if fn
+ save_to_file(fn) { |f| f.print chunk.raw_content } if fn
else
m = @message_lines[curpos]
fn = BufferManager.ask :filename, "Save message to file: "
end
end
- def edit_message
+ def edit_draft
m = @message_lines[curpos] or return
if m.is_draft?
mode = ResumeMode.new m
BufferManager.spawn "Edit message", mode
+ BufferManager.kill_buffer self.buffer
mode.edit
else
BufferManager.flash "Not a draft message!"
end
end
+ def jump_to_first_open
+ m = @message_lines[0] or return
+ if @layout[m].state != :closed
+ jump_to_message m
+ else
+ jump_to_next_open
+ end
+ end
+
def jump_to_next_open
m = @message_lines[curpos] or return
while nextm = @layout[m].next
- break if @layout[nextm].state == :open
+ break if @layout[nextm].state != :closed
m = nextm
end
jump_to_message nextm if nextm
def expand_all_messages
@global_message_state ||= :closed
@global_message_state = (@global_message_state == :closed ? :open : :closed)
- @layout.each { |m, l| l.state = @global_message_state if m.is_a? Message }
+ @layout.each { |m, l| l.state = @global_message_state }
update
end
def collapse_non_new_messages
- @layout.each { |m, l| l.state = m.has_label?(:unread) ? :open : :closed }
+ @layout.each { |m, l| l.state = l.orig_new ? :open : :closed }
update
end
def expand_all_quotes
if(m = @message_lines[curpos])
- quotes = m.chunks.select { |c| c.is_a?(Message::Quote) || c.is_a?(Message::Signature) }
- numopen = quotes.inject(0) { |s, c| s + (@layout[c].state == :open ? 1 : 0) }
+ quotes = m.chunks.select { |c| (c.is_a?(Message::Quote) || c.is_a?(Message::Signature)) && c.lines.length > 1 }
+ numopen = quotes.inject(0) { |s, c| s + (@chunk_layout[c].state == :open ? 1 : 0) }
newstate = numopen > quotes.length / 2 ? :closed : :open
- quotes.each { |c| @layout[c].state = newstate }
+ quotes.each { |c| @chunk_layout[c].state = newstate }
update
end
end
- ## kinda slow for large threads. TODO: fasterify
def cleanup
- BufferManager.say "Marking messages as read..." do
- @thread.each do |m, d, p|
- if m && m.has_label?(:unread)
- m.remove_label :unread
- UpdateManager.relay :read, m
- end
- end
- end
- @layout = @text = nil
+ @layout = @chunk_layout = @text = nil # for good luck
+ end
+
+ def archive_and_kill
+ @thread.remove_label :inbox
+ UpdateManager.relay self, :archived, @thread
+ BufferManager.kill_buffer_safely buffer
end
private
+ def toggle_chunk_expansion chunk
+ l = @chunk_layout[chunk]
+ l.state = (l.state != :closed ? :closed : :open)
+ cursor_down if l.state == :closed
+ end
+
def initial_state_for m
if m.has_label?(:starred) || m.has_label?(:unread)
:open
@text += chunk_to_lines m, nil, @text.length, depth, parent
next
end
+ l = @layout[m]
- ## we're occasionally called on @threads that have had messages
- ## added to them since initialization. luckily we regen_text on
- ## the entire thread every time the user does anything besides
- ## scrolling (basically), so we can just slap this on here.
- ##
- ## to pick nits, the niceness that i do in the constructor with
- ## 'latest' etc. (for automatically opening just the latest
- ## message if everything's been read) will not be valid, but
- ## that's just a nicety and hopefully this won't happen too
- ## often.
-
- l = (@layout[m] ||= Layout.new)
- l.state ||= initial_state_for m
+ ## is this still necessary?
+ next unless @layout[m].state # skip discarded drafts
## build the patina
- text = chunk_to_lines m, l.state, @text.length, depth, parent
+ text = chunk_to_lines m, l.state, @text.length, depth, parent, l.color, l.star_color
l.top = @text.length
l.bot = @text.length + text.length # updated below
@text += text
prevm = m
- if @layout[m].state != :closed
+ if l.state != :closed
m.chunks.each do |c|
- cl = (@layout[c] ||= Layout.new)
- cl.state ||= :closed
+ cl = @chunk_layout[c]
+
+ ## set the default state for chunks
+ cl.state ||=
+ if c.is_a?(Message::Attachment) && c.inlineable?
+ :open
+ else
+ :closed
+ end
+
text = chunk_to_lines c, cl.state, @text.length, depth
(0 ... text.length).each do |i|
@chunk_lines[@text.length + i] = c
end
end
- def message_patina_lines m, state, start, parent, prefix
- prefix_widget = [:message_patina_color, prefix]
+ def message_patina_lines m, state, start, parent, prefix, color, star_color
+ prefix_widget = [color, prefix]
widget =
case state
when :closed
- [:message_patina_color, "+ "]
+ [color, "+ "]
when :open, :detailed
- [:message_patina_color, "- "]
+ [color, "- "]
end
imp_widget =
if m.has_label?(:starred)
- [:starred_patina_color, "* "]
+ [star_color, "* "]
else
- [:message_patina_color, " "]
+ [color, " "]
end
case state
when :open
@person_lines[start] = m.from
[[prefix_widget, widget, imp_widget,
- [:message_patina_color,
+ [color,
"#{m.from ? m.from.mediumname : '?'} to #{m.recipients.map { |l| l.shortname }.join(', ')} #{m.date.to_nice_s} (#{m.date.to_nice_distance_s})"]]]
when :closed
@person_lines[start] = m.from
[[prefix_widget, widget, imp_widget,
- [:message_patina_color,
+ [color,
"#{m.from ? m.from.mediumname : '?'}, #{m.date.to_nice_s} (#{m.date.to_nice_distance_s}) #{m.snippet}"]]]
when :detailed
@person_lines[start] = m.from
- from = [[prefix_widget, widget, imp_widget, [:message_patina_color, "From: #{m.from ? format_person(m.from) : '?'}"]]]
+ from = [[prefix_widget, widget, imp_widget, [color, "From: #{m.from ? format_person(m.from) : '?'}"]]]
rest = []
unless m.to.empty?
m.labels.empty? ? nil : " Labels: #{m.labels.join(', ')}",
].compact
- from + rest.map { |l| [[:message_patina_color, prefix + " " + l]] }
+ from + rest.map { |l| [[color, prefix + " " + l]] }
end
end
p.longname + (ContactManager.is_contact?(p) ? " (#{ContactManager.alias_for p})" : "")
end
- def chunk_to_lines chunk, state, start, depth, parent=nil
+ def chunk_to_lines chunk, state, start, depth, parent=nil, color=nil, star_color=nil
prefix = " " * INDENT_SPACES * depth
case chunk
when :fake_root
- [[[:message_patina_color, "#{prefix}<one or more unreceived messages>"]]]
+ [[[:missing_message_color, "#{prefix}<one or more unreceived messages>"]]]
when nil
- [[[:m
essage_patina_color, "#{prefix}<an unreceived message>"]]]
+ [[[:m
issing_message_color, "#{prefix}<an unreceived message>"]]]
when Message
- message_patina_lines(chunk, state, start, parent, prefix) +
+ message_patina_lines(chunk, state, start, parent, prefix, color, star_color) +
(chunk.is_draft? ? [[[:draft_notification_color, prefix + " >>> This message is a draft. To edit, hit 'e'. <<<"]]] : [])
when Message::Attachment
- [[[:mime_color, "#{prefix}+ MIME attachment #{chunk.content_type}#{chunk.desc ? ' (' + chunk.desc + ')': ''}"]]]
+ return [[[:attachment_color, "#{prefix}x Attachment: #{chunk.filename} (#{chunk.content_type})"]]] unless chunk.inlineable?
+ case state
+ when :closed
+ [[[:attachment_color, "#{prefix}+ Attachment: #{chunk.filename} (#{chunk.lines.length} lines)"]]]
+ when :open
+ [[[:attachment_color, "#{prefix}- Attachment: #{chunk.filename} (#{chunk.lines.length} lines)"]]] + chunk.lines.map { |line| [[:none, "#{prefix}#{line}"]] }
+ end
when Message::Text
t = chunk.lines
if t.last =~ /^\s*$/ && t.length > 1
end
t.map { |line| [[:none, "#{prefix}#{line}"]] }
when Message::Quote
+ return [[[:quote_color, "#{prefix}#{chunk.lines.first}"]]] if chunk.lines.length == 1
case state
when :closed
[[[:quote_patina_color, "#{prefix}+ (#{chunk.lines.length} quoted lines)"]]]
when :open
- t = chunk.lines
- [[[:quote_patina_color, "#{prefix}- (#{chunk.lines.length} quoted lines)"]]] +
- t.map { |line| [[:quote_color, "#{prefix}#{line}"]] }
+ [[[:quote_patina_color, "#{prefix}- (#{chunk.lines.length} quoted lines)"]]] + chunk.lines.map { |line| [[:quote_color, "#{prefix}#{line}"]] }
end
when Message::Signature
+ return [[[:sig_patina_color, "#{prefix}#{chunk.lines.first}"]]] if chunk.lines.length == 1
case state
when :closed
[[[:sig_patina_color, "#{prefix}+ (#{chunk.lines.length}-line signature)"]]]
when :open
- t = chunk.lines
- [[[:sig_patina_color, "#{prefix}- (#{chunk.lines.length}-line signature)"]]] +
- t.map { |line| [[:sig_color, "#{prefix}#{line}"]] }
+ [[[:sig_patina_color, "#{prefix}- (#{chunk.lines.length}-line signature)"]]] + chunk.lines.map { |line| [[:sig_color, "#{prefix}#{line}"]] }
end
else
raise "unknown chunk type #{chunk.class.name}"
def view_attachment a
BufferManager.flash "viewing #{a.content_type} attachment..."
- a.view!
+ success = a.view!
BufferManager.erase_flash
BufferManager.completely_redraw_screen
+ unless success
+ BufferManager.spawn "Attachment: #{a.filename}", TextMode.new(a.to_s)
+ BufferManager.flash "Couldn't execute view command, viewing as text."
+ end
end
-
end
end
projects / sup / blobdiff