sup 0.1 → 0.2

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

@@ -12,13 +12,26 @@ class EditMessageMode < LineCursorMode
   MULTI_HEADERS = %w(To Cc Bcc)
   NON_EDITABLE_HEADERS = %w(Message-Id Date)
 
+  HookManager.register "signature", <<EOS
+Generates a signature for a message.
+Variables:
+      header: an object that supports string-to-string hashtable-style access
+              to the raw headers for the message. E.g., header["From"],
+              header["To"], etc.
+  from_email: the email part of the From: line, or nil if empty
+Return value:
+  A string (multi-line ok) containing the text of the signature, or nil to
+  use the default signature.
+EOS
+
   attr_reader :status
   attr_accessor :body, :header
   bool_reader :edited
 
   register_keymap do |k|
     k.add :send_message, "Send message", 'y'
-    k.add :edit, "Edit message", 'e', :enter
+    k.add :edit_field, "Edit field", 'e'
+    k.add :edit_message, "Edit message", :enter
     k.add :save_as_draft, "Save as draft", 'P'
     k.add :attach_file, "Attach a file", 'a'
     k.add :delete_attachment, "Delete an attachment", 'd'
@@ -26,12 +39,15 @@ class EditMessageMode < LineCursorMode
 
   def initialize opts={}
     @header = opts.delete(:header) || {} 
+    @header_lines = []
+
     @body = opts.delete(:body) || []
     @body += sig_lines if $config[:edit_signature]
+
     @attachments = []
-    @attachment_lines = {}
     @message_id = "<#{Time.now.to_i}-sup-#{rand 10000}@#{Socket.gethostname}>"
     @edited = false
+    @skip_top_rows = opts[:skip_top_rows] || 0
 
     super opts
     regen_text
@@ -43,9 +59,36 @@ class EditMessageMode < LineCursorMode
   ## a hook
   def handle_new_text header, body; end
 
-  def edit
+  def edit_field
+    if (curpos - @skip_top_rows) >= @header_lines.length
+      edit_message
+    else
+      case(field = @header_lines[curpos - @skip_top_rows])
+      when "Subject"
+        text = BufferManager.ask :subject, "Subject: ", @header[field]
+        @header[field] = parse_header field, text if text
+      else
+        default =
+          case field
+          when *MULTI_HEADERS
+            @header[field].join(", ")
+          else
+            @header[field]
+          end
+
+        contacts = BufferManager.ask_for_contacts :people, "#{field}: ", default
+        if contacts
+          text = contacts.map { |s| s.longname }.join(", ")
+          @header[field] = parse_header field, text
+        end
+      end
+      update
+    end
+  end
+
+  def edit_message
     @file = Tempfile.new "sup.#{self.class.name.gsub(/.*::/, '').camel_to_hyphy}"
-    @file.puts header_lines(@header - NON_EDITABLE_HEADERS)
+    @file.puts format_headers(@header - NON_EDITABLE_HEADERS).first
     @file.puts
     @file.puts @body
     @file.close
@@ -56,12 +99,14 @@ class EditMessageMode < LineCursorMode
     BufferManager.shell_out "#{editor} #{@file.path}"
     @edited = true if File.mtime(@file.path) > mtime
 
-    BufferManager.kill_buffer self.buffer unless @edited
+    return @edited unless @edited
 
     header, @body = parse_file @file.path
     @header = header - NON_EDITABLE_HEADERS
     handle_new_text @header, @body
     update
+
+    @edited
   end
 
   def killable?
@@ -69,13 +114,14 @@ class EditMessageMode < LineCursorMode
   end
 
   def attach_file
-    fn = BufferManager.ask_for_filenames :attachment, "File name (enter for browser): "
-    fn.each { |f| @attachments << Pathname.new(f) }
+    fn = BufferManager.ask_for_filename :attachment, "File name (enter for browser): "
+    return unless fn
+    @attachments << Pathname.new(fn)
     update
   end
 
   def delete_attachment
-    i = curpos - @attachment_lines_offset
+    i = (curpos - @skip_top_rows) - @attachment_lines_offset
     if i >= 0 && i < @attachments.size && BufferManager.ask_yes_or_no("Delete attachment #{@attachments[i]}?")
       @attachments.delete_at i
       update
@@ -90,8 +136,8 @@ protected
   end
 
   def regen_text
