sup 0.2 → 0.3

data/lib/sup/keymap.rb

@@ -44,7 +44,7 @@ class Keymap
     when :end: "<end>"
     when :enter, :return: "<enter>"
     when :ctrl_l: "ctrl-l"
-    when :ctrl_l: "ctrl-g"
+    when :ctrl_g: "ctrl-g"
     when :tab: "tab"
     when " ": "<space>"
     else

data/lib/sup/logger.rb

@@ -51,3 +51,4 @@ class Logger
 end
 
 end
+

data/lib/sup/maildir.rb

@@ -39,6 +39,15 @@ class Maildir < Source
 
     start = @ids.index(cur_offset || start_offset) or raise OutOfSyncSourceError, "Unknown message id #{cur_offset || start_offset}." # couldn't find the most recent email
   end
+  
+  def each_raw_message_line id
+    scan_mailbox
+    with_file_for(id) do |f|
+      until f.eof?
+        yield f.gets
+      end
+    end
+  end
 
   def load_header id
     scan_mailbox

data/lib/sup/mbox.rb

@@ -30,6 +30,8 @@ module MBox
         /^(In-Reply-To):\s+(.*?)\s*$/i,
         /^(Reply-To):\s+(.*?)\s*$/i,
         /^(List-Post):\s+(.*?)\s*$/i,
+        /^(List-Subscribe):\s+(.*?)\s*$/i,
+        /^(List-Unsubscribe):\s+(.*?)\s*$/i,
         /^(Status):\s+(.*?)\s*$/i: header[last = $1] = $2
       when /^(Message-Id):\s+(.*?)\s*$/i: header[mid_field = last = $1] = $2
 
@@ -40,7 +42,7 @@ module MBox
         /^(Envelope-To):\s+(.*)$/i: header[last = $1] ||= $2
 
       when /^$/: break
-      when /:/: last = nil # some other header we don't care about
+      when /^\S+: /: last = nil # some other header we don't care about
       else
         header[last] += " " + line.chomp.gsub(/^\s+/, "") if last
       end

data/lib/sup/message-chunks.rb

@@ -20,10 +20,14 @@
 ## :open if they want to start expanded (default is to start collapsed).
 ##
 ## If it's not expandable but is viewable, a patina is displayed using
-###patina_color and #patina_text, but no toggling is allowed. Instead,
-##if #view! is defined, pressing enter on the widget calls view! and
-##(if that returns false) #to_s. Otherwise, enter does nothing. This
-##is how non-inlineable attachments work.
+## #patina_color and #patina_text, but no toggling is allowed. Instead,
+## if #view! is defined, pressing enter on the widget calls view! and
+## (if that returns false) #to_s. Otherwise, enter does nothing. This
+##  is how non-inlineable attachments work.
+##
+## Independent of all that, a chunk can be quotable, in which case it's
+## included as quoted text during a reply. Text, Quotes, and mime-parsed
+## attachments are quotable; Signatures are not.
 
 module Redwood
 module Chunk
@@ -45,10 +49,12 @@ EOS
     ## raw_content is the post-MIME-decode content. this is used for
     ## saving the attachment to disk.
     attr_reader :content_type, :filename, :lines, :raw_content
+    bool_reader :quotable
 
     def initialize content_type, filename, encoded_content, sibling_types
       @content_type = content_type
       @filename = filename
+      @quotable = false # only quotable if we can parse it through the mime-decode hook
       @raw_content =
         if encoded_content.body
           encoded_content.decode
@@ -64,7 +70,10 @@ EOS
           text = HookManager.run "mime-decode", :content_type => content_type,
                                  :filename => lambda { write_to_disk },
                                  :sibling_types => sibling_types
-          text.split("\n") if text
+          if text
+            @quotable = true
+            text.split("\n")
+          end
         end
     end
 
@@ -86,7 +95,7 @@ EOS
     def viewable?; @lines.nil? end
     def view!
       path = write_to_disk
