sup 0.0.8 → 0.1

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

@@ -1,22 +1,14 @@
 module Redwood
 
 class ForwardMode < EditMessageMode
-  attr_reader :body, :header
-
   def initialize m
-    super()
-    @header = {
+    super :header => {
       "From" => AccountManager.default_account.full_address,
       "Subject" => "Fwd: #{m.subj}",
-      "Message-Id" => gen_message_id,
-    }
-    @body = forward_body_lines(m) + sig_lines
-    regen_text
+    },
+         :body => forward_body_lines(m)
   end
 
-  def lines; @text.length; end
-  def [] i; @text[i]; end
-
 protected
 
   def forward_body_lines m
@@ -24,15 +16,6 @@ protected
       m.basic_header_lines + [""] + m.basic_body_lines +
       ["--- End forwarded message ---"]
   end
-
-  def handle_new_text new_header, new_body
-    @header = new_header
-    @body = new_body
-  end
-
-  def regen_text
-    @text = header_lines(@header - NON_EDITABLE_HEADERS) + [""] + @body
-  end
 end
 
 end

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

@@ -9,12 +9,20 @@ class InboxMode < ThreadIndexMode
   end
 
   def initialize
-    super [:inbox], [:inbox]
+    super [:inbox, :sent], { :label => :inbox }
+    raise "can't have more than one!" if defined? @@instance
+    @@instance = self
   end
 
+  def is_relevant? m; m.has_label? :inbox; 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
+  def self.instance; @@instance; end
   def killable?; false; end
 
   def archive
+    return unless cursor_thread
     cursor_thread.remove_label :inbox
     hide_thread cursor_thread
     regen_text
@@ -44,17 +52,6 @@ class InboxMode < ThreadIndexMode
   def status
     super + "    #{Index.size} messages in index"
   end
-
-  def is_relevant? m; m.has_label? :inbox; end
-
-  def load_threads opts={}
-    n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
-    load_n_threads_background n, :label => :inbox,
-                                 :when_done => (lambda do |num|
-      opts[:when_done].call if opts[:when_done]
-      BufferManager.flash "Added #{num} threads."
-    end)
-  end
 end
 
 end

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

@@ -2,79 +2,61 @@ module Redwood
 
 class LabelListMode < LineCursorMode
   register_keymap do |k|
-    k.add :view_results, "View messages with the selected label", :enter
-    k.add :reload, "Discard results and reload", 'D'
+    k.add :select_label, "Select label", :enter
+    k.add :reload, "Discard label list and reload", 'D'
   end
 
+  bool_reader :done
+  attr_reader :value
+
   def initialize
     @labels = []
     @text = []
-    super()
+    @done = false
+    @value = nil
+    super
+    regen_text
   end
 
-  def lines; @text.length; end
-  def [] i; @text[i]; end
-
-  def load_in_background
-    Redwood::reporting_thread do
-      BufferManager.say("Counting labels...") { regen_text }
-      BufferManager.draw_screen
-    end
-  end
+  def lines; @text.length end
+  def [] i; @text[i] end
 
 protected
 
   def reload
-    buffer.mark_dirty
-    BufferManager.draw_screen
-    load_in_background
+    regen_text
+    buffer.mark_dirty if buffer
   end
   
   def regen_text
     @text = []
-    @labels = (LabelManager::LISTABLE_LABELS + LabelManager.user_labels).sort_by { |t| t.to_s }
+    @labels = LabelManager.listable_label_strings
 
-    counts = @labels.map do |t|
-      total = Index.num_results_for :label => t
-      unread = Index.num_results_for :labels => [t, :unread]
-      [t, total, unread]
+    counts = @labels.map do |string|
+      label = LabelManager.label_for string
+      total = Index.num_results_for :label => label
+      unread = Index.num_results_for :labels => [label, :unread]
+      [label, string, total, unread]
     end      
 
-    width = @labels.map { |t| t.to_s.length }.max
+    width = @labels.max_of { |string| string.length }
 
-    counts.map_with_index do |(t, total, unread), i|
-      if total == 0 && !LabelManager::LISTABLE_LABELS.include?(t)
-        Redwood::log "no hits for label #{t}, deleting"
-        LabelManager.delete t
-        @labels.delete t
+    counts.map do |label, string, total, unread|
+      if total == 0 && !LabelManager::RESERVED_LABELS.include?(label)
+        Redwood::log "no hits for label #{label}, deleting"
+        LabelManager.delete label
         next
       end
 