-    top = header_lines(@header - NON_EDITABLE_HEADERS) + [""]
-    @text = top + @body
+    header, @header_lines = format_headers(@header - NON_EDITABLE_HEADERS) + [""]
+    @text = header + [""] + @body
     @text += sig_lines unless $config[:edit_signature]
 
     unless @attachments.empty?
@@ -107,24 +153,30 @@ protected
       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.person_with(name)) && p.full_address || name
-        end
-      end
+      header.each { |k, v| header[k] = parse_header k, v }
 
       [header, body]
     end
   end
 
-  def header_lines header
-    force_headers = FORCE_HEADERS.map { |h| make_lines "#{h}:", header[h] }
-    other_headers = (header.keys - FORCE_HEADERS).map do |h|
-      make_lines "#{h}:", header[h]
+  def parse_header k, v
+    if MULTI_HEADERS.include?(k)
+      v.split_on_commas.map do |name|
+        (p = ContactManager.contact_for(name)) && p.full_address || name
+      end
+    else
+      v
     end
+  end
 
-    (force_headers + other_headers).flatten.compact
+  def format_headers header
+    header_lines = []
+    headers = (FORCE_HEADERS + (header.keys - FORCE_HEADERS)).map do |h|
+      lines = make_lines "#{h}:", header[h]
+      lines.length.times { header_lines << h }
+      lines
+    end.flatten.compact
+    [headers, header_lines]
   end
 
   def make_lines header, things
@@ -150,7 +202,9 @@ protected
   end
 
   def send_message
-    return unless edited? || BufferManager.ask_yes_or_no("Message unedited. Really send?")
+    return false if !edited? && !BufferManager.ask_yes_or_no("Message unedited. Really send?")
+    return false if $config[:confirm_no_attachments] && mentions_attachments? && @attachments.size == 0 && !BufferManager.ask_yes_or_no("You haven't added any attachments. Really send?")#" stupid ruby-mode
+    return false if $config[:confirm_top_posting] && top_posting? && !BufferManager.ask_yes_or_no("You're top-posting. That makes you a bad person. Really send?") #" stupid ruby-mode
 
     date = Time.now
     from_email = 
@@ -164,14 +218,16 @@ protected
     BufferManager.flash "Sending..."
 
     begin
-      IO.popen(acct.sendmail, "w") { |p| write_full_message_to p, date }
+      IO.popen(acct.sendmail, "w") { |p| write_full_message_to p, date, false }
       raise SendmailCommandFailed, "Couldn't execute #{acct.sendmail}" unless $? == 0
-      SentManager.write_sent_message(date, from_email) { |f| write_full_message_to f, date }
+      SentManager.write_sent_message(date, from_email) { |f| write_full_message_to f, date, true }
       BufferManager.kill_buffer buffer
       BufferManager.flash "Message sent!"
+      true
     rescue SystemCallError, SendmailCommandFailed => e
       Redwood::log "Problem sending mail: #{e.message}"
       BufferManager.flash "Problem sending mail: #{e.message}"
+      false
     end
   end
 
@@ -181,7 +237,7 @@ protected
     BufferManager.flash "Saved for later editing."
   end
 
-  def write_full_message_to f, date=Time.now
+  def write_full_message_to f, date=Time.now, escape=false
     m = RMail::Message.new
     @header.each do |k, v|
       next if v.nil? || v.empty?
@@ -199,26 +255,31 @@ protected
     m.header["User-Agent"] = "Sup/#{Redwood::VERSION}"
 
     if @attachments.empty?
-      m.header["Content-Disposition"] = "inline"
       m.header["Content-Type"] = "text/plain; charset=#{$encoding}"
       m.body = @body.join
+      m.body = sanitize_body m.body if escape
       m.body += sig_lines.join("\n") unless $config[:edit_signature]
     else
       body_m = RMail::Message.new
       body_m.body = @body.join
+      body_m.body = sanitize_body body_m.body if escape
       body_m.body += sig_lines.join("\n") unless $config[:edit_signature]
+      body_m.header["Content-Type"] = "text/plain; charset=#{$encoding}"
+      body_m.header["Content-Disposition"] = "inline"
       
       m.add_part body_m
-      @attachments.each { |fn| m.add_attachment fn.to_s }
+      @attachments.each { |fn| m.add_file_attachment fn.to_s }
     end
     f.puts m.to_s
   end
 
