sup 0.0.4 → 0.0.5

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

@@ -15,7 +15,7 @@ class ContactListMode < LineCursorMode
   def initialize mode = :regular
     @mode = mode
     @tags = Tagger.new self
-    reload
+    @num = 0
     super()
   end
 
@@ -37,10 +37,10 @@ class ContactListMode < LineCursorMode
   def apply_to_tagged; @tags.apply_to_tagged; end
 
   def load; regen_text; end
-  def load_more
-    @num += LOAD_MORE_CONTACTS_NUM
+  def load_more num=LOAD_MORE_CONTACTS_NUM
+    @num += num
     regen_text
-    BufferManager.flash "Loaded #{LOAD_MORE_CONTACTS_NUM} more contacts."
+    BufferManager.flash "Added #{num} contacts."
   end
 
   def multi_select people
@@ -60,7 +60,7 @@ class ContactListMode < LineCursorMode
   def multi_search people
     mode = PersonSearchResultsMode.new people
     BufferManager.spawn "personal search results", mode
-    mode.load_more_threads :num => mode.buffer.content_height
+    mode.load_threads :num => mode.buffer.content_height
   end
 
   def search
@@ -70,7 +70,6 @@ class ContactListMode < LineCursorMode
 
   def reload
     @tags.drop_all_tags
-    @num = LOAD_MORE_CONTACTS_NUM
     load
   end
 
@@ -101,8 +100,7 @@ protected
 
   def regen_text
     @user_contacts = ContactManager.contacts.invert
-    recent = Index.load_contacts AccountManager.user_emails,
-                                 :num => @num
+    recent = Index.load_contacts AccountManager.user_emails, :num => [@num - @user_contacts.length, 0].max
     
     @contacts = (@user_contacts.keys + recent.select { |p| !@user_contacts[p] }).sort_by { |p| p.sort_by_me + (p.name || "") + p.email }.remove_successive_dupes
 

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

@@ -6,8 +6,6 @@ class InboxMode < ThreadIndexMode
   register_keymap do |k|
     ## overwrite toggle_archived with archive
     k.add :archive, "Archive thread (remove from inbox)", 'a'
-    k.add :load_more_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M'
-    k.add :reload, "Discard threads and reload", 'D'
   end
 
   def initialize
@@ -28,7 +26,7 @@ class InboxMode < ThreadIndexMode
 
   def is_relevant? m; m.has_label? :inbox; end
 
-  def load_more_threads opts={}
+  def load_threads opts={}
     n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
     load_n_threads_background n, :label => :inbox,
                                  :load_killed => false,
@@ -38,12 +36,6 @@ class InboxMode < ThreadIndexMode
       BufferManager.flash "Added #{num} threads."
     end)
   end
-
-  def reload
-    drop_all_threads
-    BufferManager.draw_screen
-    load_more_threads :num => buffer.content_height
-  end
 end
 
 end

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

@@ -81,7 +81,7 @@ protected
       b = BufferManager.spawn_unless_exists(label) do
         mode = LabelSearchResultsMode.new [label]
       end
-      b.mode.load_more_threads :num => b.content_height
+      b.mode.load_threads :num => b.content_height
     end
   end
 end

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

@@ -1,10 +1,6 @@
 module Redwood
 
 class LabelSearchResultsMode < ThreadIndexMode
-  register_keymap do |k|
-    k.add :load_more_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M'
-  end
-
   def initialize labels
     @labels = labels
     super
@@ -12,7 +8,7 @@ class LabelSearchResultsMode < ThreadIndexMode
 
   def is_relevant? m; @labels.all? { |l| m.has_label? l }; end
 
-  def load_more_threads opts={}
+  def load_threads opts={}
     n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
     load_n_threads_background n, :labels => @labels,
                                  :load_killed => true,

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

@@ -124,7 +124,8 @@ protected
 private
 
   def set_status
-    @status = "line #{@curpos + 1} of #{lines}"
+    l = lines
+    @status = l > 0 ? "line #{@curpos + 1} of #{l}" : ""
   end
 
 end

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

@@ -1,10 +1,6 @@
 module Redwood
 
 class PersonSearchResultsMode < ThreadIndexMode
-  register_keymap do |k|
-    k.add :load_more_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M'
-  end
-
   def initialize people
     @people = people
     super
@@ -12,7 +8,7 @@ class PersonSearchResultsMode < ThreadIndexMode
 
   def is_relevant? m; @people.any? { |p| m.from == p }; end
 
-  def load_more_threads opts={}
+  def load_threads opts={}
     n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
     load_n_threads_background n, :participants => @people,
                                  :load_killed => true,

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

@@ -18,11 +18,16 @@ class ReplyMode < EditMessageMode
     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)
+
     from =
       if @m.recipient_email
         AccountManager.account_for(@m.recipient_email)
       else
-        (@m.to + @m.cc).argfind { |p| AccountManager.is_account? p }
+        (@m.to + @m.cc).find { |p| AccountManager.is_account? p }
       end || AccountManager.default_account
 
     from_email = @m.recipient_email || from.email
