sup 0.0.2 → 0.0.3

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

@@ -7,7 +7,7 @@ class InboxMode < ThreadIndexMode
     ## overwrite toggle_archived with archive
     k.add :archive, "Archive thread (remove from inbox)", 'a'
     k.add :load_more_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M'
-    k.add :reload, "Discard threads and reload", 'R'
+    k.add :reload, "Discard threads and reload", 'D'
   end
 
   def initialize

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

@@ -3,7 +3,7 @@ module Redwood
 class LabelListMode < LineCursorMode
   register_keymap do |k|
     k.add :view_results, "View messages with the selected label", :enter
-    k.add :reload, "Reload", "R"
+    k.add :reload, "Discard results and reload", 'D'
   end
 
   def initialize

data/lib/sup/modes/line-cursor-mode.rb

@@ -79,7 +79,6 @@ protected
     if @curpos == topline
       page_up
       set_cursor_pos [botline - 2, topline].max
-#      raise "cursor position now #@curpos, topline #{topline} botline #{botline}"
     else
       @curpos -= 1
       unless buffer.dirty?

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

@@ -77,6 +77,11 @@ class ScrollMode < Mode
     @botline = [@topline + buffer.content_height, lines].min
   end
 
+  def resize *a
+    super *a
+    ensure_mode_validity
+  end
+
 protected
 
   def draw_line ln, opts={}
@@ -86,13 +91,18 @@ protected
                    :highlight => opts[:highlight]
     when Array
       xpos = 0
+
+      ## speed test
+      # str = s.map { |color, text| text }.join
+      # buffer.write ln - @topline, 0, str, :color => :none, :highlight => opts[:highlight]
+      # return
+
       s.each do |color, text|
-        raise "nil text for color '#{color}'" if text.nil?
+        raise "nil text for color '#{color}'" if text.nil? # good for debugging
         if xpos + text.length < @leftcol
           buffer.write ln - @topline, 0, "", :color => color,
                        :highlight => opts[:highlight]
           xpos += text.length
-          ## nothing
         elsif xpos < @leftcol
           ## partial
           buffer.write ln - @topline, 0, text[(@leftcol - xpos) .. -1],

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

@@ -5,9 +5,8 @@ class SearchResultsMode < ThreadIndexMode
     k.add :load_more_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M'
   end
 
-  def initialize content
-    raise ArgumentError, "no content" if content =~ /^\s*$/
-    @content = content.gsub(/[\(\)]/) { |x| "\\" + x }
+  def initialize qobj
+    @qobj = qobj
     super
   end
 
@@ -15,7 +14,7 @@ class SearchResultsMode < ThreadIndexMode
   def is_relevant? m; super; end
 
   def load_more_threads n=ThreadIndexMode::LOAD_MORE_THREAD_NUM
-    load_n_threads_background n, :content => @content,
+    load_n_threads_background n, :qobj => @qobj,
                                  :load_killed => true,
                                  :load_spam => false,
                                  :when_done =>(lambda do |num|

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

@@ -4,7 +4,7 @@ class TextMode < ScrollMode
   attr_reader :text
 
   def initialize text=""
-    @text = text
+    @text = text.normalize_whitespace
     update_lines
     buffer.mark_dirty if buffer
     super()

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

@@ -47,8 +47,11 @@ class ThreadIndexMode < LineCursorMode
     t = @threads[this_curpos]
 
     ## TODO: don't regen text completely
-    mode = ThreadViewMode.new t, @hidden_labels
-    BufferManager.spawn t.subj, mode
+    Redwood::reporting_thread do
+      mode = ThreadViewMode.new t, @hidden_labels
+      BufferManager.spawn t.subj, mode
+      BufferManager.draw_screen
+    end
   end
   
   def handle_starred_update m
@@ -287,9 +290,7 @@ class ThreadIndexMode < LineCursorMode
     update
     BufferManager.clear @mbid
     @mbid = nil
-
     BufferManager.draw_screen
-
     @ts.size - orig_size
   end
 
@@ -320,6 +321,7 @@ protected
   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]
     buffer.mark_dirty if buffer
   end
@@ -359,11 +361,11 @@ protected
       [base_color, sprintf("%-#{@from_width}s", from)],
       [:starred_color, starred ? "*" : " "],
       [:none, t.size == 1 ? " " * (@size_width + 2) : sprintf("(%#{@size_width}d)", t.size)],