-      system "/usr/bin/run-mailcap --action=view #{@content_type}:#{path} >& /dev/null"
+      system "/usr/bin/run-mailcap --action=view #{@content_type}:#{path} > /dev/null 2> /dev/null"
       $? == 0
     end
 
@@ -111,10 +120,11 @@ EOS
       @lines = lines.map { |l| l.chomp.wrap WRAP_LEN }.flatten # wrap
 
       ## trim off all empty lines except one
-      lines.pop while lines.last =~ /^\s*$/ 
+      @lines.pop while @lines.length > 1 && @lines[-1] =~ /^\s*$/ && @lines[-2] =~ /^\s*$/
     end
 
     def inlineable?; true end
+    def quotable?; true end
     def expandable?; false end
     def viewable?; false end
     def color; :none end
@@ -127,6 +137,7 @@ EOS
     end
     
     def inlineable?; @lines.length == 1 end
+    def quotable?; true end
     def expandable?; !inlineable? end
     def viewable?; false end
 
@@ -142,6 +153,7 @@ EOS
     end
 
     def inlineable?; @lines.length == 1 end
+    def quotable?; false end
     def expandable?; !inlineable? end
     def viewable?; false end
 
@@ -162,6 +174,7 @@ EOS
     end
 
     def inlineable?; false end
+    def quotable?; false end
     def expandable?; true end
     def initial_state; :open end
     def viewable?; false end
@@ -191,6 +204,7 @@ EOS
     def color; patina_color end
 
     def inlineable?; false end
+    def quotable?; false end
     def expandable?; !@lines.empty? end
     def viewable?; false end
   end

data/lib/sup/message.rb

@@ -13,6 +13,10 @@ class MessageFormatError < StandardError; end
 ## i would like, for example, to be able to add in a ruby-talk
 ## specific module that would detect and link to /ruby-talk:\d+/
 ## sequences in the text of an email. (how sweet would that be?)
+##
+## this class cathces all source exceptions. if the underlying source throws
+## an error, it is caught and handled.
+
 class Message
   SNIPPET_LEN = 80
   RE_PATTERN = /^((re|re[\[\(]\d[\]\)]):\s*)+/i
@@ -35,7 +39,7 @@ class Message
 
   attr_reader :id, :date, :from, :subj, :refs, :replytos, :to, :source,
               :cc, :bcc, :labels, :list_address, :recipient_email, :replyto,
-              :source_info, :chunks
+              :source_info, :chunks, :list_subscribe, :list_unsubscribe
 
   bool_reader :dirty, :source_marked_read
 
@@ -56,16 +60,24 @@ class Message
   def parse_header header
     header.each { |k, v| header[k.downcase] = v }
     
-    @from = PersonManager.person_for header["from"]
-
     @id =
       if header["message-id"]
         sanitize_message_id header["message-id"]
       else
-        "sup-faked-" + Digest::MD5.hexdigest(raw_header)
-        Redwood::log "faking message-id for message from #@from: #@id"
+        returning("sup-faked-" + Digest::MD5.hexdigest(raw_header)) do |id|
+          Redwood::log "faking message-id for message from #@from: #{id}"
+        end
       end
     
+    @from =
+      if header["from"]
+        PersonManager.person_for header["from"]
+      else
+        name = "Sup Auto-generated Fake Sender <sup@fake.sender.example.com>"
+        Redwood::log "faking from for message #@id: #{name}"
+        PersonManager.person_for name
+      end
+
     date = header["date"]
     @date =
       case date
@@ -99,6 +111,8 @@ class Message
 
     @recipient_email = header["envelope-to"] || header["x-original-to"] || header["delivered-to"]
     @source_marked_read = header["status"] == "RO"
+    @list_subscribe = header["list-subscribe"]
+    @list_unsubscribe = header["list-unsubscribe"]
   end
   private :parse_header
 
@@ -159,6 +173,7 @@ class Message
           Redwood::log "problem getting messages from #{@source}: #{e.message}"
           ## we need force_to_top here otherwise this window will cover
           ## up the error message one
+          @source.error ||= e
           Redwood::report_broken_sources :force_to_top => true
           [Chunk::Text.new(error_message(e.message))]
         end