+  ## TODO: remove this. redundant with write_full_message_to.
+  ##
   ## this is going to change soon: draft messages (currently written
   ## with full=false) will be output as yaml.
   def write_message f, full=true, date=Time.now
     raise ArgumentError, "no pre-defined date: header allowed" if @header["Date"]
-    f.puts header_lines(@header)
+    f.puts format_headers(@header).first
     f.puts <<EOS
 Date: #{date.rfc2822}
 Message-Id: #{@message_id}
@@ -233,15 +294,35 @@ EOS
     end
 
     f.puts
-    f.puts @body.map { |l| l =~ /^From / ? ">#{l}" : l }
+    f.puts sanitize_body(@body.join)
     f.puts sig_lines if full unless $config[:edit_signature]
   end  
 
 private
 
+  def sanitize_body body
+    body.gsub(/^From /, ">From ")
+  end
+
+  def mentions_attachments?
+    @body.any? { |l| l =~ /^[^>]/ && l =~ /\battach(ment|ed|ing|)\b/i }
+  end
+
+  def top_posting?
+    @body.join =~ /(\S+)\s*Excerpts from.*\n(>.*\n)+\s*\Z/
+  end
+
   def sig_lines
-    p = PersonManager.person_for @header["From"]
-    sigfn = (AccountManager.account_for(p.email) || 
+    p = PersonManager.person_for(@header["From"])
+    from_email = p && p.email
+
+    ## first run the hook
+    hook_sig = HookManager.run "signature", :header => @header, :from_email => from_email
+    return ["", "-- "] + hook_sig.split("\n") if hook_sig
+
+    ## no hook, do default signature generation based on config.yaml
+    return [] unless from_email
+    sigfn = (AccountManager.account_for(from_email) || 
              AccountManager.default_account).signature
 
     if sigfn && File.exists?(sigfn)

data/lib/sup/modes/file-browser-mode.rb

@@ -65,7 +65,7 @@ protected
       end
     else
       begin
-        @value = [f.realpath.to_s]
+        @value = f.realpath.to_s
         @done = true
       rescue SystemCallError => e
         BufferManager.flash e.message

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

@@ -9,7 +9,7 @@ class InboxMode < ThreadIndexMode
   end
 
   def initialize
-    super [:inbox, :sent], { :label => :inbox }
+    super [:inbox, :sent], { :label => :inbox, :skip_killed => true }
     raise "can't have more than one!" if defined? @@instance
     @@instance = self
   end

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

@@ -3,7 +3,7 @@ module Redwood
 class LabelListMode < LineCursorMode
   register_keymap do |k|
     k.add :select_label, "Select label", :enter
-    k.add :reload, "Discard label list and reload", 'D'
+    k.add :reload, "Discard label list and reload", '@'
   end
 
   bool_reader :done
@@ -30,17 +30,18 @@ protected
   
   def regen_text
     @text = []
-    @labels = LabelManager.listable_label_strings
+    labels = LabelManager.listable_labels
 
-    counts = @labels.map do |string|
-      label = LabelManager.label_for string
+    counts = labels.map do |label|
+      string = LabelManager.string_for label
       total = Index.num_results_for :label => label
       unread = Index.num_results_for :labels => [label, :unread]
       [label, string, total, unread]
-    end      
+    end.sort_by { |l, s, t, u| s.downcase }
 
-    width = @labels.max_of { |string| string.length }
+    width = counts.max_of { |l, s, t, u| s.length }
 
+    @labels = []
     counts.map do |label, string, total, unread|
       if total == 0 && !LabelManager::RESERVED_LABELS.include?(label)
         Redwood::log "no hits for label #{label}, deleting"
@@ -50,6 +51,7 @@ 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
       yield i if block_given?
     end.compact
   end

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

@@ -3,7 +3,10 @@ module Redwood
 class LabelSearchResultsMode < ThreadIndexMode
   def initialize labels
     @labels = labels
-    super [], { :labels => @labels }
+    opts = { :labels => @labels }
+    opts[:load_deleted] = true if labels.include? :deleted
+    opts[:load_spam] = true if labels.include? :spam
+    super [], opts
   end
 
   def is_relevant? m; @labels.all? { |l| m.has_label? l }; end

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

@@ -38,7 +38,7 @@ class LogMode < TextMode
   end
 
   def save_to_disk
-    fn = BufferManager.ask :filename, "Save log to file: "
+    fn = BufferManager.ask_for_filename :filename, "Save log to file: "
     save_to_file(fn) { |f| f.puts text } if fn
   end
 

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

@@ -24,13 +24,13 @@ class ReplyMode < EditMessageMode
     body = reply_body_lines message
 
     from =
-      if @m.recipient_email
-        AccountManager.account_for @m.recipient_email
+      if @m.recipient_email && (a = AccountManager.account_for(@m.recipient_email))
+        a
+      elsif(b = (@m.to + @m.cc).find { |p| AccountManager.is_account? p })
+        b
       else
-        (@m.to + @m.cc).find { |p| AccountManager.is_account? p }
-      end || AccountManager.default_account
-
-    from_email = from.email
+        AccountManager.default_account
+      end
 
     ## ignore reply-to for list messages because it's typically set to
     ## the list address, which we explicitly treat with :list
@@ -39,36 +39,31 @@ class ReplyMode < EditMessageMode
 
     @headers = {}
     @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}>",
