sup 0.11 → 0.12

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

@@ -66,6 +66,7 @@ protected
     return if @curpos == p
     @curpos = p.clamp @cursor_top, lines
     buffer.mark_dirty
+    set_status
   end
 
   ## override search behavior to be cursor-based. this is a stupid

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

@@ -42,6 +42,7 @@ EOS
 
   def initialize message, type_arg=nil
     @m = message
+    @edited = false
 
     ## it's important to put this early because it forces a read of
     ## the full headers (most importantly the list-post header, if
@@ -64,18 +65,15 @@ EOS
     ## if we have a value from a hook, use it.
     from = if hook_reply_from
       hook_reply_from
-    ## otherwise, if the original email had an envelope-to header, try and use
-    ## it, and look up the corresponding name form the list of accounts.
-    ##
+    ## otherwise, try and find an account somewhere in the list of to's
+    ## and cc's and look up the corresponding name form the list of accounts.
+    ## if this does not succeed use the recipient_email (=envelope-to) instead.
     ## this is for the case where mail is received from a mailing lists (so the
     ## To: is the list id itself). if the user subscribes via a particular
     ## alias, we want to use that alias in the reply.
-    elsif @m.recipient_email && (a = AccountManager.account_for(@m.recipient_email))
-      Person.new a.name, @m.recipient_email
-    ## otherwise, try and find an account somewhere in the list of to's
-    ## and cc's.
-    elsif(b = (@m.to + @m.cc).find { |p| AccountManager.is_account? p })
-      b
+    elsif(b = (@m.to.collect {|t| t.email} + @m.cc.collect {|c| c.email} + [@m.recipient_email] ).find { |p| AccountManager.is_account_email? p })
+      a = AccountManager.account_for(b)
+      Person.new a.name, b
     ## if all else fails, use the default
     else
       AccountManager.default_account
@@ -150,11 +148,13 @@ EOS
         :recipient
       end)
 
+    @bodies = {}
     @headers.each do |k, v|
-      HookManager.run "before-edit", :header => v, :body => body
+      @bodies[k] = body
+      HookManager.run "before-edit", :header => v, :body => @bodies[k]
     end
 
-    super :header => @headers[@type_selector.val], :body => body, :twiddles => false
+    super :header => @headers[@type_selector.val], :body => @bodies[@type_selector.val], :twiddles => false
     add_selector @type_selector
   end
 
@@ -164,6 +164,7 @@ protected
     super
     if @headers[@type_selector.val] != self.header
       self.header = @headers[@type_selector.val]
+      self.body = @bodies[@type_selector.val] unless @edited
       update
     end
   end
@@ -172,6 +173,7 @@ protected
     super
     if @headers[@type_selector.val] != self.header
       self.header = @headers[@type_selector.val]
+      self.body = @bodies[@type_selector.val] unless @edited
       update
     end
   end
@@ -188,6 +190,10 @@ protected
   end
 
   def handle_new_text new_header, new_body
+    if new_body != @bodies[@type_selector.val]
+      @bodies[@type_selector.val] = new_body
+      @edited = true
+    end
     old_header = @headers[@type_selector.val]
     if new_header.size != old_header.size || old_header.any? { |k, v| new_header[k] != v }
       @type_selector.set_to :user

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

@@ -231,7 +231,7 @@ EOS
     old_cursor_thread = cursor_thread
     @mutex.synchronize do
       ## let's see you do THIS in python
-      @threads = @ts.threads.select { |t| !@hidden_threads[t] }.sort_by { |t| [t.date, t.first.id] }.reverse
+      @threads = @ts.threads.select { |t| !@hidden_threads.member?(t) }.select(&:has_message?).sort_by(&:sort_key)
       @size_widgets = @threads.map { |t| size_widget_for_thread t }
       @size_widget_width = @size_widgets.max_of { |w| w.display_length }
       @date_widgets = @threads.map { |t| date_widget_for_thread t }
@@ -792,8 +792,8 @@ protected
     authors = t.map do |m, *o|
       next unless m && m.from
       new[m.from] ||= m.has_label?(:unread)