@@ -184,11 +199,14 @@ The error message was:
 EOS
   end
 
+  ## wrap any source methods that might throw sourceerrors
   def with_source_errors_handled
     begin
       yield
     rescue SourceError => e
       Redwood::log "problem getting messages from #{@source}: #{e.message}"
+      @source.error ||= e
+      Redwood::report_broken_sources :force_to_top => true
       error_message e.message
     end
   end
@@ -218,11 +236,11 @@ EOS
     ].flatten.compact.join " "
   end
 
-  def basic_body_lines
-    chunks.find_all { |c| c.is_a?(Chunk::Text) || c.is_a?(Chunk::Quote) }.map { |c| c.lines }.flatten
+  def quotable_body_lines
+    chunks.find_all { |c| c.quotable? }.map { |c| c.lines }.flatten
   end
 
-  def basic_header_lines
+  def quotable_header_lines
     ["From: #{@from.full_address}"] +
       (@to.empty? ? [] : ["To: " + @to.map { |p| p.full_address }.join(", ")]) +
       (@cc.empty? ? [] : ["Cc: " + @cc.map { |p| p.full_address }.join(", ")]) +
@@ -334,11 +352,9 @@ private
     else
       filename =
         ## first, paw through the headers looking for a filename
-        if m.header["Content-Disposition"] &&
-            m.header["Content-Disposition"] =~ /filename="?(.*?[^\\])("|;|$)/
+        if m.header["Content-Disposition"] && m.header["Content-Disposition"] =~ /filename="?(.*?[^\\])("|;|$)/
           $1
-        elsif m.header["Content-Type"] &&
-            m.header["Content-Type"] =~ /name=(.*?)(;|$)/
+        elsif m.header["Content-Type"] && m.header["Content-Type"] =~ /name="?(.*?[^\\])("|;|$)/
           $1
 
         ## haven't found one, but it's a non-text message. fake
@@ -360,11 +376,11 @@ private
   end
 
   def self.convert_from body, charset
-    return body unless charset
-
     begin
+      raise MessageFormatError, "RubyMail decode returned a null body" unless body
+      return body unless charset
       Iconv.iconv($encoding, charset, body).join
-    rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence => e
+    rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence, MessageFormatError => e
       Redwood::log "warning: error (#{e.class.name}) decoding message body from #{charset}: #{e.message}"
       File.open("sup-unable-to-decode.txt", "w") { |f| f.write body }
       body

data/lib/sup/mode.rb

@@ -27,6 +27,8 @@ class Mode
   def draw; end
   def focus; end
   def blur; end
+  def cancel_search!; end
+  def in_search?; false end
   def status; ""; end
   def resize rows, cols; end
   def cleanup

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

@@ -3,7 +3,7 @@ module Redwood
 class BufferListMode < LineCursorMode
   register_keymap do |k|
     k.add :jump_to_buffer, "Jump to selected buffer", :enter
-    k.add :reload, "Reload buffer list", "R"
+    k.add :reload, "Reload buffer list", "@"
   end
 
   def initialize
@@ -11,8 +11,12 @@ class BufferListMode < LineCursorMode
     super
   end
 
-  def lines; @text.length; end
-  def [] i; @text[i]; end
+  def lines; @text.length end
+  def [] i; @text[i] end
+
+  def focus
+    reload # buffers may have been killed or created since last view
+  end
 
 protected
 

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

@@ -1,23 +1,10 @@
 module Redwood
 
-module CanSpawnComposeMode
-  def spawn_compose_mode 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 = ComposeMode.new :to => to, :cc => cc, :bcc => bcc
-    BufferManager.spawn "New Message", mode
-    mode.edit_message
-  end
-end
-
 class ComposeMode < EditMessageMode
   def initialize opts={}
-    header = {
-      "From" => AccountManager.default_account.full_address,
-    }
-
+    header = {}
+    header["From"] = (opts[:from] || AccountManager.default_account).full_address
+    header["To"] = opts[:to].map { |p| p.full_address }.join(", ") if opts[:to]
     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]
