sup 0.19.0 → 0.23

data/lib/sup/modes/contact_list_mode.rb

@@ -108,6 +108,7 @@ class ContactListMode < LineCursorMode
   def load
     @num ||= (buffer.content_height * 2)
     @user_contacts = ContactManager.contacts_with_aliases
+    @user_contacts += (HookManager.run("extra-contact-addresses") || []).map { |addr| Person.from_address addr }
     num = [@num - @user_contacts.length, 0].max
     BufferManager.say("Loading #{num} contacts from index...") do
       recentc = Index.load_contacts AccountManager.user_emails, :num => num

data/lib/sup/modes/edit_message_mode.rb

@@ -20,6 +20,7 @@ Variables:
               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
+  message_id: the unique message id of the message
 Return value:
   A string (multi-line ok) containing the text of the signature, or nil to
   use the default signature, or :none for no signature.
@@ -688,7 +689,7 @@ private
     from_email = p && p.email
 
     ## first run the hook
-    hook_sig = HookManager.run "signature", :header => @header, :from_email => from_email
+    hook_sig = HookManager.run "signature", :header => @header, :from_email => from_email, :message_id => @message_id
 
     return [] if hook_sig == :none
     return ["", "-- "] + hook_sig.split("\n") if hook_sig
@@ -698,7 +699,7 @@ private
     sigfn = (AccountManager.account_for(from_email) ||
              AccountManager.default_account).signature
 
-    if sigfn && File.exists?(sigfn)
+    if sigfn && File.exist?(sigfn)
       ["", "-- "] + File.readlines(sigfn).map { |l| l.chomp }
     else
       []

data/lib/sup/modes/forward_mode.rb

@@ -1,6 +1,17 @@
 module Redwood
 
 class ForwardMode < EditMessageMode
