sup 0.0.8 → 0.1

data/lib/sup/modes/resume-mode.rb

@@ -1,14 +1,14 @@
 module Redwood
 
-class ResumeMode < ComposeMode
+class ResumeMode < EditMessageMode
   def initialize m
-    super()
     @id = m.id
-    @header, @body = parse_file m.draft_filename
-    @header.delete "Date"
-    @header["Message-Id"] = gen_message_id # generate a new'n
-    regen_text
     @safe = false
+
+    header, body = parse_file m.draft_filename
+    header.delete "Date"
+
+    super :header => header, :body => body
   end
 
   def killable?

data/lib/sup/modes/scroll-mode.rb

@@ -21,7 +21,7 @@ class ScrollMode < Mode
     k.add :col_right, "Right one column", :right, 'l'
     k.add :page_down, "Down one page", :page_down, 'n', ' '
     k.add :page_up, "Up one page", :page_up, 'p', :backspace
-    k.add :jump_to_home, "Jump to top", :home, '^', '1'
+    k.add :jump_to_start, "Jump to top", :home, '^', '1'
     k.add :jump_to_end, "Jump to bottom", :end, '$', '0'
     k.add :jump_to_left, "Jump to the left", '['
   end
@@ -76,17 +76,18 @@ class ScrollMode < Mode
     buffer.mark_dirty
   end
 
+  def at_top?; @topline == 0 end
+  def at_bottom?; @botline == lines end
+
   def line_down; jump_to_line @topline + 1; end
   def line_up;  jump_to_line @topline - 1; end
   def page_down; jump_to_line @topline + buffer.content_height - @slip_rows; end
   def page_up; jump_to_line @topline - buffer.content_height + @slip_rows; end
-  def jump_to_home; jump_to_line 0; end
+  def jump_to_start; jump_to_line 0; end
   def jump_to_end; jump_to_line lines - buffer.content_height; end
 
-
   def ensure_mode_validity
-    @topline = @topline.clamp 0, lines - 1
-    @topline = 0 if @topline < 0 # empty 
+    @topline = @topline.clamp 0, [lines - 1, 0].max
     @botline = [@topline + buffer.content_height, lines].min
   end
 

data/lib/sup/modes/search-results-mode.rb

@@ -3,26 +3,15 @@ module Redwood
 class SearchResultsMode < ThreadIndexMode
   def initialize qobj
     @qobj = qobj
-    super
+    super [], { :qobj => @qobj, :load_killed => true, :load_spam => false }
   end
 
-  ## TODO: think about this
-  def is_relevant? m; super; end
+  ## a proper is_relevant? method requires some way of asking ferret
+  ## if an in-memory object satisfies a query. i'm not sure how to do
+  ## that yet. in the worst case i can make an in-memory index, add
+  ## the message, and search against it to see if i have > 0 results,
+  ## but that seems pretty insane.
 
-  def load_threads opts={}
-    n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
-    load_n_threads_background n, :qobj => @qobj,
-                                 :load_killed => true,
-                                 :load_spam => false,
-                                 :when_done =>(lambda do |num|
-      opts[:when_done].call if opts[:when_done]
-      if num > 0
-        BufferManager.flash "Found #{num} threads"
-      else
-        BufferManager.flash "No matches"
-      end
-    end)
-  end
 end
 
 end

data/lib/sup/modes/thread-index-mode.rb

@@ -1,7 +1,7 @@
-require 'thread'
 module Redwood
 
-## subclasses should implement load_threads
+## subclasses should implement:
+## - is_relevant?
 
 class ThreadIndexMode < LineCursorMode
   DATE_WIDTH = Time::TO_NICE_S_MAX_LEN
@@ -27,21 +27,30 @@ class ThreadIndexMode < LineCursorMode
     k.add :apply_to_tagged, "Apply next command to all tagged threads", ';'
   end
 
-  def initialize required_labels=[], hidden_labels=[]
+  def initialize hidden_labels=[], load_thread_opts={}
     super()
+    @mutex = Mutex.new
     @load_thread = nil
-    @required_labels = required_labels
-    @hidden_labels = hidden_labels + LabelManager::HIDDEN_LABELS
+    @load_thread_opts = load_thread_opts
+    @hidden_labels = hidden_labels + LabelManager::HIDDEN_RESERVED_LABELS
     @date_width = DATE_WIDTH
     @from_width = FROM_WIDTH
     @size_width = nil
