sup 0.0.6 → 0.0.7

data/lib/sup/mbox/loader.rb

@@ -29,7 +29,6 @@ class Loader < Source
 
   def start_offset; 0; end
   def end_offset; File.size @f; end
-  def pct_done; 100.0 * cur_offset.to_f / end_offset.to_f; end
 
   def load_header offset
     header = nil

data/lib/sup/mbox/ssh-file.rb

@@ -92,6 +92,9 @@ class SSHFile
   REASONABLE_TRANSFER_SIZE = 1024 * 32
   SIZE_CHECK_INTERVAL = 60 * 1 # seconds
 
+  ## upon these errors we'll try to rereconnect a few times
+  RECOVERABLE_ERRORS = [ Errno::EPIPE, Errno::ETIMEDOUT ]
+
   @@shells = {}
   @@shells_mutex = Mutex.new
 
@@ -105,46 +108,15 @@ class SSHFile
     @say_id = nil
     @broken_msg = nil
     @shell = nil
-    @shell_mutex = Mutex.new
+    @shell_mutex = nil
     @buf_mutex = Mutex.new
   end
 
-  def to_s; "mbox+ssh://#@host/#@fn"; end ## TODO: remove thisis EVILness
+  def to_s; "mbox+ssh://#@host/#@fn"; end ## TODO: remove this EVILness
   def broken?; !@broken_msg.nil?; end
 
-  ## TODO: share this code with imap
-  def say s
-    @say_id = BufferManager.say s, @say_id if BufferManager.instantiated?
-    Redwood::log s
-  end
-  def shutup
-    BufferManager.clear @say_id if BufferManager.instantiated? && @say_id
-    @say_id = nil
-  end
-  private :say, :shutup
-
   def connect
-    raise SSHFileError, @broken_msg if broken?
-    return if @shell
-
-    @key = [@host, @ssh_opts[:username]]
-    begin
-      @shell = @@shells_mutex.synchronize do
-        unless @@shells.member? @key
-          say "Opening SSH connection to #{@host} for #@fn..."
-          #raise SSHFileError, "simulated SSH file error"
-          session = Net::SSH.start @host, @ssh_opts
-          say "Starting SSH shell..."
-          @@shells[@key] = session.shell.sync
-        end
-        @@shells[@key]
-      end
-
-      say "Checking for #@fn..."
-      @shell_mutex.synchronize { raise Errno::ENOENT, @fn unless @shell.test("-e #@fn").status == 0 }
-    ensure
-      shutup
-    end
+    do_remote nil
   end
 
   def eof?; @offset >= size; end
@@ -180,32 +152,71 @@ class SSHFile
 
 private
 
+  ## TODO: share this code with imap
+  def say s
+    @say_id = BufferManager.say s, @say_id if BufferManager.instantiated?
+    Redwood::log s
+  end
+
+  def shutup
+    BufferManager.clear @say_id if BufferManager.instantiated? && @say_id
+    @say_id = nil
+  end
+
+  def unsafe_connect
+    raise SSHFileError, @broken_msg if broken?
+    return if @shell
+
+    @key = [@host, @ssh_opts[:username]]
+    begin
+      @shell, @shell_mutex = @@shells_mutex.synchronize do
+        unless @@shells.member? @key
+          say "Opening SSH connection to #{@host} for #@fn..."
+          #raise SSHFileError, "simulated SSH file error"
+          session = Net::SSH.start @host, @ssh_opts
+          say "Starting SSH shell..."
+          @@shells[@key] = [session.shell.sync, Mutex.new]
+        end
+        @@shells[@key]
+      end
+
+      say "Checking for #@fn..."
+      @shell_mutex.synchronize { raise Errno::ENOENT, @fn unless @shell.test("-e #@fn").status == 0 }
+    ensure
+      shutup
+    end
+  end
+
   def do_remote cmd, expected_size=0
+    retries = 0
+    result = nil
     begin
-      retries = 0
-      connect
-      # MBox::debug "sending command: #{cmd.inspect}"
       begin
-        result = @shell_mutex.synchronize { x = @shell.send_command cmd; sleep 0.25; x }
-        raise SSHFileError, "Failure during remote command #{cmd.inspect}: #{(result.stderr || result.stdout || "")[0 .. 100]}" unless result.status == 0
-      rescue Net::SSH::Exception # these happen occasionally for no apparent reason. gotta love that nondeterminism!
-        retry if (retries += 1) <= 3
-        raise
-      rescue Errno::EPIPE
-        if (retries += 1) <= e
+        unsafe_connect
+        if cmd
+          # MBox::debug "sending command: #{cmd.inspect}"
+          result = @shell_mutex.synchronize { x = @shell.send_command cmd; sleep 0.25; x }
+          raise SSHFileError, "Failure during remote command #{cmd.inspect}: #{(result.stderr || result.stdout || "")[0 .. 100]}" unless result.status == 0
+        end
+
+        ## Net::SSH::Exceptions seem to happen every once in a while for
+        ## no good reason.
+      rescue Net::SSH::Exception, *RECOVERABLE_ERRORS
+        if (retries += 1) <= 3
           @@shells_mutex.synchronize do
             @shell = nil
             @@shells[@key] = nil
           end
