sup 0.2 → 0.3

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

@@ -1,19 +1,36 @@
 module Redwood
 
 class ForwardMode < EditMessageMode
-  def initialize m
-    super :header => {
+
+  ## todo: share some of this with reply-mode
+  def initialize m, opts={}
+    header = {
       "From" => AccountManager.default_account.full_address,
       "Subject" => "Fwd: #{m.subj}",
-    },
-         :body => forward_body_lines(m)
+    }
+
+    header["To"] = opts[:to].map { |p| p.full_address }.join(", ") if opts[:to]
+    header["Cc"] = opts[:cc].map { |p| p.full_address }.join(", ") if opts[:cc]
+    header["Bcc"] = opts[:bcc].map { |p| p.full_address }.join(", ") if opts[:bcc]
+
+    super :header => header, :body => forward_body_lines(m)
+  end
+
+  def self.spawn_nicely m, opts={}
+    to = opts[:to] || BufferManager.ask_for_contacts(:people, "To: ") or return
+    cc = opts[:cc] || BufferManager.ask_for_contacts(:people, "Cc: ") or return if $config[:ask_for_cc]
+    bcc = opts[:bcc] || BufferManager.ask_for_contacts(:people, "Bcc: ") or return if $config[:ask_for_bcc]
+    
+    mode = ForwardMode.new m, :to => to, :cc => cc, :bcc => bcc
+    BufferManager.spawn "Forwarding #{m.subj}", mode
+    mode.edit_message
   end
 
 protected
 
   def forward_body_lines m
     ["--- Begin forwarded message from #{m.from.mediumname} ---"] + 
-      m.basic_header_lines + [""] + m.basic_body_lines +
+      m.quotable_header_lines + [""] + m.quotable_body_lines +
       ["--- End forwarded message ---"]
   end
 end

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

@@ -14,7 +14,9 @@ class InboxMode < ThreadIndexMode
     @@instance = self
   end
 
-  def is_relevant? m; m.has_label? :inbox; end
+  def is_relevant? m
+    m.has_label?(:inbox) && ([:spam, :deleted, :killed] & m.labels).empty?
+  end
 
   ## label-list-mode wants to be able to raise us if the user selects
   ## the "inbox" label, so we need to keep our singletonness around
@@ -43,12 +45,6 @@ class InboxMode < ThreadIndexMode
     end
   end
 
-# not quite working, and not sure if i like it anyways
-#   def handle_unarchived_update sender, t
-#     Redwood::log "unarchived #{t.subj}"
-#     show_thread t
-#   end
-
   def status
     super + "    #{Index.size} messages in index"
   end

data/lib/sup/modes/label-list-mode.rb

@@ -2,18 +2,16 @@ module Redwood
 
 class LabelListMode < LineCursorMode
   register_keymap do |k|
-    k.add :select_label, "Select label", :enter
+    k.add :select_label, "Search by label", :enter
     k.add :reload, "Discard label list and reload", '@'
+    k.add :jump_to_next_new, "Jump to next new thread", :tab
+    k.add :toggle_show_unread_only, "Toggle between showing all labels and those with unread mail", 'u'
   end
 
-  bool_reader :done
-  attr_reader :value
-
   def initialize
     @labels = []
     @text = []
-    @done = false
-    @value = nil
+    @unread_only = false
     super
     regen_text
   end
@@ -21,13 +19,28 @@ class LabelListMode < LineCursorMode
   def lines; @text.length end
   def [] i; @text[i] end
 
+  def jump_to_next_new
+    n = ((curpos + 1) ... lines).find { |i| @labels[i][1] > 0 } || (0 ... curpos).find { |i| @labels[i][1] > 0 }
+    if n
+      ## jump there if necessary
+      jump_to_line n unless n >= topline && n < botline
+      set_cursor_pos n
+    else
+      BufferManager.flash "No labels messages with unread messages."
+    end
+  end
 protected
 
+  def toggle_show_unread_only
+    @unread_only = !@unread_only
+    reload
+  end
+
   def reload
     regen_text
     buffer.mark_dirty if buffer
   end
-  
+
   def regen_text
     @text = []
     labels = LabelManager.listable_labels
@@ -41,6 +54,10 @@ protected
 
     width = counts.max_of { |l, s, t, u| s.length }
 
+    if @unread_only
+      counts.delete_if { | l, s, t, u | u == 0 }
+    end
+
     @labels = []
     counts.map do |label, string, total, unread|
       if total == 0 && !LabelManager::RESERVED_LABELS.include?(label)
@@ -51,14 +68,17 @@ protected
 
       @text << [[(unread == 0 ? :labellist_old_color : :labellist_new_color),
           sprintf("%#{width + 1}s %5d %s, %5d unread", string, total, total == 1 ? " message" : "messages", unread)]]
-      @labels << label
+      @labels << [label, unread]
       yield i if block_given?
     end.compact
+
+    BufferManager.flash "No labels with unread messages!" if counts.empty? && @unread_only
   end
 
   def select_label