-
+    
     @tags = Tagger.new self
     
     initialize_threads
     update
 
     UpdateManager.register self
+
+    @last_load_more_size = nil
+    to_load_more do |size|
+      next if @last_load_more_size == 0
+      load_threads :num => 1, :background => false
+      load_threads :num => (size - 1),
+                   :when_done => lambda { |num| @last_load_more_size = num }
+    end
   end
 
   def lines; @text.length; end
@@ -117,8 +126,8 @@ class ThreadIndexMode < LineCursorMode
 
   def update
     ## let's see you do THIS in python
-    @threads = @ts.threads.select { |t| !@hidden_threads[t] && !t.has_label?(:killed) }.sort_by { |t| t.date }.reverse
-    @size_width = (@threads.map { |t| t.size }.max || 0).num_digits
+    @threads = @ts.threads.select { |t| !@hidden_threads[t] }.sort_by { |t| t.date }.reverse
+    @size_width = (@threads.max_of { |t| t.size } || 0).num_digits
     regen_text
   end
 
@@ -192,9 +201,10 @@ class ThreadIndexMode < LineCursorMode
   end
 
   def jump_to_next_new
-    n = ((curpos + 1) ... lines).find { |i| @threads[i].has_label? :unread }
-    n = (0 ... curpos).find { |i| @threads[i].has_label? :unread } unless n
+    n = ((curpos + 1) ... lines).find { |i| @threads[i].has_label? :unread } || (0 ... curpos).find { |i| @threads[i].has_label? :unread }
     if n
+      ## jump there if necessary
+      jump_to_line n unless n >= topline && n < botline
       set_cursor_pos n
     else
       BufferManager.flash "No new messages"
@@ -241,12 +251,12 @@ class ThreadIndexMode < LineCursorMode
   end
 
   def save
-    threads = @threads + @hidden_threads.keys
+    dirty_threads = (@threads + @hidden_threads.keys).select { |t| t.dirty? }
+    return if dirty_threads.empty?
 
     BufferManager.say("Saving threads...") do |say_id|
-      threads.each_with_index do |t, i|
-        next unless t.dirty?
-        BufferManager.say "Saving thread #{i +1} of #{threads.length}...", say_id
+      dirty_threads.each_with_index do |t, i|
+        BufferManager.say "Saving modified thread #{i + 1} of #{dirty_threads.length}...", say_id
         t.save Index
       end
     end
@@ -330,8 +340,8 @@ class ThreadIndexMode < LineCursorMode
   end
 
   def load_n_threads_background n=LOAD_MORE_THREAD_NUM, opts={}
-    return if @load_thread
-    @load_thread = Redwood::reporting_thread do 
+    return if @load_thread # todo: wrap in mutex
+    @load_thread = Redwood::reporting_thread do
       num = load_n_threads n, opts
       opts[:when_done].call(num) if opts[:when_done]
       @load_thread = nil
@@ -358,15 +368,35 @@ class ThreadIndexMode < LineCursorMode
     BufferManager.draw_screen
     @ts.size - orig_size
   end
+  synchronized :load_n_threads
 
   def status
     if (l = lines) == 0
-      ""
+      "line 0 of 0"
     else
       "line #{curpos + 1} of #{l} #{dirty? ? '*modified*' : ''}"
     end
   end
 
+  def load_threads opts={}
+    n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
+
+    myopts = @load_thread_opts.merge({ :when_done => (lambda do |num|
+      opts[:when_done].call(num) if opts[:when_done]
+      if num > 0
+        BufferManager.flash "Found #{num} threads"
+      else
+        BufferManager.flash "No matches"
+      end
+    end)})
+
+    if opts[:background] || opts[:background].nil?
+      load_n_threads_background n, myopts
+    else
+      load_n_threads n, myopts
+    end
+  end
+
 protected
 
   def cursor_thread; @threads[curpos]; end
@@ -406,16 +436,20 @@ protected
   end
   
   def author_text_for_thread t