-          connect
           retry
         end
+        raise
       end
-    rescue Net::SSH::Exception, SSHFileError, Errno::ENOENT => e
+    rescue Net::SSH::Exception, SSHFileError, SystemCallError => e
       @broken_msg = e.message
       raise
     end
-    result.stdout
+
+    result.stdout if cmd
   end
 
   def get_bytes offset, size

data/lib/sup/mbox/ssh-loader.rb

@@ -36,26 +36,21 @@ class SSHLoader < Source
     @labels << File.basename(filename).intern unless File.dirname(filename) =~ /\b(var|usr|spool)\b/
   end
 
+  def connect; safely { @f.connect }; end
   def host; @parsed_uri.host; end
   def filename; @parsed_uri.path[1..-1] end
 
   def next
     return if broken?
-    begin
+    safely do
       offset, labels = @loader.next
       self.cur_offset = @loader.cur_offset # superclass keeps @cur_offset which is used by yaml
       [offset, (labels + @labels).uniq] # add our labels
-    rescue Net::SSH::Exception, SocketError, SSHFileError, Errno::ENOENT => e
-      recover_from e
     end
   end
 
   def end_offset
-    begin
-      @f.size
-    rescue Net::SSH::Exception, SocketError, SSHFileError, Errno::ENOENT => e
-      recover_from e
-    end
+    safely { @f.size }
   end
 
   def cur_offset= o; @cur_offset = @loader.cur_offset = o; @dirty = true; end
@@ -64,21 +59,19 @@ class SSHLoader < Source
   # def cur_offset; @loader.cur_offset; end # think we'll be ok without this
   def to_s; @parsed_uri.to_s; end
 
-  def recover_from e
-    m = "error communicating with SSH server #{host} (#{e.class.name}): #{e.message}"
-    Redwood::log m
-    self.broken_msg = @loader.broken_msg = m
-    raise SourceError, m
+  def safely
+    begin
+      yield
+    rescue Net::SSH::Exception, SocketError, SSHFileError, SystemCallError => e
+      m = "error communicating with SSH server #{host} (#{e.class.name}): #{e.message}"
+      Redwood::log m
+      self.broken_msg = @loader.broken_msg = m
+      raise SourceError, m
+    end
   end
 
   [:start_offset, :load_header, :load_message, :raw_header, :raw_full_message].each do |meth|
-    define_method meth do |*a|
-      begin
-        @loader.send meth, *a
-      rescue Net::SSH::Exception, SocketError, SSHFileError, Errno::ENOENT => e
-        recover_from e
-      end
-    end
+    define_method(meth) { |*a| safely { @loader.send meth, *a } }
   end
 end
 

data/lib/sup/message.rb

@@ -17,6 +17,7 @@ class MessageFormatError < StandardError; end
 ## appropriately.
 class Message
   SNIPPET_LEN = 80
+  WRAP_LEN = 80 # wrap at this width
   RE_PATTERN = /^((re|re[\[\(]\d[\]\)]):\s*)+/i
     
   ## some utility methods
@@ -45,6 +46,7 @@ class Message
 
       ## TODO: handle unknown mime-types
       system "/usr/bin/run-mailcap --action=view #{@content_type}:#{@file.path}"
+      $? == 0
     end
 
     def to_s; @part.decode; end
@@ -54,7 +56,7 @@ class Message
     attr_reader :lines
     def initialize lines
       ## do some wrapping
-      @lines = lines.map { |l| l.chomp.wrap 80 }.flatten
+      @lines = lines.map { |l| l.chomp.wrap WRAP_LEN }.flatten
     end
   end
 
@@ -75,14 +77,14 @@ class Message
   QUOTE_PATTERN = /^\s{0,4}[>|\}]/
   BLOCK_QUOTE_PATTERN = /^-----\s*Original Message\s*----+$/
   QUOTE_START_PATTERN = /(^\s*Excerpts from)|(^\s*In message )|(^\s*In article )|(^\s*Quoting )|((wrote|writes|said|says)\s*:\s*$)/