-    }
+    @headers[:user] = {}
 
     @headers[:all] = {
-      "From" => "#{from.name} <#{from_email}>",
       "To" => [to.full_address],
       "Cc" => cc.select { |p| !AccountManager.is_account?(p) }.map { |p| p.full_address },
     } unless cc.empty?
 
     @headers[:list] = {
-      "From" => "#{from.name} <#{from_email}>",
       "To" => [@m.list_address.full_address],
     } if @m.is_list_message?
 
     refs = gen_references
     @headers.each do |k, v|
       @headers[k] = {
-               "To" => "",
-               "Cc" => "",
-               "Bcc" => "",
+               "From" => "#{from.name} <#{from.email}>",
+               "To" => [],
+               "Cc" => [],
+               "Bcc" => [],
                "In-Reply-To" => "<#{@m.id}>",
                "Subject" => Message.reify_subj(@m.subj),
                "References" => refs,
@@ -125,6 +120,13 @@ protected
   def gen_references
     (@m.refs + [@m.id]).map { |x| "<#{x}>" }.join(" ")
   end
+
+  def edit_field
+    @selected_type = :user
+    self.header = @headers[:user]
+    update
+    super
+  end
   
   def move_cursor_left
     i = @type_labels.index @selected_type

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

@@ -3,7 +3,7 @@ module Redwood
 class SearchResultsMode < ThreadIndexMode
   def initialize qobj
     @qobj = qobj
-    super [], { :qobj => @qobj, :load_killed => true, :load_spam => false }
+    super [], { :qobj => @qobj }
   end
 
   ## a proper is_relevant? method requires some way of asking ferret

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

@@ -10,19 +10,19 @@ class ThreadIndexMode < LineCursorMode
 
   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 :reload, "Refresh view", '@'
     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 :delete, "Mark thread for deletion", 'd'
+    k.add :toggle_spam, "Mark/unmark thread as spam", 'S'
+    k.add :toggle_deleted, "Delete/undelete thread", '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
-    k.add :reply, "Reply to a thread", 'r'
-    k.add :forward, "Forward a thread", 'f'
+    k.add :reply, "Reply to latest message in a thread", 'r'
+    k.add :forward, "Forward latest message in a thread", 'f'
     k.add :toggle_tagged, "Tag/untag current line", 't'
     k.add :apply_to_tagged, "Apply next command to all tagged threads", ';'
   end
@@ -80,7 +80,6 @@ class ThreadIndexMode < LineCursorMode
       ## the first draw_screen is needed before topline and botline
       ## are set, and the second to show the cursor having moved
 
-      t.remove_label :unread
       update_text_for_line curpos
       UpdateManager.relay self, :read, t
     end
@@ -90,7 +89,7 @@ class ThreadIndexMode < LineCursorMode
     threads.each { |t| select t }
   end
   
-  def handle_starred_update sender, m
+  def handle_label_update sender, m
     t = @ts.thread_for(m) or return
     l = @lines[t] or return
     update_text_for_line l
@@ -105,6 +104,12 @@ class ThreadIndexMode < LineCursorMode
 
   def handle_archived_update *a; handle_read_update(*a); end
 
+  def handle_deleted_update sender, t
+    handle_read_update sender, t
+    hide_thread t
+    regen_text
+  end
+
   ## overwrite me!
   def is_relevant? m; false; end
 
@@ -145,8 +150,10 @@ class ThreadIndexMode < LineCursorMode
   def actually_toggle_starred t
     if t.has_label? :starred # if ANY message has a star
       t.remove_label :starred # remove from all
+      UpdateManager.relay self, :unstarred, t
     else
       t.first.add_label :starred # add only to first
+      UpdateManager.relay self, :starred, t
     end
   end  
 
@@ -172,6 +179,26 @@ class ThreadIndexMode < LineCursorMode
     end
   end
 
+  def actually_toggle_spammed t
+    if t.has_label? :spam
+      t.remove_label :spam
+      UpdateManager.relay self, :unspammed, t
+    else
+      t.apply_label :spam
+      UpdateManager.relay self, :spammed, t
+    end
+  end
+
+  def actually_toggle_deleted t
+    if t.has_label? :deleted
+      t.remove_label :deleted
+      UpdateManager.relay self, :undeleted, t
+    else
+      t.apply_label :deleted
+      UpdateManager.relay self, :deleted, t
+    end
+  end
+
   def toggle_archived 
     t = @threads[curpos] or return
     actually_toggle_archived t
@@ -211,28 +238,36 @@ class ThreadIndexMode < LineCursorMode
     end
   end
 
-  def mark_as_spam
+  def toggle_spam
     t = @threads[curpos] or return
-    multi_mark_as_spam [t]
+    multi_toggle_spam [t]
   end
 
-  def multi_mark_as_spam threads
+  ## both spam and deleted have the curious characteristic that you
+  ## always want to hide the thread after either applying or removing
+  ## that label. in all thread-index-views except for
+  ## label-search-results-mode, when you mark a message as spam or
+  ## deleted, you want it to disappear immediately; in LSRM, you only
+  ## see deleted or spam emails, and when you undelete or unspam them
+  ## you also want them to disappear immediately.
+  def multi_toggle_spam threads
     threads.each do |t|
-      t.toggle_label :spam
-      hide_thread t
+      actually_toggle_spammed t
+      hide_thread t 
     end
     regen_text
   end
 
-  def delete
+  def toggle_deleted
     t = @threads[curpos] or return
-    multi_delete [t]
+    multi_toggle_deleted [t]
   end
 
-  def multi_delete threads
+  ## see comment for multi_toggle_spam
+  def multi_toggle_deleted threads
     threads.each do |t|
-      t.toggle_label :deleted
-      hide_thread t
+      actually_toggle_deleted t
+      hide_thread t 
     end
     regen_text
   end
@@ -248,6 +283,7 @@ class ThreadIndexMode < LineCursorMode
       hide_thread t
     end
     regen_text
+    BufferManager.flash "Thread#{threads.size == 1 ? '' : 's'} killed."
   end
 
   def save
@@ -288,20 +324,12 @@ class ThreadIndexMode < LineCursorMode
     thread = @threads[curpos] or return
     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
-    user_labels = answer.split(/\s+/).map { |l| l.intern }
-    
-    hl = user_labels.select { |l| speciall.member? l }
-    if hl.empty?
-      thread.labels = keepl + user_labels
-      user_labels.each { |l| LabelManager << l }
-    else
-      BufferManager.flash "'#{hl}' is a reserved label!"
-    end
+    user_labels = BufferManager.ask_for_labels :label, "Labels for thread: ", modifyl, @hidden_labels
+
+    return unless user_labels
+    thread.labels = keepl + user_labels
+    user_labels.each { |l| LabelManager << l }
     update_text_for_line curpos
   end
 
@@ -336,7 +364,7 @@ class ThreadIndexMode < LineCursorMode
     m.load_from_source!
     mode = ForwardMode.new m
     BufferManager.spawn "Forward of #{m.subj}", mode
-    mode.edit
+    mode.edit_message
   end
 
   def load_n_threads_background n=LOAD_MORE_THREAD_NUM, opts={}
@@ -384,9 +412,9 @@ class ThreadIndexMode < LineCursorMode
     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"
+        BufferManager.flash "Found #{num} threads."
       else
-        BufferManager.flash "No matches"
+        BufferManager.flash "No matches."
       end
     end)})