sup 0.0.6 → 0.0.7

data/lib/sup/modes/edit-message-mode.rb

@@ -9,6 +9,7 @@ class EditMessageMode < LineCursorMode
   NON_EDITABLE_HEADERS = %w(Message-Id Date)
 
   attr_reader :status
+  bool_reader :edited
 
   register_keymap do |k|
     k.add :send_message, "Send message", 'y'
@@ -23,7 +24,7 @@ class EditMessageMode < LineCursorMode
   end
 
   def edit
-    @file = Tempfile.new "redwood.#{self.class.name.camel_to_hyphy}"
+    @file = Tempfile.new "sup.#{self.class.name.gsub(/.*::/, '').camel_to_hyphy}"
     @file.puts header_lines(header - NON_EDITABLE_HEADERS)
     @file.puts
     @file.puts body
@@ -41,10 +42,14 @@ class EditMessageMode < LineCursorMode
     update
   end
 
+  def killable?
+    !edited? || BufferManager.ask_yes_or_no("Discard message?")
+  end
+
 protected
 
   def gen_message_id
-    "<#{Time.now.to_i}-redwood-#{rand 10000}@#{Socket.gethostname}>"
+    "<#{Time.now.to_i}-sup-#{rand 10000}@#{Socket.gethostname}>"
   end
 
   def update
@@ -55,13 +60,13 @@ protected
   def parse_file fn
     File.open(fn) do |f|
       header = MBox::read_header f
-      body = MBox::read_body f
+      body = f.readlines
 
       header.delete_if { |k, v| NON_EDITABLE_HEADERS.member? k }
       header.each do |k, v|
         next unless MULTI_HEADERS.include?(k) && !v.empty?
         header[k] = v.split_on_commas.map do |name|
-          (p = ContactManager.resolve(name)) && p.full_address || name
+          (p = ContactManager.person_with(name)) && p.full_address || name
         end
       end
 
@@ -101,7 +106,7 @@ protected
   end
 
   def send_message
-    return false unless @edited || BufferManager.ask_yes_or_no("Message unedited. Really send?")
+    return unless edited? || BufferManager.ask_yes_or_no("Message unedited. Really send?")
 
     raise "no message id!" unless header["Message-Id"]
     date = Time.now
@@ -114,20 +119,18 @@ protected
 
     acct = AccountManager.account_for(from_email) || AccountManager.default_account
     SentManager.write_sent_message(date, from_email) { |f| write_message f, true, date }
-    BufferManager.flash "sending..."
+    BufferManager.flash "Sending..."
 
     IO.popen(acct.sendmail, "w") { |p| write_message p, true, date }
 
     BufferManager.kill_buffer buffer
     BufferManager.flash "Message sent!"
-    true
   end
 
   def save_as_draft
     DraftManager.write_draft { |f| write_message f, false }
     BufferManager.kill_buffer buffer
     BufferManager.flash "Saved for later editing."
-    true
   end
 
   def sig_lines

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

@@ -15,7 +15,8 @@ class InboxMode < ThreadIndexMode
   def killable?; false; end
 
   def archive
-    remove_label_and_hide_thread cursor_thread, :inbox
+    cursor_thread.remove_label :inbox
+    hide_thread cursor_thread
     regen_text
   end
 
@@ -24,13 +25,28 @@ class InboxMode < ThreadIndexMode
     regen_text
   end
 
+  def handle_archived_update sender, t
+    if contains_thread? t
+      hide_thread t
+      regen_text
+    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
+
   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,