-      label =
-        case t
-        when *LabelManager::LISTABLE_LABELS
-          t.to_s.ucfirst
-        else
-          t.to_s
-        end
       @text << [[(unread == 0 ? :labellist_old_color : :labellist_new_color),
-          sprintf("%#{width + 1}s %5d %s, %5d unread", label, total, total == 1 ? " message" : "messages", unread)]]
+          sprintf("%#{width + 1}s %5d %s, %5d unread", string, total, total == 1 ? " message" : "messages", unread)]]
       yield i if block_given?
     end.compact
-
-    buffer.mark_dirty
   end
 
-  def view_results
-    label = @labels[curpos]
-    if label == :inbox
-      BufferManager.raise_to_front BufferManager["inbox"]
-    else
-      b = BufferManager.spawn_unless_exists(label) do
-        mode = LabelSearchResultsMode.new [label]
-      end
-      b.mode.load_threads :num => b.content_height
-    end
+  def select_label
+    @value, string = @labels[curpos]
+    @done = true if @value
   end
 end
 

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

@@ -3,25 +3,10 @@ module Redwood
 class LabelSearchResultsMode < ThreadIndexMode
   def initialize labels
     @labels = labels
-    super
+    super [], { :labels => @labels }
   end
 
   def is_relevant? m; @labels.all? { |l| m.has_label? l }; end
-
-  def load_threads opts={}
-    n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
-    load_n_threads_background n, :labels => @labels,
-                                 :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/line-cursor-mode.rb

@@ -1,5 +1,6 @@
 module Redwood
 
+## extends ScrollMode to have a line-based cursor.
 class LineCursorMode < ScrollMode
   register_keymap do |k|
     ## overwrite scrollmode binding on arrow keys for cursor movement
@@ -11,9 +12,11 @@ class LineCursorMode < ScrollMode
 
   attr_reader :curpos
 
-  def initialize cursor_top=0, opts={}
-    @cursor_top = cursor_top
-    @curpos = cursor_top
+  def initialize opts={}
+    @cursor_top = @curpos = opts.delete(:skip_top_rows) || 0
+    @load_more_callbacks = []
+    @load_more_callbacks_m = Mutex.new
+    @load_more_callbacks_active = false
     super opts
   end
 
@@ -24,6 +27,11 @@ class LineCursorMode < ScrollMode
 
 protected
 
+  ## callbacks when the cursor is asked to go beyond the bottom
+  def to_load_more &b
+    @load_more_callbacks << b
+  end
+
   def draw_line ln, opts={}
     if ln == @curpos
       super ln, :highlight => true, :debug => opts[:debug]
@@ -49,6 +57,7 @@ protected
 
   def line_down # overwrite scrollmode
     super
+    call_load_more_callbacks([topline + buffer.content_height - lines, 10].max) if topline + buffer.content_height > lines
     set_cursor_pos topline if @curpos < topline
   end
 
@@ -58,7 +67,9 @@ protected
   end
 
   def cursor_down
+    call_load_more_callbacks buffer.content_height if @curpos == lines - 1
     return false unless @curpos < lines - 1
+
     if @curpos >= botline - 1
       page_down
       set_cursor_pos topline
@@ -102,9 +113,21 @@ protected
     end
   end
 
+  ## more complicated than one might think. three behaviors.
   def page_down
-    if topline >= lines - buffer.content_height
+    ## if we're on the last page, and it's not a full page, just move
+    ## the cursor down to the bottom and assume we can't load anything
+    ## else via the callbacks.
+    if topline > lines - buffer.content_height
       set_cursor_pos(lines - 1)
+
+    ## if we're on the last page, and it's a full page, try and load
+    ## more lines via the callbacks and then shift the page down
+    elsif topline == lines - buffer.content_height
+      call_load_more_callbacks buffer.content_height
+      super
+
+    ## otherwise, just move down
     else
       relpos = @curpos - topline
       super
@@ -112,7 +135,7 @@ protected
     end
   end
 
-  def jump_to_home
+  def jump_to_start
     super
     set_cursor_pos @cursor_top
   end
@@ -129,6 +152,22 @@ private
     @status = l > 0 ? "line #{@curpos + 1} of #{l}" : ""
   end
 
+  def call_load_more_callbacks size
+    go = 
+      @load_more_callbacks_m.synchronize do
+        if @load_more_callbacks_active
+          false
+        else
+          @load_more_callbacks_active = true
+        end
+    end
+
+    return unless go
+
+    @load_more_callbacks.each { |c| c.call size }
+    @load_more_callbacks_active = false
+  end    
+
 end
 
 end

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

@@ -3,25 +3,10 @@ module Redwood
 class PersonSearchResultsMode < ThreadIndexMode
   def initialize people
     @people = people
-    super
+    super [], { :participants => @people }
   end
 
   def is_relevant? m; @people.any? { |p| m.from == p }; end