@@ -31,6 +18,17 @@ class ComposeMode < EditMessageMode
     BufferManager.kill_buffer self.buffer unless edited
     edited
   end
+
+  def self.spawn_nicely 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]
+    subj = opts[:subj] || BufferManager.ask(:subject, "Subject: ") or return if $config[:ask_for_subject]
+    
+    mode = ComposeMode.new :from => opts[:from], :to => to, :cc => cc, :bcc => bcc, :subj => subj
+    BufferManager.spawn "New Message", mode
+    mode.edit_message
+  end
 end
 
 end

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

@@ -59,7 +59,7 @@ class ContactListMode < LineCursorMode
     @num += num
     load
     update
-    BufferManager.flash "Added #{num} contacts."
+    BufferManager.flash "Added #{num.pluralize 'contact'}."
   end
 
   def multi_select people
@@ -94,7 +94,7 @@ class ContactListMode < LineCursorMode
   end
 
   def load_in_background
-    Redwood::reporting_thread do
+    Redwood::reporting_thread("contact manager load in bg") do
       load
       update
       BufferManager.draw_screen

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

@@ -13,7 +13,7 @@ class EditMessageMode < LineCursorMode
   NON_EDITABLE_HEADERS = %w(Message-Id Date)
 
   HookManager.register "signature", <<EOS
-Generates a signature for a message.
+Generates a message signature.
 Variables:
       header: an object that supports string-to-string hashtable-style access
               to the raw headers for the message. E.g., header["From"],
@@ -24,13 +24,26 @@ Return value:
   use the default signature.
 EOS
 
+  HookManager.register "before-edit", <<EOS
+Modifies message body and headers before editing a new message. Variables
+should be modified in place.
+Variables:
+	header: a hash of headers. See 'signature' hook for documentation.
+	body: an array of lines of body text.
+Return value:
+	none
+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_field, "Edit field", 'e'
+    k.add :edit_message_or_field, "Edit selected field", 'e'
+    k.add :edit_to, "Edit To:", 't'
+    k.add :edit_cc, "Edit Cc:", 'c'
+    k.add :edit_subject, "Edit Subject", 's'
     k.add :edit_message, "Edit message", :enter
     k.add :save_as_draft, "Save as draft", 'P'
     k.add :attach_file, "Attach a file", 'a'
@@ -48,6 +61,8 @@ EOS
     @message_id = "<#{Time.now.to_i}-sup-#{rand 10000}@#{Socket.gethostname}>"
     @edited = false
     @skip_top_rows = opts[:skip_top_rows] || 0
+    
+    HookManager.run "before-edit", :header => @header, :body => @body
 
     super opts
     regen_text
@@ -59,33 +74,18 @@ EOS
   ## a hook
   def handle_new_text header, body; end
 
-  def edit_field
+  def edit_message_or_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
+      edit_field @header_lines[curpos - @skip_top_rows]
     end
   end
 
+  def edit_to; edit_field "To" end
+  def edit_cc; edit_field "Cc" end
+  def edit_subject; edit_field "Subject" end
+
   def edit_message
     @file = Tempfile.new "sup.#{self.class.name.gsub(/.*::/, '').camel_to_hyphy}"
     @file.puts format_headers(@header - NON_EDITABLE_HEADERS).first
@@ -139,6 +139,8 @@ protected
     header, @header_lines = format_headers(@header - NON_EDITABLE_HEADERS) + [""]
     @text = header + [""] + @body
     @text += sig_lines unless $config[:edit_signature]
+    
+    @attachment_lines_offset = 0
 
     unless @attachments.empty?
       @text += [""]
@@ -298,6 +300,36 @@ EOS
     f.puts sig_lines if full unless $config[:edit_signature]
   end  
 
+protected
+
+  def edit_field field
+    case field
+    when "Subject"
+      text = BufferManager.ask :subject, "Subject: ", @header[field]
+       if text
+         @header[field] = parse_header field, text
+         update
+         field
+       end
+    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
+        update
+        field
+      end
+    end
+  end
+
 private
 
   def sanitize_body body