-                                 :load_killed => false,
-                                 :load_spam => false,
                                  :when_done => (lambda do |num|
       opts[:when_done].call if opts[:when_done]
       BufferManager.flash "Added #{num} threads."

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

@@ -15,18 +15,9 @@ class LabelListMode < LineCursorMode
   def lines; @text.length; end
   def [] i; @text[i]; end
 
-  def load; regen_text; end
-
   def load_in_background
     Redwood::reporting_thread do
-      regen_text do |i|
-        if i % 10 == 0
-          buffer.mark_dirty
-          BufferManager.draw_screen
-          sleep 0.1 # ok, dirty trick.
-        end
-      end
-      buffer.mark_dirty
+      BufferManager.say("Counting labels...") { regen_text }
       BufferManager.draw_screen
     end
   end
@@ -41,8 +32,7 @@ protected
   
   def regen_text
     @text = []
-    @labels = LabelManager::LISTABLE_LABELS.sort_by { |t| t.to_s } +
-                LabelManager.user_labels.sort_by { |t| t.to_s }
+    @labels = (LabelManager::LISTABLE_LABELS + LabelManager.user_labels).sort_by { |t| t.to_s }
 
     counts = @labels.map do |t|
       total = Index.num_results_for :label => t
@@ -71,6 +61,8 @@ protected
           sprintf("%#{width + 1}s %5d %s, %5d unread", label, total, total == 1 ? " message" : "messages", unread)]]
       yield i if block_given?
     end.compact
+
+    buffer.mark_dirty
   end
 
   def view_results

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

@@ -3,6 +3,7 @@ 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
@@ -36,6 +37,11 @@ class LogMode < TextMode
     end
   end
 
+  def save_to_disk
+    fn = BufferManager.ask :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/reply-mode.rb

@@ -1,9 +1,10 @@
 module Redwood
 
 class ReplyMode < EditMessageMode