-      [:to_me_color, dp ? " >" : (p ? ' -' : "  ")],
-      [base_color, t.subj]
+      [:to_me_color, dp ? " >" : (p ? ' +' : "  ")],
+      [base_color, t.subj + (t.subj.empty? ? "" : " ")],
     ] +
-      (t.labels - @hidden_labels).map { |label| [:label_color, " +#{label}"] } +
-      [[:snippet_color, " " + t.snippet]
+      (t.labels - @hidden_labels).map { |label| [:label_color, "+#{label} "] } +
+      [[:snippet_color, t.snippet]
     ]
   end
 

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

@@ -46,8 +46,10 @@ class ThreadViewMode < LineCursorMode
     end
     @state[latest] = :open if @state[latest] == :closed
 
-    regen_chunks
-    regen_text
+    BufferManager.say "Loading message bodies..." do
+      regen_chunks
+      regen_text
+    end
   end
 
   def draw_line ln, opts={}
@@ -141,6 +143,7 @@ class ThreadViewMode < LineCursorMode
     if m.is_draft?
       mode = ResumeMode.new m
       BufferManager.spawn "Edit message", mode
+      mode.edit
     else
       BufferManager.flash "Not a draft message!"
     end
@@ -210,8 +213,6 @@ class ThreadViewMode < LineCursorMode
         UpdateManager.relay :read, m
       end
     end
-
-    Redwood::log "releasing chunks and text from \"#{buffer.title}\""
     @messages = @chunks = @text = nil
   end
 
@@ -281,7 +282,7 @@ private
     when :open
       [[prefix_widget, widget, imp_widget,
         [:message_patina_color, 
-            "#{m.from ? m.from.mediumname : '?'} to #{m.to.map { |l| l.shortname }.join(', ')} #{m.date.to_nice_s} (#{m.date.to_nice_distance_s})"]]]
+            "#{m.from ? m.from.mediumname : '?'} to #{m.recipients.map { |l| l.shortname }.join(', ')} #{m.date.to_nice_s} (#{m.date.to_nice_distance_s})"]]]
 #        (m.to.empty? ? [] : [[[:message_patina_color, prefix + "    To: " + m.recipients.map { |x| x.mediumname }.join(", ")]]]) +
     when :closed
       [[prefix_widget, widget, imp_widget,
@@ -291,13 +292,13 @@ private
       labels = m.labels# - @hidden_labels
       x = [[prefix_widget, widget, imp_widget, [:message_patina_color, "From: #{m.from ? m.from.longname : '?'}"]]] +
         ((m.to.empty? ? [] : break_into_lines("  To: ", m.to.map { |x| x.longname })) +
-              (m.cc.empty? ? [] : break_into_lines("  Cc: ", m.cc.map { |x| x.longname })) +
-              (m.bcc.empty? ? [] : break_into_lines("  Bcc: ", m.bcc.map { |x| x.longname })) +
-              ["  Date: #{m.date.strftime DATE_FORMAT} (#{m.date.to_nice_distance_s})"] +
-              ["  Subject: #{m.subj}"] +
-              [(parent ? "  In reply to: #{parent.from.mediumname}'s message of #{parent.date.strftime DATE_FORMAT}" : nil)] +
-              [labels.empty? ? nil : "  Labels: #{labels.join(', ')}"]
-            ).flatten.compact.map { |l| [[:message_patina_color, prefix + "  " + l]] }
+           (m.cc.empty? ? [] : break_into_lines("  Cc: ", m.cc.map { |x| x.longname })) +
+           (m.bcc.empty? ? [] : break_into_lines("  Bcc: ", m.bcc.map { |x| x.longname })) +
+           ["  Date: #{m.date.strftime DATE_FORMAT} (#{m.date.to_nice_distance_s})"] +
+           ["  Subject: #{m.subj}"] +
+           [(parent ? "  In reply to: #{parent.from.mediumname}'s message of #{parent.date.strftime DATE_FORMAT}" : nil)] +
+           [labels.empty? ? nil : "  Labels: #{labels.join(', ')}"]
+        ).flatten.compact.map { |l| [[:message_patina_color, prefix + "  " + l]] }
       #raise x.inspect
       x
     end

data/lib/sup/person.rb

@@ -1,5 +1,31 @@
 module Redwood
 
+class PersonManager
+  include Singleton
+
+  def initialize fn
+    @fn = fn
+    @names = {}
+    IO.readlines(fn).map { |l| l =~ /^(.*)?:\s+(\d+)\s+(.*)$/ && @names[$1] = [$2.to_i, $3] } if File.exists? fn
+    self.class.i_am_the_instance self
+  end
+
+  def name_for email; @names.member?(email) && @names[email][1]; end
+  def register email, name
+    return unless name
+
+    name = name.gsub(/^\s+|\s+$/, "").gsub(/\s+/, " ")
+
+    ## all else being equal, prefer longer names, unless the prior name
+    ## doesn't contain any capitalization
+    oldcount, oldname = @names[email]
+    @names[email] = [0, name] if oldname.nil? || oldname.length < name.length || (oldname !~ /[A-Z]/ && name =~ /[A-Z]/)
+    @names[email][0] = Time.now.to_i
+  end
+
+  def save; File.open(@fn, "w") { |f| @names.each { |email, (time, name)| f.puts "#{email}: #{time} #{name}" } }; end
+end
+
 class Person
   @@email_map = {}
 
@@ -7,22 +33,14 @@ class Person
 
   def initialize name, email
     raise ArgumentError, "email can't be nil" unless email
-    @name = 
-      if name
-        name.gsub(/^\s+|\s+$/, "").gsub(/\s+/, " ")
-      else
-        nil
-      end
     @email = email.gsub(/^\s+|\s+$/, "").gsub(/\s+/, " ").downcase
-    @@email_map[@email] = self
+    PersonManager.register @email, name
+    @name = PersonManager.name_for @email
   end
 
   def == o; o && o.email == email; end
   alias :eql? :==
-
-  def hash
-    [name, email].hash
-  end
+  def hash; [name, email].hash; end
 
   def shortname
     case @name
@@ -31,9 +49,9 @@ class Person
     when /(\S+) \S+/
       $1
     when nil
-      @email #[0 ... 10]
+      @email
     else
-      @name #[0 ... 10]
+      @name
     end
   end
 
@@ -45,18 +63,12 @@ class Person
     end
   end
 
-  def mediumname
-    if @name
-      name
-    else
-      @email
-    end
-  end
+  def mediumname; @name || @email; end
 
   def full_address
     if @name && @email
       if @name =~ /"/
-        "#{@name.inspect} <#@email>"
+        "#{@name.inspect} <#@email>" # escape quotes
       else
         "#@name <#@email>"
       end
@@ -65,6 +77,7 @@ class Person
     end
   end
 
+  ## when sorting addresses, sort by this 
   def sort_by_me
     case @name
     when /^(\S+), \S+/
@@ -80,18 +93,10 @@ class Person
     end.downcase
   end
 
-  def self.for_several s
-    return [] if s.nil?
-
-    begin
-      s.split_on_commas.map { |ss| self.for ss }
-    rescue StandardError => e
-      raise "#{e.message}: for #{s.inspect}"
-    end
-  end
-
   def self.for s
     return nil if s.nil?
+
+    ## try and parse an email address and name
     name, email =
       case s
       when /["'](.*?)["'] <(.*?)>/, /([^,]+) <(.*?)>/
@@ -105,15 +110,13 @@ class Person
         [nil, s]
       end
 
-    if name && (p = @@email_map[email])
-      ## all else being equal, prefer longer names, unless the prior name
-      ## doesn't contain any capitalization
-      p.name = name if (p.name.nil? || p.name.length < name.length) unless
-        p.name =~ /[A-Z]/ || (AccountManager.instantiated? && AccountManager.is_account?(p))
-      p 
-    else
-      Person.new name, email
-    end
+    @@email_map[email] ||= Person.new name, email
+  end
+
+  def self.for_several s
+    return [] if s.nil?
+
+    s.split_on_commas.map { |ss| self.for ss }
   end
 end
 

data/lib/sup/poll.rb

@@ -12,13 +12,6 @@ class PollManager
     @last_poll = nil
     
     self.class.i_am_the_instance self
-
-    Redwood::reporting_thread do
-      while true
-        sleep DELAY / 2
-        poll if @last_poll.nil? || (Time.now - @last_poll) >= DELAY
-      end
-    end
   end
 
   def buffer
@@ -38,6 +31,15 @@ class PollManager
     [num, numi]
   end
 
+  def start_thread
+    Redwood::reporting_thread do
+      while true
+        sleep DELAY / 2
+        poll if @last_poll.nil? || (Time.now - @last_poll) >= DELAY
+      end
+    end
+  end
+
   def do_poll
     return [0, 0] if @polling
     @polling = true
@@ -54,7 +56,7 @@ class PollManager
       num_inbox = 0
       source.each do |offset, labels|
         start_offset ||= offset
-        yield " Found message at #{offset} with labels #{labels * ', '}"
+        yield "Found message at #{offset} with labels #{labels * ', '}"
         begin
           m = Redwood::Message.new :source => source, :source_info => offset,
                                    :labels => labels
@@ -71,7 +73,7 @@ class PollManager
             total_num += 1
             total_numi += 1 if m.labels.include? :inbox
           end
-        rescue Redwood::MessageFormatError => e
+        rescue SourceError, MessageFormatError => e
           yield "Ignoring erroneous message at #{source}##{offset}: #{e.message}"
         end
 

data/lib/sup/source.rb

@@ -6,13 +6,10 @@ class Source
   ## dirty? described whether cur_offset has changed, which means the
   ## source needs to be re-saved to disk.
   ##
-  ## broken? means no message can be loaded (e.g. IMAP server is
-  ## down), so don't even bother.
-  bool_reader :usual, :archived, :dirty
-  attr_reader :cur_offset, :broken_msg
-  attr_accessor :id
+  ## broken? means no message can be loaded, e.g. IMAP server is
+  ## down, mbox file is corrupt and needs to be rescanned.
 
-  ## You should implement:
+  ## When writing a new source, you should implement:
   ##
   ## start_offset
   ## end_offset
@@ -20,11 +17,19 @@ class Source
   ## load_message(offset)
   ## raw_header(offset)
   ## raw_full_message(offset)
-  ## next
+  ## next (or each, if you prefer)
+
+  ## you can throw SourceErrors from any of those, but we don't catch
+  ## anything else, so make sure you catch all non-fatal errors and
+  ## reraise them as source errors.
+
+  bool_reader :usual, :archived, :dirty
+  attr_reader :uri, :cur_offset, :broken_msg
+  attr_accessor :id
 
   def initialize uri, initial_offset=nil, usual=true, archived=false, id=nil
     @uri = uri
-    @cur_offset = initial_offset || start_offset
+    @cur_offset = initial_offset
     @usual = usual
     @archived = archived
     @id = id
@@ -35,28 +40,49 @@ class Source
   def broken?; !@broken_msg.nil?; end
   def to_s; @uri; end
   def seek_to! o; self.cur_offset = o; end
-  def reset!; seek_to! start_offset; end
+  def reset!
+    return if broken?
+    begin
+      seek_to! start_offset
+    rescue SourceError
+    end
+  end
   def == o; o.to_s == to_s; end
-  def done?; cur_offset >= end_offset; end 
+  def done?;
+    return true if broken? 
+    begin
+      (self.cur_offset ||= start_offset) >= end_offset
+    rescue SourceError => e
+      true
+    end
+  end
   def is_source_for? s; to_s == s; end
 
   def each
-    until done?
-      n, labels = self.next
-      raise "no message" unless n
-      labels += [:inbox] unless archived?
-      yield n, labels
+    return if broken?
+    begin
+      self.cur_offset ||= start_offset
+      until done? || broken? # just like life!
+        n, labels = self.next
+        raise "no message" unless n
+        yield n, labels
+      end
+    rescue SourceError => e
+      self.broken_msg = e.message
     end
   end
 
 protected
-
+  
   def cur_offset= o
     @cur_offset = o
     @dirty = true
   end
-  
-  attr_writer :broken_msg
+
+  def broken_msg= m
+    @broken_msg = m
+#    Redwood::log "#{to_s}: #{m}"
+  end
 end
 
 Redwood::register_yaml(Source, %w(uri cur_offset usual archived id))