@@ -70,7 +75,7 @@ class ReplyMode < EditMessageMode
     @type_labels = REPLY_TYPES.select { |t| @headers.member?(t) }
     @selected_type = @m.is_list_message? ? :list : :sender
 
-    @body = reply_body_lines(message) + sig_lines
+    @body += sig_lines
     regen_text
   end
 

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

@@ -49,11 +49,13 @@ class ScrollMode < Mode
     buffer.mark_dirty
   end
 
-  def jump_to_left
-    buffer.mark_dirty unless @leftcol == 0
-    @leftcol = 0
+  def jump_to_col col
+    buffer.mark_dirty unless @leftcol == col
+    @leftcol = col
   end
 
+  def jump_to_left; jump_to_col 0; end
+
   ## set top line to l
   def jump_to_line l
     l = l.clamp 0, lines - 1

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

@@ -1,10 +1,6 @@
 module Redwood
 
 class SearchResultsMode < ThreadIndexMode
-  register_keymap do |k|
-    k.add :load_more_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M'
-  end
-
   def initialize qobj
     @qobj = qobj
     super
@@ -13,7 +9,7 @@ class SearchResultsMode < ThreadIndexMode
   ## TODO: think about this
   def is_relevant? m; super; end
 
-  def load_more_threads opts={}
+  def load_threads opts={}
     n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM
     load_n_threads_background n, :qobj => @qobj,
                                  :load_killed => true,

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

@@ -1,18 +1,22 @@
 module Redwood
 
+## subclasses should implement load_threads
+
 class ThreadIndexMode < LineCursorMode
   DATE_WIDTH = Time::TO_NICE_S_MAX_LEN
   FROM_WIDTH = 15
   LOAD_MORE_THREAD_NUM = 20
 
   register_keymap do |k|
+    k.add :load_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M'
+    k.add :reload, "Discard threads and reload", 'D'
     k.add :toggle_archived, "Toggle archived status", 'a'
     k.add :toggle_starred, "Star or unstar all messages in thread", '*'
     k.add :toggle_new, "Toggle new/read status of all messages in thread", 'N'
     k.add :edit_labels, "Edit or add labels for a thread", 'l'
     k.add :edit_message, "Edit message (drafts only)", 'e'
     k.add :mark_as_spam, "Mark thread as spam", 'S'
-    k.add :kill, "Kill thread (never to be seen in inbox again)", 'K'
+    k.add :kill, "Kill thread (never to be seen in inbox again)", '&'
     k.add :save, "Save changes now", '$'
     k.add :jump_to_next_new, "Jump to next new thread", :tab
     k.add :reply, "Reply to a thread", 'r'
@@ -41,10 +45,15 @@ class ThreadIndexMode < LineCursorMode
   def lines; @text.length; end
   def [] i; @text[i]; end
 
+  def reload
+    drop_all_threads
+    BufferManager.draw_screen
+    load_threads :num => buffer.content_height
+  end
+
   ## open up a thread view window
-  def select
-    this_curpos = curpos
-    t = @threads[this_curpos]
+  def select t=nil
+    t ||= @threads[curpos]
 
     ## TODO: don't regen text completely
     Redwood::reporting_thread do
@@ -53,6 +62,10 @@ class ThreadIndexMode < LineCursorMode
       BufferManager.draw_screen
     end
   end
+
+  def multi_select threads
+    threads.each { |t| select t }
+  end
   
   def handle_starred_update m
     return unless(t = @ts.thread_for m)
@@ -161,7 +174,7 @@ class ThreadIndexMode < LineCursorMode
 
   def multi_mark_as_spam threads
     threads.each do |t|
-      t.apply_label :spam
+      t.toggle_label :spam
       hide_thread t
     end
     regen_text
@@ -182,15 +195,14 @@ class ThreadIndexMode < LineCursorMode
 
   def save
     threads = @threads + @hidden_threads.keys
-    mbid = BufferManager.say "Saving threads..."
-    threads.each_with_index do |t, i|
-      if i % 5 == 0
-        BufferManager.say "Saving thread #{i + 1} of #{threads.length}...",
-                          mbid
+
+    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
+        t.save Index
       end
-      t.save Index
     end
-    BufferManager.clear mbid
   end
 
   def cleanup
@@ -296,7 +308,11 @@ class ThreadIndexMode < LineCursorMode
   end
 
   def status
-    "line #{curpos + 1} of #{lines} #{dirty? ? '*modified*' : ''}"
+    if (l = lines) == 0
+      ""
+    else
+      "line #{curpos + 1} of #{l} #{dirty? ? '*modified*' : ''}"
+    end
   end
 
 protected

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

@@ -25,26 +25,20 @@ class ThreadViewMode < LineCursorMode
     @state = {}
     @hidden_labels = hidden_labels
 