-  SIG_PATTERN = /(^-- ?$)|(^\s*----------+\s*$)|(^\s*_________+\s*$)/
+  SIG_PATTERN = /(^-- ?$)|(^\s*----------+\s*$)|(^\s*_________+\s*$)|(^\s*--~--~-)/
   MAX_SIG_DISTANCE = 15 # lines from the end
   DEFAULT_SUBJECT = "(missing subject)"
   DEFAULT_SENDER = "(missing sender)"
 
   attr_reader :id, :date, :from, :subj, :refs, :replytos, :to, :source,
               :cc, :bcc, :labels, :list_address, :recipient_email, :replyto,
-              :source_info
+              :source_info, :chunks
 
   bool_reader :dirty, :source_marked_read
 
@@ -95,6 +97,7 @@ class Message
     @have_snippet = !opts[:snippet].nil?
     @labels = opts[:labels] || []
     @dirty = false
+    @chunks = nil
 
     read_header(opts[:header] || @source.load_header(@source_info))
   end
@@ -130,13 +133,13 @@ class Message
         nil
       end
 
-    @recipient_email = header["x-original-to"] || header["envelope-to"] || header["delivered-to"]
+    @recipient_email = header["envelope-to"] || header["x-original-to"] || header["delivered-to"]
     @source_marked_read = header["status"] == "RO"
   end
   private :read_header
 
   def broken?; @source.broken?; end
-  def snippet; @snippet || to_chunks && @snippet; end
+  def snippet; @snippet || chunks && @snippet; end
   def is_list_message?; !@list_address.nil?; end
   def is_draft?; DraftLoader === @source; end
   def draft_filename
@@ -172,7 +175,7 @@ class Message
   end
 
   ## this is called when the message body needs to actually be loaded.
-  def to_chunks
+  def load_from_source!
     @chunks ||=
       if @source.broken?
         [Text.new(error_message(@source.broken_msg.split("\n")))]
@@ -184,6 +187,8 @@ class Message
           ## i could just store that in the index, but i think there might
           ## be other things like that in the future, and i'd rather not
           ## bloat the index.
+          ## actually, it's also the differentiation between to/cc/bcc,
+          ## so i will keep this.
           read_header @source.load_header(@source_info)
           message_to_chunks @source.load_message(@source_info)
         rescue SourceError, SocketError, MessageFormatError => e
@@ -223,18 +228,19 @@ EOS
   end
 
   def content
+    load_from_source!
     [
       from && "#{from.name} #{from.email}",
       to.map { |p| "#{p.name} #{p.email}" },
       cc.map { |p| "#{p.name} #{p.email}" },
       bcc.map { |p| "#{p.name} #{p.email}" },
-      to_chunks.select { |c| c.is_a? Text }.map { |c| c.lines },
+      chunks.select { |c| c.is_a? Text }.map { |c| c.lines },
       Message.normalize_subj(subj),
     ].flatten.compact.join " "
   end
 
   def basic_body_lines
-    to_chunks.find_all { |c| c.is_a?(Text) || c.is_a?(Quote) }.map { |c| c.lines }.flatten
+    chunks.find_all { |c| c.is_a?(Text) || c.is_a?(Quote) }.map { |c| c.lines }.flatten
   end
 
   def basic_header_lines
@@ -300,7 +306,7 @@ private
       when :quote
         newstate = nil
 
-        if line =~ QUOTE_PATTERN || line =~ QUOTE_START_PATTERN || line =~ /^\s*$/
+        if line =~ QUOTE_PATTERN || line =~ QUOTE_START_PATTERN #|| line =~ /^\s*$/
           chunk_lines << line
         elsif line =~ SIG_PATTERN && (lines.length - i) < MAX_SIG_DISTANCE
           newstate = :sig

data/lib/sup/mode.rb

@@ -48,12 +48,9 @@ class Mode
   end
 
   def handle_input c
-    if(action = resolve_input c)
-      send action
-      true
-    else
-      false
-    end
+    action = resolve_input(c) or return false
+    send action
+    true
   end
 
   def help_text
@@ -75,6 +72,19 @@ EOS
       s
     end.compact.join "\n"
   end
+
+  ## helper function
+  def save_to_file fn
+    if File.exists? fn
+      return unless BufferManager.ask_yes_or_no "File exists. Overwrite?"
+    end
+    begin
+      File.open(fn, "w") { |f| yield f }
+      BufferManager.flash "Successfully wrote #{fn}."
+    rescue SystemCallError => e
+      BufferManager.flash "Error writing to file: #{e.message}"
+    end
+  end
 end
 
 end

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

@@ -3,15 +3,19 @@ module Redwood
 class ComposeMode < EditMessageMode
   attr_reader :body, :header
 
-  def initialize h={}
+  def initialize opts={}
     super()
     @header = {
       "From" => AccountManager.default_account.full_address,
       "Message-Id" => gen_message_id,
     }
 