-    @value, string = @labels[curpos]
-    @done = true if @value
+    label, num_unread = @labels[curpos]
+    return unless label
+    LabelSearchResultsMode.spawn_nicely label
   end
 end
 

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

@@ -10,6 +10,18 @@ class LabelSearchResultsMode < ThreadIndexMode
   end
 
   def is_relevant? m; @labels.all? { |l| m.has_label? l }; end
+
+  def self.spawn_nicely label
+    label = LabelManager.label_for(label) unless label.is_a?(Symbol)
+    case label
+    when nil
+    when :inbox
+      BufferManager.raise_to_front InboxMode.instance.buffer
+    else
+      b, new = BufferManager.spawn_unless_exists("All threads with label '#{label}'") { LabelSearchResultsMode.new [label] }
+      b.mode.load_threads :num => b.content_height if new
+    end
+  end
 end
 
 end

data/lib/sup/modes/line-cursor-mode.rb

@@ -55,6 +55,19 @@ protected
     buffer.mark_dirty
   end
 
+  ## override search behavior to be cursor-based
+  def search_goto_line line
+    while line > botline
+      page_down
+    end
+    while line < topline
+      page_up
+    end
+    set_cursor_pos line
+  end
+
+  def search_start_line; @curpos end
+ 
   def line_down # overwrite scrollmode
     super
     call_load_more_callbacks([topline + buffer.content_height - lines, 10].max) if topline + buffer.content_height > lines

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

@@ -3,7 +3,6 @@ module Redwood
 class LogMode < TextMode
   register_keymap do |k|
     k.add :toggle_follow, "Toggle follow mode", 'f'
-    k.add :save_to_disk, "Save log to disk", 's'
   end
 
   def initialize
@@ -37,11 +36,6 @@ class LogMode < TextMode
     end
   end
 
-  def save_to_disk
-    fn = BufferManager.ask_for_filename :filename, "Save log to file: "
-    save_to_file(fn) { |f| f.puts text } if fn
-  end
-
   def status
     super + " (follow: #@follow)"
   end

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

@@ -8,9 +8,6 @@ class PollMode < LogMode
 
   def puts s=""
     self << s + "\n"
-#    if lines % 5 == 0
-      BufferManager.draw_screen
-#    end
   end
 
   def poll

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

@@ -38,13 +38,20 @@ class ReplyMode < EditMessageMode
     cc = (@m.to + @m.cc - [from, to]).uniq
 
     @headers = {}
-    @headers[:sender] = {
-      "To" => [to.full_address],
-    } unless AccountManager.is_account? to
 
+    ## if there's no cc, then the sender is the person you want to reply
+    ## to. if it's a list message, then the list address is. otherwise,
+    ## the cc contains a recipient.
+    useful_recipient = !(cc.empty? || @m.is_list_message?)
+    
     @headers[:recipient] = {
       "To" => cc.map { |p| p.full_address },
-    } unless cc.empty? || @m.is_list_message?
+    } if useful_recipient
+
+    ## typically we don't want to have a reply-to-sender option if the sender
+    ## is a user account. however, if the cc is empty, it's a message to
+    ## ourselves, so for the lack of any other options, we'll add it.
+    @headers[:sender] = { "To" => [to.full_address], } if !AccountManager.is_account?(to) || !useful_recipient
 
     @headers[:user] = {}
 
@@ -58,6 +65,7 @@ class ReplyMode < EditMessageMode
     } if @m.is_list_message?
 
     refs = gen_references