-    earliest = nil
-    latest = nil
+    earliest, latest = nil, nil
     latest_date = nil
     @thread.each do |m, d, p|
       next unless m
       earliest ||= m
-      @state[m] = 
-        if m.has_label?(:unread) && m == earliest
-          :detailed
-        elsif m.has_label?(:starred) || m.has_label?(:unread)
-          :open
-        else
-          :closed
-        end
+      @state[m] = initial_state_for m
       if latest_date.nil? || m.date > latest_date
         latest_date = m.date
         latest = m
       end
     end
+
     @state[latest] = :open if @state[latest] == :closed
+    @state[earliest] = :detailed if earliest.has_label?(:unread) || @thread.size == 1
 
     BufferManager.say "Loading message bodies..." do
       regen_chunks
@@ -106,6 +100,7 @@ class ThreadViewMode < LineCursorMode
     case chunk
     when Message, Message::Quote, Message::Signature
       @state[chunk] = (@state[chunk] != :closed ? :closed : :open)
+      cursor_down if @state[chunk] == :closed
     when Message::Attachment
       view_attachment chunk
     end
@@ -164,8 +159,8 @@ class ThreadViewMode < LineCursorMode
     ## otherwise, to the previous message
     top = @messages[m][0]
     if curpos == top
-      while prevm = @messages[m][2]
-        break if @state[prevm] == :open
+      while(prevm = @messages[m][2])
+        break if @state[prevm] != :closed
         m = prevm
       end
       jump_to_message prevm if prevm
@@ -175,9 +170,10 @@ class ThreadViewMode < LineCursorMode
   end
 
   def jump_to_message m
-    top, bot, prevm, nextm = @messages[m]
+    top, bot, prevm, nextm, depth = @messages[m]
     jump_to_line top unless top >= topline &&
       top <= botline && bot >= topline && bot <= botline
+    jump_to_col depth * 2 # sorry!!!! TODO: make this a constant
     set_cursor_pos top
   end
 
@@ -199,18 +195,19 @@ class ThreadViewMode < LineCursorMode
       quotes = @chunks[m].select { |c| c.is_a?(Message::Quote) || c.is_a?(Message::Signature) }
       open, closed = quotes.partition { |c| @state[c] == :open }
       newstate = open.length > closed.length ? :closed : :open
-      Redwood::log "#{open.length} opened, #{closed.length} closed, new state is thus #{newstate}"
       quotes.each { |c| @state[c] = newstate }
       update
     end
   end
 
-  ## not sure if this is really necessary but we might as well...
+  ## kinda slow for large threads. TODO: fasterify
   def cleanup
-    @thread.each do |m, d, p|
-      if m && m.has_label?(:unread)
-        m.remove_label :unread 
-        UpdateManager.relay :read, m
+    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
     @messages = @chunks = @text = nil
@@ -218,6 +215,14 @@ class ThreadViewMode < LineCursorMode
 
 private 
 
+  def initial_state_for m
+    if m.has_label?(:starred) || m.has_label?(:unread)
+      :open
+    else
+      :closed
+    end
+  end
+
   def update
     regen_text
     buffer.mark_dirty if buffer
@@ -236,15 +241,27 @@ private
 
     prev_m = nil
     @thread.each do |m, depth, parent|
+      ## 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' might not be valid, but i don't see that as a huge
+      ## issue.
+      @state[m] ||= initial_state_for m if m
+
       text = chunk_to_lines m, @state[m], @text.length, depth, parent
       (0 ... text.length).each do |i|
         @chunk_lines[@text.length + i] = m
         @message_lines[@text.length + i] = m
       end
 
-      @messages[m] = [@text.length, @text.length + text.length, prev_m, nil]
+      ## sorry i store all this shit in an array. very, very sorry.
+      ## also sorry about the * 2. very, very sorry.
+      @messages[m] = [@text.length, @text.length + text.length, prev_m, nil, depth]
       @messages[prev_m][3] = m if prev_m
-      prev_m = m
+      prev_m = m if m.is_a? Message
 
       @text += text
       if @state[m] != :closed && @chunks.member?(m)
@@ -283,7 +300,6 @@ private
       [[prefix_widget, widget, imp_widget,
         [:message_patina_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})"]]]
-#        (m.to.empty? ? [] : [[[:message_patina_color, prefix + "    To: " + m.recipients.map { |x| x.mediumname }.join(", ")]]]) +
     when :closed
       [[prefix_widget, widget, imp_widget,
         [:message_patina_color, 
@@ -323,13 +339,12 @@ private
     when Message
       message_patina_lines(chunk, state, parent, prefix) +
         (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 + ')': ''}"]]]
     when Message::Text
       t = chunk.lines
-      if t.last =~ /^\s*$/
-        t.pop while t[t.length - 2] =~ /^\s*$/
+      if t.last =~ /^\s*$/ && t.length > 1
+        t.pop while t[-2] =~ /^\s*$/ # pop until only one file empty line
       end
       t.map { |line| [[:none, "#{prefix}#{line}"]] }
     when Message::Quote