-    @header["To"] = [h[:to]].flatten.compact.map { |p| p.full_address }
-    @body = sig_lines
+    @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]
+    @header["Subject"] = opts[:subj] if opts[:subj]
+
+    @body = (opts[:body] || []) + sig_lines
     regen_text
   end
 

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

@@ -1,12 +1,23 @@
 module Redwood
 
+module CanAliasContacts
+  def alias_contact p
+    a = BufferManager.ask(:alias, "Nickname for #{p.longname}: ", ContactManager.alias_for(p)) or return
+    if a.empty?
+      ContactManager.drop_contact p
+    else
+      ContactManager.set_contact p, a
+    end
+  end
+end
+
 class ContactListMode < LineCursorMode
   LOAD_MORE_CONTACTS_NUM = 10
 
   register_keymap do |k|
     k.add :load_more, "Load #{LOAD_MORE_CONTACTS_NUM} more contacts", 'M'
-    k.add :reload, "Reload contacts", 'R'
-    k.add :alias, "Edit alias for contact", 'a'
+    k.add :reload, "Drop contact list and reload", 'D'
+    k.add :alias, "Edit nickname/alias for contact", 'a'
     k.add :toggle_tagged, "Tag/untag current line", 't'
     k.add :apply_to_tagged, "Apply next command to all tagged items", ';'
     k.add :search, "Search for messages from particular people", 'S'
@@ -15,10 +26,18 @@ class ContactListMode < LineCursorMode
   def initialize mode = :regular
     @mode = mode
     @tags = Tagger.new self
-    @num = 0
+    @num = nil
+    @text = []
     super()
   end
 
+  include CanAliasContacts
+  def alias
+    p = @contacts[curpos] or return
+    alias_contact p
+    update
+  end
+
   def lines; @text.length; end
   def [] i; @text[i]; end
 
@@ -31,15 +50,15 @@ class ContactListMode < LineCursorMode
 
   def multi_toggle_tagged threads
     @tags.drop_all_tags
-    regen_text
+    update
   end
 
   def apply_to_tagged; @tags.apply_to_tagged; end
 
-  def load; regen_text; end
   def load_more num=LOAD_MORE_CONTACTS_NUM
     @num += num
-    regen_text
+    load
+    update
     BufferManager.flash "Added #{num} contacts."
   end
 
@@ -59,7 +78,7 @@ class ContactListMode < LineCursorMode
 
   def multi_search people
     mode = PersonSearchResultsMode.new people
-    BufferManager.spawn "personal search results", mode
+    BufferManager.spawn "search for #{people.map { |p| p.name }.join(', ')}", mode
     mode.load_threads :num => mode.buffer.content_height
   end
 
@@ -70,49 +89,55 @@ class ContactListMode < LineCursorMode
 
   def reload
     @tags.drop_all_tags
+    @num = nil
     load
   end
 
-  def alias
-    p = @contacts[curpos] or return
-    a = BufferManager.ask(:alias, "alias for #{p.longname}: ", @user_contacts[p]) or return
-    if a.empty?
-      ContactManager.drop_contact p
-    else
-      ContactManager.set_contact p, a
-      @user_contacts[p] = a
-      update_text_for_line curpos
+  def load_in_background
+    Redwood::reporting_thread do
+      load
+      update
+      BufferManager.draw_screen
     end
   end
 
+  def load
+    @num ||= buffer.content_height
+    @user_contacts = ContactManager.contacts
+    num = [@num - @user_contacts.length, 0].max
+    BufferManager.say("Loading #{num} contacts from index...") do
+      recentc = Index.load_contacts AccountManager.user_emails, :num => num
+      @contacts = (@user_contacts + recentc).sort_by { |p| p.sort_by_me }.uniq
+    end
+  end
+  
 protected
 
+  def update
+    regen_text
+    buffer.mark_dirty if buffer
+  end
+
   def update_text_for_line line
     @text[line] = text_for_contact @contacts[line]
-    buffer.mark_dirty
+    buffer.mark_dirty if buffer
   end
 
   def text_for_contact p
-    aalias = @user_contacts[p] || ""
+    aalias = ContactManager.alias_for(p) || ""
     [[:tagged_color, @tags.tagged?(p) ? ">" : " "],
      [:none, sprintf("%-#{@awidth}s %-#{@nwidth}s %s", aalias, p.name, p.email)]]
   end
 
   def regen_text
-    @user_contacts = ContactManager.contacts.invert
-    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
-
     @awidth, @nwidth = 0, 0
     @contacts.each do |p|
-      aalias = @user_contacts[p]
+      aalias = ContactManager.alias_for(p)
       @awidth = aalias.length if aalias && aalias.length > @awidth
       @nwidth = p.name.length if p.name && p.name.length > @nwidth
     end
 
     @text = @contacts.map { |p| text_for_contact p }
-    buffer.mark_dirty if buffer
   end
 end