-    if t.authors.size == 1
-      t.authors.first.mediumname
-    else
-      t.authors.map { |p| AccountManager.is_account?(p) ? "me" : p.shortname }.join ", "
-    end
+    t.authors.map do |p|
+      if AccountManager.is_account?(p)
+        "me"
+      elsif t.authors.size == 1
+        p.mediumname
+      else
+        p.shortname
+      end
+    end.uniq.join ","
   end
 
   def text_for_thread t
-    date = t.date.to_nice_s(Time.now)
-    from = author_text_for_thread(t)
+    date = t.date.to_nice_s
+    from = author_text_for_thread t
     if from.length > @from_width
       from = from[0 ... (@from_width - 1)]
       from += "." unless from[-1] == ?\s
@@ -427,12 +461,20 @@ protected
     dp = t.direct_participants.any? { |p| AccountManager.is_account? p }
     p = dp || t.participants.any? { |p| AccountManager.is_account? p }
 
-    base_color = (new ? :index_new_color : :index_old_color)
+    base_color =
+      if new
+        :index_new_color
+      elsif starred
+        :index_starred_color
+      else 
+        :index_old_color
+      end
+
     [ 
       [:tagged_color, @tags.tagged?(t) ? ">" : " "],
-      [:none, sprintf("%#{@date_width}s ", date)],
+      [:none, sprintf("%#{@date_width}s", date)],
+      (starred ? [:starred_color, "*"] : [:none, " "]),
       [base_color, sprintf("%-#{@from_width}s", from)],
-      [:starred_color, starred ? "*" : " "],
       [:none, t.size == 1 ? " " * (@size_width + 2) : sprintf("(%#{@size_width}d)", t.size)],
       [:to_me_color, dp ? " >" : (p ? ' +' : "  ")],
       [base_color, t.subj + (t.subj.empty? ? "" : " ")],
@@ -447,7 +489,7 @@ protected
 private
 
   def initialize_threads
-    @ts = ThreadSet.new Index.instance
+    @ts = ThreadSet.new Index.instance, $config[:thread_by_subject]
     @ts_mutex = Mutex.new
     @hidden_threads = {}
   end

data/lib/sup/modes/thread-view-mode.rb

@@ -2,10 +2,14 @@ module Redwood
 
 class ThreadViewMode < LineCursorMode
   ## this holds all info we need to lay out a message
-  class Layout
+  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"
   INDENT_SPACES = 2 # how many spaces to indent child messages
 
@@ -14,7 +18,7 @@ class ThreadViewMode < LineCursorMode
     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'
@@ -30,27 +34,27 @@ class ThreadViewMode < LineCursorMode
     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
@@ -146,13 +150,19 @@ class ThreadViewMode < LineCursorMode
   def toggle_expanded
     chunk = @chunk_lines[curpos] or return
     case chunk
-    when Message, Message::Quote, Message::Signature
-      return if chunk.lines.length == 1 unless chunk.is_a? Message # too small to expand/close
+    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
@@ -169,7 +179,7 @@ class ThreadViewMode < LineCursorMode
     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: "
@@ -177,11 +187,12 @@ class ThreadViewMode < LineCursorMode
     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!"
@@ -241,27 +252,27 @@ class ThreadViewMode < LineCursorMode
   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 = l.orig_new ? :open : :closed if m.is_a? Message }
+    @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)) && c.lines.length > 1 }
-      numopen = quotes.inject(0) { |s, c| s + (@layout[c].state == :open ? 1 : 0) }
+      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
 
   def cleanup
-    @layout = @text = nil # for good luck
+    @layout = @chunk_layout = @text = nil # for good luck
   end
 
   def archive_and_kill
@@ -272,6 +283,12 @@ class ThreadViewMode < LineCursorMode
 
 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
@@ -300,10 +317,13 @@ private
         @text += chunk_to_lines m, nil, @text.length, depth, parent
         next
       end
-      l = @layout[m] or next # TODO: figure out why this is nil sometimes
+      l = @layout[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, @layout[m].color, @layout[m].star_color
+      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
@@ -322,10 +342,18 @@ private
 
       @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
@@ -422,7 +450,13 @@ private
       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
@@ -455,9 +489,11 @@ private
     success = a.view!
     BufferManager.erase_flash
     BufferManager.completely_redraw_screen
-    BufferManager.flash "Couldn't execute view command." unless success
+    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