+
     @headers.each do |k, v|
       @headers[k] = {
                "From" => "#{from.name} <#{from.email}>",
@@ -102,8 +110,7 @@ class ReplyMode < EditMessageMode
 protected
 
   def reply_body_lines m
-    lines = ["Excerpts from #{@m.from.name}'s message of #{@m.date}:"] + 
-      m.basic_body_lines.map { |l| "> #{l}" }
+    lines = ["Excerpts from #{@m.from.name}'s message of #{@m.date}:"] + m.quotable_body_lines.map { |l| "> #{l}" }
     lines.pop while lines.last =~ /^\s*$/
     lines
   end
@@ -121,11 +128,12 @@ protected
     (@m.refs + [@m.id]).map { |x| "<#{x}>" }.join(" ")
   end
 
-  def edit_field
-    @selected_type = :user
-    self.header = @headers[:user]
-    update
-    super
+  def edit_field field
+    edited_field = super
+    if edited_field && edited_field != "Subject"
+      @selected_type = :user
+      update
+    end
   end
   
   def move_cursor_left

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

@@ -24,6 +24,8 @@ class ScrollMode < Mode
     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", '['
+    k.add :search_in_buffer, "Search in current buffer", '/'
+    k.add :continue_search_in_buffer, "Jump to next search occurrence in buffer", BufferManager::CONTINUE_IN_BUFFER_SEARCH_KEY
   end
 
   def initialize opts={}
@@ -31,6 +33,9 @@ class ScrollMode < Mode
     @slip_rows = opts[:slip_rows] || 0 # when we pgup/pgdown,
                                        # how many lines do we keep?
     @twiddles = opts.member?(:twiddles) ? opts[:twiddles] : true
+    @search_query = nil
+    @search_line = nil
+    @status = ""
     super()
   end
 
@@ -49,6 +54,41 @@ class ScrollMode < Mode
     @status = "lines #{@topline + 1}:#{@botline}/#{lines}"
   end
 
+  def in_search?; @search_line end
+  def cancel_search!; @search_line = nil end
+
+  def continue_search_in_buffer
+    unless @search_query
+      BufferManager.flash "No current search!"
+      return
+    end
+
+    start = @search_line || search_start_line
+    line = find_text @search_query, start
+    if line.nil? && (start > 0)
+      line = find_text @search_query, 0
+      BufferManager.flash "Search wrapped to top!" if line
+    end
+    if line
+      @search_line = line + 1
+      search_goto_line line
+      buffer.mark_dirty
+    else
+      BufferManager.flash "Not found!"
+    end
+  end
+
+  def search_in_buffer
+    query = BufferManager.ask :search, "search in buffer: "
+    return if query.nil? || query.empty?
+    @search_query = Regexp.escape query
+    continue_search_in_buffer
+  end
+
+  ## subclasses can override these two!
+  def search_goto_line line; jump_to_line line end
+  def search_start_line; @topline end
+
   def col_left
     return unless @leftcol > 0
     @leftcol -= COL_JUMP
@@ -98,40 +138,91 @@ class ScrollMode < Mode
 
 protected
 
+  def find_text query, start_line
+    regex = /#{query}/i
+    (start_line ... lines).each do |i|
+      case(s = self[i])
+      when String
+        return i if s =~ regex
+      when Array
+        return i if s.any? { |color, string| string =~ regex }
+      end
+    end
+    nil
+  end
+
   def draw_line ln, opts={}
+    regex = /(#{@search_query})/i
     case(s = self[ln])
     when String
-      buffer.write ln - @topline, 0, s[@leftcol .. -1],
-                   :highlight => opts[:highlight]
+      if in_search?
+        draw_line_from_array ln, matching_text_array(s, regex), opts
+      else
+        draw_line_from_string ln, s, opts
+      end
     when Array
-      xpos = 0
+      if in_search?
+        ## seems like there ought to be a better way of doing this
+        array = []
+        s.each do |color, text| 
+          if text =~ regex
+            array += matching_text_array text, regex, color
+          else
+            array << [color, text]
+          end
+        end
+        draw_line_from_array ln, array, opts
+      else
+        draw_line_from_array ln, s, opts
+      end
+    else
+      raise "unknown drawable object: #{s.inspect}" # good for debugging
+    end
 
       ## speed test
       # str = s.map { |color, text| text }.join
       # buffer.write ln - @topline, 0, str, :color => :none, :highlight => opts[:highlight]
       # return
+  end
 
-      s.each do |color, text|
-        raise "nil text for color '#{color}'" if text.nil? # good for debugging
-        if xpos + text.length < @leftcol
-          buffer.write ln - @topline, 0, "", :color => color,
-                       :highlight => opts[:highlight]
-          xpos += text.length
-        elsif xpos < @leftcol
-          ## partial
-          buffer.write ln - @topline, 0, text[(@leftcol - xpos) .. -1],
-                       :color => color,
-                       :highlight => opts[:highlight]
-          xpos += text.length
-        else
-          buffer.write ln - @topline, xpos - @leftcol, text,
-                       :color => color, :highlight => opts[:highlight]
-          xpos += text.length
-        end
+  def matching_text_array s, regex, oldcolor=:none
+    s.split(regex).map do |text|
+      next if text.empty?
+      if text =~ regex
+        [:search_highlight_color, text]
+      else
+        [oldcolor, text]
+      end
+    end.compact + [[oldcolor, ""]]
+  end
 
+  def draw_line_from_array ln, a, opts
+    xpos = 0
+    a.each do |color, text|
+      raise "nil text for color '#{color}'" if text.nil? # good for debugging
+      
+      if xpos + text.length < @leftcol
+        buffer.write ln - @topline, 0, "", :color => color,
+                     :highlight => opts[:highlight]
+        xpos += text.length
+      elsif xpos < @leftcol
+        ## partial
+        buffer.write ln - @topline, 0, text[(@leftcol - xpos) .. -1],
+                     :color => color,
+                     :highlight => opts[:highlight]
+        xpos += text.length
+      else
+        buffer.write ln - @topline, xpos - @leftcol, text,
+                     :color => color, :highlight => opts[:highlight]
+        xpos += text.length
       end
     end
   end
+
+  def draw_line_from_string ln, s, opts
+    buffer.write ln - @topline, 0, s[@leftcol .. -1], :highlight => opts[:highlight]
+  end
 end
 
 end
+