-
-  def load_threads opts={}
-    n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
-    load_n_threads_background n, :participants => @people,
-                                 :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/reply-mode.rb

@@ -16,26 +16,24 @@ class ReplyMode < EditMessageMode
   end
 
   def initialize message
-    super 2, :twiddles => false
     @m = message
 
     ## it's important to put this early because it forces a read of
     ## the full headers (most importantly the list-post header, if
     ## any)
-    @body = reply_body_lines(message)
+    body = reply_body_lines message
 
     from =
       if @m.recipient_email
-        AccountManager.account_for(@m.recipient_email)
+        AccountManager.account_for @m.recipient_email
       else
         (@m.to + @m.cc).find { |p| AccountManager.is_account? p }
       end || AccountManager.default_account
 
-    #from_email = @m.recipient_email || from.email
     from_email = from.email
 
     ## ignore reply-to for list messages because it's typically set to
-    ## the list address anyways
+    ## the list address, which we explicitly treat with :list
     to = @m.is_list_message? ? @m.from : (@m.replyto || @m.from)
     cc = (@m.to + @m.cc - [from, to]).uniq
 
@@ -57,7 +55,7 @@ class ReplyMode < EditMessageMode
     @headers[:all] = {
       "From" => "#{from.name} <#{from_email}>",
       "To" => [to.full_address],
-      "Cc" => cc.map { |p| p.full_address },
+      "Cc" => cc.select { |p| !AccountManager.is_account?(p) }.map { |p| p.full_address },
     } unless cc.empty?
 
     @headers[:list] = {
@@ -66,7 +64,6 @@ class ReplyMode < EditMessageMode
     } if @m.is_list_message?
 
     refs = gen_references
-    mid = gen_message_id
     @headers.each do |k, v|
       @headers[k] = {
                "To" => "",
@@ -74,7 +71,6 @@ class ReplyMode < EditMessageMode
                "Bcc" => "",
                "In-Reply-To" => "<#{@m.id}>",
                "Subject" => Message.reify_subj(@m.subj),
-               "Message-Id" => mid,
                "References" => refs,
              }.merge v
     end
@@ -89,33 +85,27 @@ class ReplyMode < EditMessageMode
         :recipient
       end
 
-    @body += sig_lines
-    regen_text
+    super :header => @headers[@selected_type], :body => body,
+          :skip_top_rows => 2, :twiddles => false
   end
 
-  def lines; @text.length + 2; end
+  def lines; super + 2; end
   def [] i
     case i
     when 0
-      lame = []
-      @type_labels.each do |t|
-        lame << [(t == @selected_type ? :none_highlight : :none), 
-          "#{TYPE_DESCRIPTIONS[t]}"]
-        lame << [:none, "  "]
-      end
-      lame + [[:none, ""]]
+      @type_labels.inject([]) do |array, t|
+        array + [[(t == @selected_type ? :none_highlight : :none), 
+          "#{TYPE_DESCRIPTIONS[t]}"], [:none, "  "]]
+      end + [[:none, ""]]
     when 1
       ""
     else
-      @text[i - 2]
+      super(i - 2)
     end
   end
 
 protected
 
-  def body; @body; end
-  def header; @headers[@selected_type]; end
-
   def reply_body_lines m
     lines = ["Excerpts from #{@m.from.name}'s message of #{@m.date}:"] + 
       m.basic_body_lines.map { |l| "> #{l}" }
@@ -124,19 +114,14 @@ protected
   end
 
   def handle_new_text new_header, new_body
-    @body = new_body
-
-    if new_header.size != header.size ||
-        header.any? { |k, v| new_header[k] != v }
+    old_header = @headers[@selected_type]
+    if new_header.size != old_header.size || old_header.any? { |k, v| new_header[k] != v }
       @selected_type = :user
-      @headers[:user] = new_header
+      self.header = @headers[:user] = new_header
+      update
     end
   end
 
-  def regen_text
-    @text = header_lines(header - NON_EDITABLE_HEADERS) + [""] + body
-  end
-
   def gen_references
     (@m.refs + [@m.id]).map { |x| "<#{x}>" }.join(" ")
   end
@@ -144,12 +129,14 @@ protected
   def move_cursor_left
     i = @type_labels.index @selected_type
     @selected_type = @type_labels[(i - 1) % @type_labels.length]
+    self.header = @headers[@selected_type]
     update
   end
 
   def move_cursor_right
     i = @type_labels.index @selected_type
     @selected_type = @type_labels[(i + 1) % @type_labels.length]
+    self.header = @headers[@selected_type]
     update
   end
 end