-      next if seen[m.from]
-      seen[m.from] = true
+      next if seen[m.from.mediumname]
+      seen[m.from.mediumname] = true
       m.from
     end.compact
 
@@ -876,15 +876,16 @@ protected
         :index_old_color
       end
 
-    snippet = t.snippet + (t.snippet.empty? ? "" : "...")
+    size_padding = @size_widget_width - size_widget.display_length
+    size_widget_text = sprintf "%#{size_padding}s%s", "", size_widget
 
-    size_widget_text = sprintf "%#{ @size_widget_width}s", size_widget
-    date_widget_text = sprintf "%#{ @date_widget_width}s", date_widget
+    date_padding = @date_widget_width - date_widget.display_length
+    date_widget_text = sprintf "%#{date_padding}s%s", "", date_widget
 
     [ 
       [:tagged_color, @tags.tagged?(t) ? ">" : " "],
       [:date_color, date_widget_text],
-      (starred ? [:starred_color, "*"] : [:none, " "]),
+      [:starred_color, (starred ? "*" : " ")],
     ] +
       from +
       [
@@ -895,7 +896,7 @@ protected
       (t.labels - @hidden_labels).map { |label| [:label_color, "#{label} "] } +
       [
       [subj_color, t.subj + (t.subj.empty? ? "" : " ")],
-      [:snippet_color, snippet],
+      [:snippet_color, t.snippet],
     ]
   end
 
@@ -913,7 +914,7 @@ private
   end
 
   def default_date_widget_for t
-    t.date.to_nice_s
+    t.date.getlocal.to_nice_s
   end
 
   def from_width

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

@@ -3,7 +3,7 @@ module Redwood
 class ThreadViewMode < LineCursorMode
   ## this holds all info we need to lay out a message
   class MessageLayout
-    attr_accessor :top, :bot, :prev, :next, :depth, :width, :state, :color, :star_color, :orig_new
+    attr_accessor :top, :bot, :prev, :next, :depth, :width, :state, :color, :star_color, :orig_new, :toggled_state
   end
 
   class ChunkLayout
@@ -54,7 +54,9 @@ EOS
     k.add :edit_labels, "Edit or add labels for a thread", 'l'
     k.add :expand_all_quotes, "Expand/collapse all quotes in a message", 'o'
     k.add :jump_to_next_open, "Jump to next open message", 'n'
+    k.add :jump_to_next_and_open, "Jump to next message and open", "\C-n"
     k.add :jump_to_prev_open, "Jump to previous open message", 'p'
+    k.add :jump_to_prev_and_open, "Jump to previous message and open", "\C-p"
     k.add :align_current_message, "Align current message in buffer", 'z'
     k.add :toggle_starred, "Star or unstar message", '*'
     k.add :toggle_new, "Toggle unread/read status of message", 'N'
@@ -111,7 +113,7 @@ EOS
   ## objects. @person_lines is a map from row #s to Person objects.
 
   def initialize thread, hidden_labels=[], index_mode=nil
-    super()
+    super :slip_rows => $config[:slip_rows]
     @thread = thread
     @hidden_labels = hidden_labels
 
@@ -129,6 +131,7 @@ EOS
       next unless m
       earliest ||= m
       @layout[m].state = initial_state_for m
+      @layout[m].toggled_state = false
       @layout[m].color = altcolor ? :alternate_patina_color : :message_patina_color
       @layout[m].star_color = altcolor ? :alternate_starred_patina_color : :starred_patina_color
       @layout[m].orig_new = m.has_label? :read
@@ -440,6 +443,29 @@ EOS
     end
   end
 
+  def jump_to_next_and_open
+    return continue_search_in_buffer if in_search? # err.. don't know why im doing this
+
+    m = (curpos ... @message_lines.length).argfind { |i| @message_lines[i] }
+    return unless m
+
+    if @layout[m].toggled_state == true
+      @layout[m].state = :closed
+      @layout[m].toggled_state = false
+      update
+    end
+
+    nextm = @layout[m].next
+    if @layout[nextm].state == :closed
+      @layout[nextm].state = :open
+      @layout[nextm].toggled_state = true
+    end
+
+    jump_to_message nextm if nextm
+
+    update if @layout[nextm].toggled_state
+  end
+
   def jump_to_next_open force_alignment=nil
     return continue_search_in_buffer if in_search? # hack: allow 'n' to apply to both operations
     m = (curpos ... @message_lines.length).argfind { |i| @message_lines[i] }
@@ -456,6 +482,26 @@ EOS
     jump_to_message m, true
   end
 
+  def jump_to_prev_and_open force_alignment=nil
+    m = (0 .. curpos).to_a.reverse.argfind { |i| @message_lines[i] }
+    return unless m
+
+    if @layout[m].toggled_state == true
+      @layout[m].state = :closed
+      @layout[m].toggled_state = false
+      update
+    end
+
+    nextm = @layout[m].prev
+    if @layout[nextm].state == :closed
+      @layout[nextm].state = :open
+      @layout[nextm].toggled_state = true
+    end
+
+    jump_to_message nextm if nextm
+    update if @layout[nextm].toggled_state
+  end
+
   def jump_to_prev_open
     m = (0 .. curpos).to_a.reverse.argfind { |i| @message_lines[i] } # bah, .to_a
     return unless m

data/lib/sup/poll.rb

@@ -28,9 +28,8 @@ num_inbox_total_unread: the total number of unread messages in the inbox
                         only those messages appearing in the inbox
 EOS
 
-  DELAY = $config[:poll_interval] || 300
-
   def initialize
+    @delay = $config[:poll_interval] || 300
     @mutex = Mutex.new
     @thread = nil
     @last_poll = nil
@@ -83,8 +82,8 @@ EOS
   def start
     @thread = Redwood::reporting_thread("periodic poll") do
       while true
-        sleep DELAY / 2
-        poll if @last_poll.nil? || (Time.now - @last_poll) >= DELAY
+        sleep @delay / 2
+        poll if @last_poll.nil? || (Time.now - @last_poll) >= @delay
       end
     end
   end
@@ -102,43 +101,37 @@ EOS
 
     @mutex.synchronize do
       @poll_sources.each do |source|
-#        yield "source #{source} is done? #{source.done?} (cur_offset #{source.cur_offset} >= #{source.end_offset})"
         begin
-          yield "Loading from #{source}... " unless source.done? || (source.respond_to?(:has_errors?) && source.has_errors?)
+          yield "Loading from #{source}... "
         rescue SourceError => e
           warn "problem getting messages from #{source}: #{e.message}"
-          Redwood::report_broken_sources :force_to_top => true
           next
         end
 
         num = 0
         numi = 0
-        each_message_from source do |m|
-          old_m = Index.build_message m.id
-          if old_m
-              if old_m.source.id != source.id || old_m.source_info != m.source_info
-              ## here we merge labels between new and old versions, but we don't let the new
-              ## message add :unread or :inbox labels. (they can exist in the old version,
-              ## just not be added.)
-              new_labels = old_m.labels + (m.labels - [:unread, :inbox])
-              yield "Message at #{m.source_info} is an updated of an old message. Updating labels from #{m.labels.to_a * ','} => #{new_labels.to_a * ','}"
-              m.labels = new_labels
-              Index.update_message m
+        poll_from source do |action,m,old_m,progress|
+          if action == :delete
+            yield "Deleting #{m.id}"
+          elsif action == :add
+            if old_m
+              if not old_m.locations.member? m.location
+                yield "Message at #{m.source_info} is an updated of an old message. Updating labels from #{old_m.labels.to_a * ','} => #{m.labels.to_a * ','}"
+              else
+                yield "Skipping already-imported message at #{m.source_info}"
+              end
             else
-              yield "Skipping already-imported message at #{m.source_info}"
-            end
-          else
-            yield "Found new message at #{m.source_info} with labels #{m.labels.to_a * ','}"
-            add_new_message m
-            loaded_labels.merge m.labels
-            num += 1
-            from_and_subj << [m.from && m.from.longname, m.subj]
-            if (m.labels & [:inbox, :spam, :deleted, :killed]) == Set.new([:inbox])
-              from_and_subj_inbox << [m.from && m.from.longname, m.subj]
-              numi += 1
+              yield "Found new message at #{m.source_info} with labels #{m.labels.to_a * ','}"
+              loaded_labels.merge m.labels
+              num += 1
+              from_and_subj << [m.from && m.from.longname, m.subj]
+              if (m.labels & [:inbox, :spam, :deleted, :killed]) == Set.new([:inbox])
+                from_and_subj_inbox << [m.from && m.from.longname, m.subj]
+                numi += 1
+              end
             end
+          else fail
           end
-          m
         end
         yield "Found #{num} messages, #{numi} to inbox." unless num == 0
         total_num += num
@@ -153,44 +146,47 @@ EOS
     [total_num, total_numi, from_and_subj, from_and_subj_inbox, loaded_labels]
   end
 
-  ## like Source#each, but yields successive Message objects, which have their
-  ## labels and offsets set correctly.
-  ##
-  ## this is the primary mechanism for iterating over messages from a source.
-  def each_message_from source, opts={}
+  ## like Source#poll, but yields successive Message objects, which have their
+  ## labels and locations set correctly. The Messages are saved to or removed
+  ## from the index after being yielded.
+  def poll_from source, opts={}
     begin
-      return if source.done? || source.has_errors?
-
-      source.each do |offset, source_labels|
-        if source.has_errors?
-          warn "error loading messages from #{source}: #{source.error.message}"
-          return
+      source.poll do |sym, args|
+        case sym
+        when :add
+          m = Message.build_from_source source, args[:info]
+          old_m = Index.build_message m.id
+          m.labels += args[:labels]
+          m.labels.delete :inbox  if source.archived?
+          m.labels.delete :unread if source.read?
+          m.labels.delete :unread if m.source_marked_read? # preserve read status if possible
+          m.labels.each { |l| LabelManager << l }
+          m.labels = old_m.labels + (m.labels - [:unread, :inbox]) if old_m
+          m.locations = old_m.locations + m.locations if old_m
+          HookManager.run "before-add-message", :message => m
+          yield :add, m, old_m, args[:progress] if block_given?
+          Index.sync_message m, true
+
+          ## We need to add or unhide the message when it either did not exist
+          ## before at all or when it was updated. We do *not* add/unhide when
+          ## the same message was found at a different location
+          if !old_m or not old_m.locations.member? m.location
+            UpdateManager.relay self, :added, m
+          end
+        when :delete
+          Index.each_message :location => [source.id, args[:info]] do |m|
+            m.locations.delete Location.new(source, args[:info])
+            yield :delete, m, [source,args[:info]], args[:progress] if block_given?
+            Index.sync_message m, false
+            #UpdateManager.relay self, :deleted, m
+          end
         end
-
-        m = Message.build_from_source source, offset
-        m.labels += source_labels + (source.archived? ? [] : [:inbox])
-        m.labels.delete :unread if m.source_marked_read? # preserve read status if possible
-        m.labels.each { |l| LabelManager << l }
-
-        HookManager.run "before-add-message", :message => m
-        yield m
       end
     rescue SourceError => e
       warn "problem getting messages from #{source}: #{e.message}"
-      Redwood::report_broken_sources :force_to_top => true
     end
   end
 
-  ## TODO: see if we can do this within PollMode rather than by calling this
-  ## method.
-  ##
-  ## a wrapper around Index.add_message that calls the proper hooks,
-  ## does the gui callback stuff, etc.
-  def add_new_message m
-    Index.add_message m
-    UpdateManager.relay self, :added, m
-  end
-
   def handle_idle_update sender, idle_since; @should_clear_running_totals = false; end
   def handle_unidle_update sender, idle_since; @should_clear_running_totals = true; clear_running_totals; end
   def clear_running_totals; @running_totals = {:num => 0, :numi => 0, :loaded_labels => Set.new}; end

data/lib/sup/protocol.rb

@@ -0,0 +1,161 @@
+require 'eventmachine'
+require 'socket'
+require 'stringio'
+require 'yajl'
+
+class EM::P::Redwood < EM::Connection
+  VERSION = 1
+  ENCODINGS = %w(marshal json)
+
+  attr_reader :debug
+
+  def initialize *args
+    @state = :negotiating
+    @version_buf = ""
+    @debug = false
+    super
+  end
+
+  def receive_data data
+    if @state == :negotiating
+      @version_buf << data
+      if i = @version_buf.index("\n")
+        l = @version_buf.slice!(0..i)
+        receive_version *parse_version(l.strip)
+        x = @version_buf
+        @version_buf = nil
+        @state = :established
+        connection_established
+        receive_data x
+      end
+    else
+      @filter.decode(data).each do |msg|
+        puts "#{self.class.name} received: #{msg.inspect}" if @debug
+        validate_message *msg
+        receive_message *msg
+      end
+    end
+  end
+
+  def connection_established
+  end
+
+  def send_version encodings, extensions
+    fail if encodings.empty?
+    send_data "Redwood #{VERSION} #{encodings * ','} #{extensions.empty? ? :none : (extensions * ',')}\n"
+  end
+
+  def send_message type, tag, params={}
+    fail "attempted to send message during negotiation" unless @state == :established
+    puts "#{self.class.name} sent: #{[type, tag, params].inspect}" if @debug
+    validate_message type, tag, params
+    send_data @filter.encode([type,tag,params])
+  end
+
+  def receive_version l
+    fail "unimplemented"
+  end
+
+  def receive_message type, tag, params
+    fail "unimplemented"
+  end
+
+private
+
+  def validate_message type, tag, params
+    fail unless type.is_a? String or type.is_a? Symbol
+    fail unless tag.is_a? String or tag.is_a? Integer
+    fail unless params.is_a? Hash
+  end
+
+  def parse_version l
+    l =~ /^Redwood\s+(\d+)\s+([\w,]+)\s+([\w,]+)$/ or fail "unexpected banner #{l.inspect}"
+    version, encodings, extensions = $1.to_i, $2, $3
+    encodings = encodings.split ','
+    extensions = extensions.split ','
+    extensions = [] if extensions == ['none']
+    fail unless version == VERSION
+    fail if encodings.empty?
+    [encodings, extensions]
+  end
+
+  def create_filter encoding
+    case encoding
+    when 'json' then JSONFilter.new
+    when 'marshal' then MarshalFilter.new
+    else fail "unknown encoding #{encoding.inspect}"
+    end
+  end
+
+  class JSONFilter
+    def initialize
+      @parser = Yajl::Parser.new :check_utf8 => false
+    end
+
+    def decode chunk
+      parsed = []
+      @parser.on_parse_complete = lambda { |o| parsed << o }
+      @parser << chunk
+      parsed
+    end
+
+    def encode *os
+      os.inject('') { |s, o| s << Yajl::Encoder.encode(o) }
+    end
+  end
+
+  class MarshalFilter
+    def initialize
+      @buf = ''
+      @state = :prefix
+      @size = 0
+    end
+
+    def decode chunk
+      received = []
+      @buf << chunk
+
+      begin
+        if @state == :prefix
+          break unless @buf.size >= 4
+          prefix = @buf.slice!(0...4)
+          @size = prefix.unpack('N')[0]
+          @state = :data
+        end
+
+        fail unless @state == :data
+        break if @buf.size < @size
+        received << Marshal.load(@buf.slice!(0...@size))
+        @state = :prefix
+      end until @buf.empty?
+
+      received
+    end
+
+    def encode o
+      data = Marshal.dump o
+      [data.size].pack('N') + data
+    end
+  end
+end
+
+class EM::P::RedwoodServer < EM::P::Redwood
+  def post_init
+    send_version ENCODINGS, []
+  end
+
+  def receive_version encodings, extensions
+    fail unless encodings.size == 1
+    fail unless ENCODINGS.member? encodings.first
+    @filter = create_filter encodings.first
+  end
+end
+
+class EM::P::RedwoodClient < EM::P::Redwood
+  def receive_version encodings, extensions
+    encoding = (ENCODINGS & encodings).first
+    fail unless encoding
+    @filter = create_filter encoding
+    send_version [encoding], []
+  end
+end