-  REPLY_TYPES = [:sender, :list, :all, :user]
+  REPLY_TYPES = [:sender, :recipient, :list, :all, :user]
   TYPE_DESCRIPTIONS = {
     :sender => "Reply to sender",
+    :recipient => "Reply to recipient",
     :all => "Reply to all",
     :list => "Reply to mailing list",
     :user => "Customized reply"
@@ -30,7 +31,8 @@ class ReplyMode < EditMessageMode
         (@m.to + @m.cc).find { |p| AccountManager.is_account? p }
       end || AccountManager.default_account
 
-    from_email = @m.recipient_email || from.email
+    #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
@@ -41,7 +43,12 @@ class ReplyMode < EditMessageMode
     @headers[:sender] = {
       "From" => "#{from.name} <#{from_email}>",
       "To" => [to.full_address],
-    }
+    } unless AccountManager.is_account? to
+
+    @headers[:recipient] = {
+      "From" => "#{from.name} <#{from_email}>",
+      "To" => cc.map { |p| p.full_address },
+    } unless cc.empty? || @m.is_list_message?
 
     @headers[:user] = {
       "From" => "#{from.name} <#{from_email}>",
@@ -73,7 +80,14 @@ class ReplyMode < EditMessageMode
     end
 
     @type_labels = REPLY_TYPES.select { |t| @headers.member?(t) }
-    @selected_type = @m.is_list_message? ? :list : :sender
+    @selected_type = 
+      if @m.is_list_message?
+        :list
+      elsif @headers.member? :sender
+        :sender
+      else
+        :recipient
+      end
 
     @body += sig_lines
     regen_text
@@ -114,14 +128,13 @@ protected
 
     if new_header.size != header.size ||
         header.any? { |k, v| new_header[k] != v }
-      #raise "nhs: #{new_header.size} hs: #{header.size} new: #{new_header.inspect} old: #{header.inspect}"
       @selected_type = :user
       @headers[:user] = new_header
     end
   end
 
   def regen_text
-    @text = header_lines(@headers[@selected_type] - NON_EDITABLE_HEADERS) + [""] + @body
+    @text = header_lines(header - NON_EDITABLE_HEADERS) + [""] + body
   end
 
   def gen_references

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

@@ -12,18 +12,22 @@ class ResumeMode < ComposeMode
   end
 
   def killable?
-    unless @safe
-      case BufferManager.ask_yes_or_no "Discard draft?"
-      when true
+    return true if @safe
+
+    case BufferManager.ask_yes_or_no "Discard draft?"
+    when true
+      DraftManager.discard @id
+      BufferManager.flash "Draft discarded."
+      true
+    when false
+      if edited?
+        DraftManager.write_draft { |f| write_message f, false }
         DraftManager.discard @id
-        BufferManager.flash "Draft discarded."
-        true
-      when false
         BufferManager.flash "Draft saved."
-        true
-      else
-        false
       end
+      true
+    else
+      false
     end
   end
 

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

@@ -1,7 +1,16 @@
 module Redwood
 
 class ScrollMode < Mode
-  attr_reader :status, :topline, :botline
+  ## we define topline and botline as the top and bottom lines of any
+  ## content in the currentview.
+  
+  ## we left leftcol and rightcol as the left and right columns of any
+  ## content in the current view. but since we're operating in a
+  ## line-centric fashion, rightcol is always leftcol + the buffer
+  ## width. (whereas botline is topline + at most the buffer height,
+  ## and can be == to topline in the case that there's no content.)
+
+  attr_reader :status, :topline, :botline, :leftcol
 
   COL_JUMP = 2
 
@@ -25,6 +34,8 @@ class ScrollMode < Mode
     super()
   end
 
+  def rightcol; @leftcol + buffer.content_width; end
+
   def draw
     ensure_mode_validity
     (@topline ... @botline).each { |ln| draw_line ln }
@@ -80,7 +91,7 @@ class ScrollMode < Mode
   end
 
   def resize *a
-    super *a
+    super(*a)
     ensure_mode_validity
   end
 

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

@@ -1,3 +1,4 @@
+require 'thread'
 module Redwood
 
 ## subclasses should implement load_threads
@@ -16,6 +17,7 @@ class ThreadIndexMode < LineCursorMode
     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 :delete, "Mark thread for deletion", 'd'
     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
@@ -44,6 +46,7 @@ class ThreadIndexMode < LineCursorMode
 
   def lines; @text.length; end
   def [] i; @text[i]; end
+  def contains_thread? t; !@lines[t].nil?; end
 
   def reload
     drop_all_threads
@@ -55,11 +58,22 @@ class ThreadIndexMode < LineCursorMode
   def select t=nil
     t ||= @threads[curpos]
 
+    ## this isn't working entirely. TODO:figure out why
+    # t = t.clone # required so that messages added later on don't completely
+                # screw everything up
+
     ## TODO: don't regen text completely
     Redwood::reporting_thread do
+      BufferManager.say("Loading message bodies...") do |sid|
+        t.each { |m, *o| m.load_from_source! if m }
+      end
       mode = ThreadViewMode.new t, @hidden_labels
       BufferManager.spawn t.subj, mode
       BufferManager.draw_screen
+      mode.jump_to_first_open
+      BufferManager.draw_screen # lame TODO: make this unnecessary
+      ## the first draw_screen is needed before topline and botline
+      ## are set, and the second to show the cursor having moved
     end
   end
 
@@ -67,45 +81,49 @@ class ThreadIndexMode < LineCursorMode
     threads.each { |t| select t }
   end
   
-  def handle_starred_update m
-    return unless(t = @ts.thread_for m)
-    @starred_cache[t] = t.has_label? :starred
-    update_text_for_line @lines[t]
+  def handle_starred_update sender, m
+    t = @ts.thread_for(m) or return
+    l = @lines[t] or return
+    update_text_for_line l
+    BufferManager.draw_screen
   end
 
-  def handle_read_update m
-    return unless(t = @ts.thread_for m)
-    @new_cache[t] = false
+  def handle_read_update sender, t
+    l = @lines[t] or return
     update_text_for_line @lines[t]
+    BufferManager.draw_screen
   end
 
+  def handle_archived_update *a; handle_read_update(*a); end
+
   ## overwrite me!
   def is_relevant? m; false; end
 
-  def handle_add_update m
+  def handle_add_update sender, m
     if is_relevant?(m) || @ts.is_relevant?(m)
       @ts.load_thread_for_message m
-      @new_cache.delete @ts.thread_for(m) # force recalculation of newness
       update
+      BufferManager.draw_screen
     end
   end
 
-  def handle_delete_update mid
+  def handle_delete_update sender, mid
     if @ts.contains_id? mid
       @ts.remove mid
       update
+      BufferManager.draw_screen
     end
   end
 
   def update
     ## let's see you do THIS in python
-    @threads = @ts.threads.select { |t| !@hidden_threads[t] }.sort_by { |t| t.date }.reverse
+    @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
     regen_text
   end
 
   def edit_message
-    t = @threads[curpos] or return
+    return unless(t = @threads[curpos])
     message, *crap = t.find { |m, *o| m.has_label? :draft }
     if message
       mode = ResumeMode.new message
@@ -115,39 +133,56 @@ class ThreadIndexMode < LineCursorMode
     end
   end
 
-  def toggle_starred
+  def actually_toggle_starred t
+    if t.has_label? :starred # if ANY message has a star
+      t.remove_label :starred # remove from all
+    else
+      t.first.add_label :starred # add only to first
+    end
+  end  
+
+  def toggle_starred 
     t = @threads[curpos] or return
-    @starred_cache[t] = t.toggle_label :starred
+    actually_toggle_starred t
     update_text_for_line curpos
     cursor_down
   end
 
   def multi_toggle_starred threads
-    threads.each { |t| @starred_cache[t] = t.toggle_label :starred }
+    threads.each { |t| actually_toggle_starred t }
     regen_text
   end
 
-  def toggle_archived
-    return unless(t = @threads[curpos])
-    t.toggle_label :inbox
+  def actually_toggle_archived t
+    if t.has_label? :inbox
+      t.remove_label :inbox
+      UpdateManager.relay self, :archived, t
+    else
+      t.apply_label :inbox
+      UpdateManager.relay self, :unarchived, t
+    end
+  end
+
+  def toggle_archived 
+    t = @threads[curpos] or return
+    actually_toggle_archived t
     update_text_for_line curpos
-    cursor_down
   end
 
   def multi_toggle_archived threads
-    threads.each { |t| t.toggle_label :inbox }
+    threads.each { |t| actually_toggle_archived t }
     regen_text
   end
 
   def toggle_new
     t = @threads[curpos] or return
-    @new_cache[t] = t.toggle_label :unread
+    t.toggle_label :unread
     update_text_for_line curpos
     cursor_down
   end
 
   def multi_toggle_new threads
-    threads.each { |t| @new_cache[t] = t.toggle_label :unread }
+    threads.each { |t| t.toggle_label :unread }
     regen_text
   end
 
@@ -157,9 +192,8 @@ class ThreadIndexMode < LineCursorMode
   end
 
   def jump_to_next_new
-    t = @threads[curpos] or return
-    n = ((curpos + 1) .. lines).find { |i| @new_cache[@threads[i]] }
-    n = (0 ... curpos).find { |i| @new_cache[@threads[i]] } unless n
+    n = ((curpos + 1) ... lines).find { |i| @threads[i].has_label? :unread }
+    n = (0 ... curpos).find { |i| @threads[i].has_label? :unread } unless n
     if n
       set_cursor_pos n
     else
@@ -180,6 +214,19 @@ class ThreadIndexMode < LineCursorMode
     regen_text
   end
 
+  def delete
+    t = @threads[curpos] or return
+    multi_delete [t]
+  end
+
+  def multi_delete threads
+    threads.each do |t|
+      t.toggle_label :deleted
+      hide_thread t
+    end
+    regen_text
+  end
+
   def kill
     t = @threads[curpos] or return
     multi_kill [t]
@@ -232,6 +279,7 @@ class ThreadIndexMode < LineCursorMode
     speciall = (@hidden_labels + LabelManager::RESERVED_LABELS).uniq
     keepl, modifyl = thread.labels.partition { |t| speciall.member? t }
     label_string = modifyl.join(" ")
+    label_string += " " unless label_string.empty?
 
     answer = BufferManager.ask :edit_labels, "edit labels: ", label_string
     return unless answer
@@ -266,6 +314,7 @@ class ThreadIndexMode < LineCursorMode
     t = @threads[curpos] or return
     m = t.latest_message
     return if m.nil? # probably won't happen
+    m.load_from_source!
     mode = ReplyMode.new m
     BufferManager.spawn "Reply to #{m.subj}", mode
   end
@@ -274,6 +323,7 @@ class ThreadIndexMode < LineCursorMode
     t = @threads[curpos] or return
     m = t.latest_message
     return if m.nil? # probably won't happen
+    m.load_from_source!
     mode = ForwardMode.new m
     BufferManager.spawn "Forward of #{m.subj}", mode
     mode.edit
@@ -291,11 +341,13 @@ class ThreadIndexMode < LineCursorMode
   def load_n_threads n=LOAD_MORE_THREAD_NUM, opts={}
     @mbid = BufferManager.say "Searching for threads..."
     orig_size = @ts.size
+    last_update = Time.now - 9999 # oh yeah
     @ts.load_n_threads(@ts.size + n, opts) do |i|
       BufferManager.say "Loaded #{i} threads...", @mbid
-      if i % 5 == 0
+      if (Time.now - last_update) >= 0.25
         update
         BufferManager.draw_screen
+        last_update = Time.now
       end
     end
     @ts.threads.each { |th| th.labels.each { |l| LabelManager << l } }
@@ -325,11 +377,6 @@ protected
     update
   end
 
-  def remove_label_and_hide_thread t, label
-    t.remove_label label
-    hide_thread t
-  end
-
   def hide_thread t
     raise "already hidden" if @hidden_threads[t]
     @hidden_threads[t] = true
@@ -337,6 +384,15 @@ protected
     @tags.drop_tag_for t
   end
 
+  def show_thread t
+    if @hidden_threads[t]
+      @hidden_threads.delete t
+    else
+      @ts.add_thread t
+    end
+    update
+  end
+
   def update_text_for_line l
     return unless l # not sure why this happens, but it does, occasionally
     @text[l] = text_for_thread @threads[l]
@@ -358,18 +414,18 @@ protected
   end
 
   def text_for_thread t
-    date = (@date_cache[t] ||= t.date.to_nice_s(Time.now)) 
-    from = (@who_cache[t] ||= author_text_for_thread(t))
+    date = t.date.to_nice_s(Time.now)
+    from = author_text_for_thread(t)
     if from.length > @from_width
       from = from[0 ... (@from_width - 1)]
       from += "." unless from[-1] == ?\s
     end
 
-    new = @new_cache.member?(t) ? @new_cache[t] : @new_cache[t] = t.has_label?(:unread)
-    starred = @starred_cache.member?(t) ? @starred_cache[t] : @starred_cache[t] = t.has_label?(:starred)
+    new = t.has_label?(:unread)
+    starred = t.has_label?(:starred)
 
-    dp = (@dp_cache[t] ||= t.direct_participants.any? { |p| AccountManager.is_account? p })
-    p = (@p_cache[t] ||= (dp || t.participants.any? { |p| AccountManager.is_account? p }))
+    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)
     [ 
@@ -392,12 +448,7 @@ private
 
   def initialize_threads
     @ts = ThreadSet.new Index.instance
-    @date_cache = {}
-    @who_cache = {}
-    @dp_cache = {}
-    @p_cache = {}
-    @new_cache = {}
-    @starred_cache = {}
+    @ts_mutex = Mutex.new
     @hidden_threads = {}
   end
 end