+
+  HookManager.register "forward-attribution", <<EOS
+Generates the attribution for the forwarded message
+(["--- Begin forwarded message from John Doe ---",
+  "--- End forwarded message ---"])
+Variables:
+  message: a message object representing the message being replied to
+    (useful values include message.from.mediumname and message.date)
+Return value:
+  A list containing two strings: the text of the begin line and the text of the end line
+EOS
   ## TODO: share some of this with reply-mode
   def initialize opts={}
     header = {
@@ -65,9 +76,17 @@ class ForwardMode < EditMessageMode
 protected
 
   def forward_body_lines m
-    ["--- Begin forwarded message from #{m.from.mediumname} ---"] +
-      m.quotable_header_lines + [""] + m.quotable_body_lines +
-      ["--- End forwarded message ---"]
+    attribution = HookManager.run("forward-attribution", :message => m) || default_attribution(m)
+    attribution[0,1] +
+    m.quotable_header_lines +
+    [""] +
+    m.quotable_body_lines +
+    attribution[1,1]
+  end
+
+  def default_attribution m
+    ["--- Begin forwarded message from #{m.from.mediumname} ---",
+     "--- End forwarded message ---"]
   end
 
   def send_message

data/lib/sup/modes/line_cursor_mode.rb

@@ -65,7 +65,7 @@ protected
   def set_cursor_pos p
     return if @curpos == p
     @curpos = p.clamp @cursor_top, lines
-    buffer.mark_dirty
+    buffer.mark_dirty if buffer # not sure why the buffer is gone
     set_status
   end
 

data/lib/sup/modes/reply_mode.rb

@@ -36,6 +36,8 @@ Variables:
              [:#{REPLY_TYPES * ', :'}]
          The default behavior is equivalent to
              ([:list, :sender, :recipent] & modes)[0]
+  message: a message object representing the message being replied to
+    (useful values include message.is_list_message? and message.list_address)
 Return value:
   The reply mode you desire, or nil to use the default behavior.
 EOS
@@ -130,7 +132,7 @@ EOS
     types = REPLY_TYPES.select { |t| @headers.member?(t) }
     @type_selector = HorizontalSelector.new "Reply to:", types, types.map { |x| TYPE_DESCRIPTIONS[x] }
 
-    hook_reply = HookManager.run "reply-to", :modes => types
+    hook_reply = HookManager.run "reply-to", :modes => types, :message => @m
 
     @type_selector.set_to(
       if types.include? type_arg

data/lib/sup/modes/text_mode.rb

@@ -24,10 +24,15 @@ class TextMode < ScrollMode
     command = BufferManager.ask(:shell, "pipe command: ")
     return if command.nil? || command.empty?
 
-    output = pipe_to_process(command) do |stream|
+    output, success = pipe_to_process(command) do |stream|
       @text.each { |l| stream.puts l }
     end
 
+    unless success
+      BufferManager.flash "Invalid command: '#{command}' is not an executable"
+      return
+    end
+
     if output
       BufferManager.spawn "Output of '#{command}'", TextMode.new(output.ascii)
     else

data/lib/sup/modes/thread_index_mode.rb

@@ -696,7 +696,7 @@ EOS
     @ts.threads.each { |th| th.labels.each { |l| LabelManager << l } }
 
     update
-    BufferManager.clear @mbid
+    BufferManager.clear @mbid if @mbid
     @mbid = nil
     BufferManager.draw_screen
     @ts.size - orig_size
@@ -856,6 +856,12 @@ protected
     need_update = false
 
     @mutex.synchronize do
+      # and certainly not sure why this happens..
+      #
+      # probably a race condition between thread modification and updating
+      # going on.
+      return if @threads[l].empty?
+
       @size_widgets[l] = size_widget_for_thread @threads[l]
       @date_widgets[l] = date_widget_for_thread @threads[l]
 
@@ -1020,7 +1026,11 @@ private
   end
 
   def from_width
-    [(buffer.content_width.to_f * 0.2).to_i, MIN_FROM_WIDTH].max
+    if buffer
+      [(buffer.content_width.to_f * 0.2).to_i, MIN_FROM_WIDTH].max
+    else
+      MIN_FROM_WIDTH # not sure why the buffer is gone
+    end
   end
 
   def initialize_threads

data/lib/sup/modes/thread_view_mode.rb

@@ -10,8 +10,6 @@ class ThreadViewMode < LineCursorMode
     attr_accessor :state
   end
 
-  INDENT_SPACES = 2 # how many spaces to indent child messages
-
   HookManager.register "detailed-headers", <<EOS
 Add or remove headers from the detailed header display of a message.
 Variables:
@@ -42,10 +40,19 @@ Return value:
   None.
 EOS
 
+  HookManager.register "goto", <<EOS
+Open the uri given as a parameter.
+Variables:
+      uri: The uri
+Return value:
+  None.
+EOS
+
   register_keymap do |k|
     k.add :toggle_detailed_header, "Toggle detailed header", 'h'
     k.add :show_header, "Show full message header", 'H'
     k.add :show_message, "Show full message (raw form)", 'V'
+    k.add :reload, "Update message in thread", '@'
     k.add :activate_chunk, "Expand/collapse or activate item", :enter
     k.add :expand_all_messages, "Expand/collapse all messages", 'E'
     k.add :edit_draft, "Edit draft", 'e'
@@ -80,6 +87,9 @@ EOS
     k.add :kill_and_next, "Kill this thread, kill buffer, and view next", '&'
     k.add :toggle_wrap, "Toggle wrapping of text", 'w'
 
+    k.add :goto_uri, "Goto uri under cursor", 'g'
+    k.add :fetch_and_verify, "Fetch the PGP key on poolserver and re-verify message", "v"
+
     k.add_multi "(a)rchive/(d)elete/mark as (s)pam/mark as u(N)read:", '.' do |kk|
       kk.add :archive_and_kill, "Archive this thread and kill buffer", 'a'
       kk.add :delete_and_kill, "Delete this thread and kill buffer", 'd'
@@ -116,6 +126,7 @@ EOS
   ## objects. @person_lines is a map from row #s to Person objects.
 
   def initialize thread, hidden_labels=[], index_mode=nil
+    @indent_spaces = $config[:indent_spaces]
     super :slip_rows => $config[:slip_rows]
     @thread = thread
     @hidden_labels = hidden_labels
@@ -194,6 +205,10 @@ EOS
     @layout[m].state = (@layout[m].state == :detailed ? :open : :detailed)
     update
   end
+  
+  def reload
+    update
+  end
 
   def reply type_arg=nil
     m = @message_lines[curpos] or return
@@ -214,10 +229,24 @@ EOS
 
   def unsubscribe_from_list
     m = @message_lines[curpos] or return
-    if m.list_unsubscribe && m.list_unsubscribe =~ /<mailto:(.*?)(\?subject=(.*?))?>/
+    BufferManager.flash "Can't find List-Unsubscribe header for this message." unless m.list_unsubscribe
+
+    if m.list_unsubscribe =~ /<mailto:(.*?)(\?subject=(.*?))?>/
       ComposeMode.spawn_nicely :from => AccountManager.account_for(m.recipient_email), :to => [Person.from_address($1)], :subj => ($3 || "unsubscribe")
-    else
-      BufferManager.flash "Can't find List-Unsubscribe header for this message."
+    elsif m.list_unsubscribe =~ /<(http.*)?>/
+      unless HookManager.enabled? "goto"
+        BufferManager.flash "You must add a goto.rb hook before you can goto an unsubscribe URI."
+        return
+      end
+
+      begin
+        u = URI.parse($1)
+      rescue URI::InvalidURIError => e
+        BufferManager.flash("Invalid unsubscribe link")
+        return
+      end
+
+      HookManager.run "goto", :uri => Shellwords.escape(u.to_s)
     end
   end
 
@@ -364,7 +393,7 @@ EOS
     when Chunk::Attachment
       default_dir = $config[:default_attachment_save_dir]
       default_dir = ENV["HOME"] if default_dir.nil? || default_dir.empty?
-      default_fn = File.expand_path File.join(default_dir, chunk.filename)
+      default_fn = File.expand_path File.join(default_dir, chunk.filesafe_filename)
       fn = BufferManager.ask_for_filename :filename, "Save attachment to file or directory: ", default_fn, true
 
       # if user selects directory use file name from message
@@ -393,7 +422,7 @@ EOS
     num_errors = 0
     m.chunks.each do |chunk|
       next unless chunk.is_a?(Chunk::Attachment)
-      fn = File.join(folder, chunk.filename)
+      fn = File.join(folder, chunk.filesafe_filename)
       num_errors += 1 unless save_to_file(fn, false) { |f| f.print chunk.raw_content }
       num += 1
     end
@@ -536,7 +565,7 @@ EOS
     l = @layout[m]
 
     ## boundaries of the message
-    message_left = l.depth * INDENT_SPACES
+    message_left = l.depth * @indent_spaces
     message_right = message_left + l.width
 
     ## calculate leftmost colum
@@ -698,7 +727,7 @@ EOS
     command = BufferManager.ask(:shell, "pipe command: ")
     return if command.nil? || command.empty?
 
-    output = pipe_to_process(command) do |stream|
+    output, success = pipe_to_process(command) do |stream|
       if chunk
         stream.print chunk.raw_content
       else
@@ -706,6 +735,11 @@ EOS
       end
     end
 
+    unless success
+      BufferManager.flash "Invalid command: '#{command}' is not an executable"
+      return
+    end
+
     if output
       BufferManager.spawn "Output of '#{command}'", TextMode.new(output.ascii)
     else
@@ -722,6 +756,68 @@ EOS
     [user_labels, super].join(" -- ")
   end
 
+  def goto_uri
+    unless (chunk = @chunk_lines[curpos])
+      BufferManager.flash "No URI found."
+      return
+    end
+    unless HookManager.enabled? "goto"
+      BufferManager.flash "You must add a goto.rb hook before you can goto a URI."
+      return
+    end
+
+    # @text is a list of lines with this format:
+    # [
+    #   [[:text_color, "Some text"]]
+    #   [[:text_color, " continued here"]]
+    # ]
+
+    linetext = @text.slice(curpos, @text.length).flatten(1)
+      .take_while{|d| [:text_color, :sig_color].include?(d[0]) and d[1].strip != ""} # Only take up to the first "" alone on its line
+      .map{|d| d[1].strip}.join("").strip
+
+    found = false
+    URI.extract(linetext || "").each do |match|
+      begin
+        u = URI.parse(match)
+        next unless u.absolute?
+        next unless ["http", "https"].include?(u.scheme)
+
+        reallink = Shellwords.escape(u.to_s)
+        BufferManager.flash "Going to #{reallink} ..."
+        HookManager.run "goto", :uri => reallink
+        BufferManager.completely_redraw_screen
+        found = true
+
+      rescue URI::InvalidURIError => e
+        debug "not a uri: #{e}"
+        # Do nothing, this is an ok flow
+      end
+    end
+    BufferManager.flash "No URI found." unless found
+  end
+
+  def fetch_and_verify
+    message = @message_lines[curpos]
+    crypto_chunk = message.chunks.select {|chunk| chunk.is_a?(Chunk::CryptoNotice)}.first
+    return unless crypto_chunk
+    return unless crypto_chunk.unknown_fingerprint
+
+    BufferManager.flash "Retrieving key #{crypto_chunk.unknown_fingerprint} ..."
+
+    error = CryptoManager.retrieve crypto_chunk.unknown_fingerprint
+
+    if error
+      BufferManager.flash "Couldn't retrieve key: #{error.to_s}"
+    else
+      BufferManager.flash "Key #{crypto_chunk.unknown_fingerprint} successfully retrieved !"
+    end
+
+    # Re-trigger gpg verification
+    message.reload_from_source!
+    update
+  end
+
 private
 
   def initial_state_for m
@@ -793,7 +889,7 @@ private
           (0 ... text.length).each do |i|
             @chunk_lines[@text.length + i] = c
             @message_lines[@text.length + i] = m
-            lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.display_length }.sum - (depth * INDENT_SPACES)
+            lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.display_length }.sum - (depth * @indent_spaces)
             l.width = lw if lw > l.width
           end
           @text += text
@@ -847,9 +943,10 @@ private
         addressee_lines += format_person_list "   Bcc: ", m.bcc
       end
 
-      headers = OrderedHash.new
-      headers["Date"] = "#{m.date.to_message_nice_s} (#{m.date.to_nice_distance_s})"
-      headers["Subject"] = m.subj
+      headers = {
+        "Date" => "#{m.date.to_message_nice_s} (#{m.date.to_nice_distance_s})",
+        "Subject" => m.subj
+      }
 
       show_labels = @thread.labels - LabelManager::HIDDEN_RESERVED_LABELS
       unless show_labels.empty?
@@ -897,7 +994,7 @@ private
 
   ## todo: check arguments on this overly complex function
   def chunk_to_lines chunk, state, start, depth, parent=nil, color=nil, star_color=nil
-    prefix = " " * INDENT_SPACES * depth
+    prefix = " " * @indent_spaces * depth
     case chunk
     when :fake_root
       [[[:missing_message_color, "#{prefix}<one or more unreceived messages>"]]]

data/lib/sup/person.rb

@@ -18,11 +18,16 @@ class Person
     @email = email.strip.gsub(/\s+/, " ")
   end
 
-  def to_s; "#@name <#@email>" end
+  def to_s
+    if @name
+      "#@name <#@email>"
+    else
+      @email
+    end
+  end
 
 #   def == o; o && o.email == email; end
 #   alias :eql? :==
-#   def hash; [name, email].hash; end
 
   def shortname
     case @name
@@ -37,26 +42,10 @@ class Person
     end
   end
 
-  def longname
-    if @name && @email
-      "#@name <#@email>"
-    else
-      @email
-    end
-  end
-
   def mediumname; @name || @email; end
 
-  def Person.full_address name, email
-    if name && email
-      if name =~ /[",@]/
-        "#{name.inspect} <#{email}>" # escape quotes
-      else
-        "#{name} <#{email}>"
-      end
-    else
-      email
-    end
+  def longname
+    to_s
   end
 
   def full_address
@@ -79,56 +68,74 @@ class Person
     end.downcase
   end
 
-  ## return "canonical" person using contact manager or create one if
-  ## not found or contact manager not available
-  def self.from_name_and_email name, email
-    ContactManager.instantiated? && ContactManager.person_for(email) || Person.new(name, email)
+  def eql? o; email.eql? o.email end
+  def hash; email.hash end
+
+
+  ## see comments in self.from_address
+  def indexable_content
+    [name, email, email.split(/@/).first].join(" ")
   end
 
-  def self.from_address s
-    return nil if s.nil?
-
-    ## try and parse an email address and name
-    name, email = case s
-      when /(.+?) ((\S+?)@\S+) \3/
-        ## ok, this first match cause is insane, but bear with me.  email
-        ## addresses are stored in the to/from/etc fields of the index in a
-        ## weird format: "name address first-part-of-address", i.e.  spaces
-        ## separating those three bits, and no <>'s. this is the output of
-        ## #indexable_content. here, we reverse-engineer that format to extract
-        ## a valid address.
-        ##
-        ## we store things this way to allow searches on a to/from/etc field to
-        ## match any of those parts. a more robust solution would be to store a
-        ## separate, non-indexed field with the proper headers. but this way we
-        ## save precious bits, and it's backwards-compatible with older indexes.
-        [$1, $2]
-      when /["'](.*?)["'] <(.*?)>/, /([^,]+) <(.*?)>/
-        a, b = $1, $2
-        [a.gsub('\"', '"'), b]
-      when /<((\S+?)@\S+?)>/
-        [$2, $1]
-      when /((\S+?)@\S+)/
-        [$2, $1]
+  class << self
+
+    def full_address name, email
+      if name && email
+        if name =~ /[",@]/
+          "#{name.inspect} <#{email}>" # escape quotes
+        else
+          "#{name} <#{email}>"
+        end
       else
-        [nil, s]
+        email
       end
+    end
 
-    from_name_and_email name, email
-  end
+    ## return "canonical" person using contact manager or create one if
+    ## not found or contact manager not available
+    def from_name_and_email name, email
+      ContactManager.instantiated? && ContactManager.person_for(email) || Person.new(name, email)
+    end
 
-  def self.from_address_list ss
-    return [] if ss.nil?
-    ss.dup.split_on_commas.map { |s| self.from_address s }
-  end
+    def from_address s
+      return nil if s.nil?
+
+      ## try and parse an email address and name
+      name, email = case s
+        when /(.+?) ((\S+?)@\S+) \3/
+          ## ok, this first match cause is insane, but bear with me.  email
+          ## addresses are stored in the to/from/etc fields of the index in a
+          ## weird format: "name address first-part-of-address", i.e.  spaces
+          ## separating those three bits, and no <>'s. this is the output of
+          ## #indexable_content. here, we reverse-engineer that format to extract
+          ## a valid address.
+          ##
+          ## we store things this way to allow searches on a to/from/etc field to
+          ## match any of those parts. a more robust solution would be to store a
+          ## separate, non-indexed field with the proper headers. but this way we
+          ## save precious bits, and it's backwards-compatible with older indexes.
+          [$1, $2]
+        when /["'](.*?)["'] <(.*?)>/, /([^,]+) <(.*?)>/
+          a, b = $1, $2
+          [a.gsub('\"', '"'), b]
+        when /<((\S+?)@\S+?)>/
+          [$2, $1]
+        when /((\S+?)@\S+)/
+          [$2, $1]
+        else
+          [nil, s]
+        end
+
+      from_name_and_email name, email
+    end
+
+    def from_address_list ss
+      return [] if ss.nil?
+      ss.dup.split_on_commas.map { |s| self.from_address s }
+    end
 
-  ## see comments in self.from_address
-  def indexable_content
-    [name, email, email.split(/@/).first].join(" ")
   end
 
-  def eql? o; email.eql? o.email end
-  def hash; email.hash end
 end
 
 end