sup 0.12.1 → 0.13.0

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

@@ -9,6 +9,9 @@ class ResumeMode < EditMessageMode
     header.delete "Date"
 
     super :header => header, :body => body, :have_signature => true
+  rescue Errno::ENOENT
+    DraftManager.discard @m
+    BufferManager.flash "Draft deleted outside of sup."
   end
 
   def unsaved?; !@safe end
@@ -35,7 +38,7 @@ class ResumeMode < EditMessageMode
 
   def send_message
     if super
-      DraftManager.discard @m 
+      DraftManager.discard @m
       @safe = true
     end
   end

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

@@ -12,8 +12,6 @@ class ScrollMode < Mode
 
   attr_reader :status, :topline, :botline, :leftcol
 
-  COL_JUMP = 2
-
   register_keymap do |k|
     k.add :line_down, "Down one line", :down, 'j', 'J', "\C-e"
     k.add :line_up, "Up one line", :up, 'k', 'K', "\C-y"
@@ -98,19 +96,23 @@ class ScrollMode < Mode
   def search_start_line; @topline end
   def search_goto_line line; jump_to_line line end
 
+  def col_jump
+    $config[:col_jump] || 2
+  end
+
   def col_left
     return unless @leftcol > 0
-    @leftcol -= COL_JUMP
+    @leftcol -= col_jump
     buffer.mark_dirty
   end
 
   def col_right
-    @leftcol += COL_JUMP
+    @leftcol += col_jump
     buffer.mark_dirty
   end
 
   def jump_to_col col
-    col = col - (col % COL_JUMP)
+    col = col - (col % col_jump)
     buffer.mark_dirty unless @leftcol == col
     @leftcol = col
   end
@@ -185,7 +187,7 @@ protected
       if in_search?
         ## seems like there ought to be a better way of doing this
         array = []
-        s.each do |color, text| 
+        s.each do |color, text|
           if text =~ regex
             array += matching_text_array text, regex, color
           else

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

@@ -40,7 +40,7 @@ class TextMode < ScrollMode
     update_lines
     if buffer
       ensure_mode_validity
-      buffer.mark_dirty 
+      buffer.mark_dirty
     end
   end
 

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

@@ -113,7 +113,7 @@ EOS
         t.each_with_index do |(m, *o), i|
           next unless m
           BufferManager.say "#{message} (#{i}/#{num})", sid if t.size > 1
-          m.load_from_source! 
+          m.load_from_source!
         end
       end
       mode = ThreadViewMode.new t, @hidden_labels, self
@@ -124,6 +124,9 @@ EOS
       ## the first draw_screen is needed before topline and botline
       ## are set, and the second to show the cursor having moved
 
+      t.remove_label :unread
+      Index.save_thread t
+
       update_text_for_line curpos
       UpdateManager.relay self, :read, t.first
       when_done.call if when_done
@@ -161,15 +164,15 @@ EOS
       b.call
     end
   end
-  
+
   def handle_single_message_labeled_update sender, m
-    ## no need to do anything different here; we don't differentiate 
+    ## no need to do anything different here; we don't differentiate
     ## messages from their containing threads
     handle_labeled_update sender, m
   end
 
   def handle_labeled_update sender, m
-    if(t = thread_containing(m)) 
+    if(t = thread_containing(m))
       l = @lines[t] or return
       update_text_for_line l
     elsif is_relevant?(m)
@@ -273,9 +276,9 @@ EOS
         regen_text
       end
     end
-  end  
+  end
 
-  def toggle_starred 
+  def toggle_starred
     t = cursor_thread or return
     undo = actually_toggle_starred t
     UndoManager.register "toggling thread starred status", undo, lambda { Index.save_thread t }
@@ -362,7 +365,7 @@ EOS
     end
   end
 
-  def toggle_archived 
+  def toggle_archived
     t = cursor_thread or return
     undo = actually_toggle_archived t
     UndoManager.register "deleting/undeleting thread #{t.first.id}", undo, lambda { update_text_for_line curpos },
@@ -473,30 +476,42 @@ EOS
 
   ## m-m-m-m-MULTI-KILL
   def multi_kill threads
-    UndoManager.register "killing #{threads.size.pluralize 'thread'}" do
+    UndoManager.register "killing/unkilling #{threads.size.pluralize 'threads'}" do
       threads.each do |t|
-        t.remove_label :killed
-        add_or_unhide t.first
+        if t.toggle_label :killed
+          add_or_unhide t.first
+        else
+          hide_thread t
+        end
+      end.each do |t|
+        UpdateManager.relay self, :labeled, t.first
         Index.save_thread t
       end
       regen_text
     end
 
     threads.each do |t|
-      t.apply_label :killed
-      hide_thread t
+      if t.toggle_label :killed
+        hide_thread t
+      else
+        add_or_unhide t.first
+      end
+    end.each do |t|
+      # send 'labeled'... this might be more specific
+      UpdateManager.relay self, :labeled, t.first
+      Index.save_thread t
     end
 
+    killed, unkilled = threads.partition { |t| t.has_label? :killed }.map(&:size)
+    BufferManager.flash "#{killed.pluralize 'thread'} killed, #{unkilled} unkilled"
     regen_text
-    BufferManager.flash "#{threads.size.pluralize 'thread'} killed."
-    threads.each { |t| Index.save_thread t }
   end
 
   def cleanup
     UpdateManager.unregister self
 
     if @load_thread
-      @load_thread.kill 
+      @load_thread.kill
       BufferManager.clear @mbid if @mbid
       sleep 0.1 # TODO: necessary?
       BufferManager.erase_flash
@@ -512,7 +527,7 @@ EOS
     update_text_for_line curpos
     cursor_down
   end
-  
+
   def toggle_tagged_all
     @mutex.synchronize { @threads.each { |t| @tags.toggle_tag_for t } }
     regen_text
@@ -542,7 +557,7 @@ EOS
 
     keepl, modifyl = thread.labels.partition { |t| speciall.member? t }
 
-    user_labels = BufferManager.ask_for_labels :label, "Labels for thread: ", modifyl, @hidden_labels
+    user_labels = BufferManager.ask_for_labels :label, "Labels for thread: ", modifyl.sort_by {|x| x.to_s}, @hidden_labels
     return unless user_labels
 
     thread.labels = Set.new(keepl) + user_labels
@@ -755,7 +770,7 @@ protected
 
   def update_text_for_line l
     return unless l # not sure why this happens, but it does, occasionally
-    
+
     need_update = false
 
     @mutex.synchronize do
@@ -792,8 +807,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.mediumname]
-      seen[m.from.mediumname] = true
+      next if seen[m.from]
+      seen[m.from] = true
       m.from
     end.compact
 
@@ -849,7 +864,7 @@ protected
           if last
             name[0 ... (from_width - cur_width)]
           else
-            name[0 ... (from_width - cur_width - 1)] + "," 
+            name[0 ... (from_width - cur_width - 1)] + ","
           end
         end
 
@@ -872,7 +887,9 @@ protected
         :index_new_color
       elsif starred
         :index_starred_color
-      else 
+      elsif Colormap.sym_is_defined(:index_subject_color)
+        :index_subject_color
+      else
         :index_old_color
       end
 
@@ -882,18 +899,20 @@ protected
     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_color, (starred ? "*" : " ")],
     ] +
       from +
       [
-      [subj_color, size_widget_text],
+      [:size_widget_color, size_widget_text],
       [:to_me_color, t.labels.member?(:attachment) ? "@" : " "],
       [:to_me_color, dp ? ">" : (p ? '+' : " ")],
     ] +
-      (t.labels - @hidden_labels).map { |label| [:label_color, "#{label} "] } +
+      (t.labels - @hidden_labels).sort_by {|x| x.to_s}.map {
+            |label| [Colormap.sym_is_defined("label_#{label}_color".to_sym) || :label_color, "#{label} "]
+      } +
       [
       [subj_color, t.subj + (t.subj.empty? ? "" : " ")],
       [:snippet_color, t.snippet],

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

@@ -146,9 +146,6 @@ EOS
 
     @layout[latest].state = :open if @layout[latest].state == :closed
     @layout[earliest].state = :detailed if earliest.has_label?(:unread) || @thread.size == 1
-
-    @thread.remove_label :unread
-    Index.save_thread @thread
   end
 
   def toggle_wrap
@@ -268,7 +265,7 @@ EOS
     mode = PersonSearchResultsMode.new [p]
     BufferManager.spawn "Search for #{p.name}", mode
     mode.load_threads :num => mode.buffer.content_height
-  end    
+  end
 
   def compose
     p = @person_lines[curpos]
@@ -277,12 +274,12 @@ EOS
     else
       ComposeMode.spawn_nicely
     end
-  end    
+  end
 
   def edit_labels
     old_labels = @thread.labels
     reserved_labels = old_labels.select { |l| LabelManager::RESERVED_LABELS.include? l }
-    new_labels = BufferManager.ask_for_labels :label, "Labels for thread: ", @thread.labels
+    new_labels = BufferManager.ask_for_labels :label, "Labels for thread: ", @thread.labels.sort_by {|x| x.to_s}
 
     return unless new_labels
     @thread.labels = Set.new(reserved_labels) + new_labels
@@ -507,7 +504,7 @@ EOS
     return unless m
     ## jump to the top of the current message if we're in the body;
     ## otherwise, to the previous message
-    
+
     top = @layout[m].top
     if curpos == top
       while(prevm = @layout[m].prev)
@@ -722,7 +719,7 @@ private
 
       ## build the patina
       text = chunk_to_lines m, l.state, @text.length, depth, parent, l.color, l.star_color
-      
+
       l.top = @text.length
       l.bot = @text.length + text.length # updated below
       l.prev = prevm
@@ -739,7 +736,7 @@ private
       end
 
       @text += text
-      prevm = m 
+      prevm = m
       if l.state != :closed
         m.chunks.each do |c|
           cl = @chunk_layout[c]
@@ -782,13 +779,13 @@ private
     when :open
       @person_lines[start] = m.from
       [[prefix_widget, open_widget, new_widget, attach_widget, starred_widget,
-        [color, 
+        [color,
             "#{m.from ? m.from.mediumname : '?'} to #{m.recipients.map { |l| l.shortname }.join(', ')} #{m.date.to_nice_s} (#{m.date.to_nice_distance_s})"]]]
 
     when :closed
       @person_lines[start] = m.from
       [[prefix_widget, open_widget, new_widget, attach_widget, starred_widget,
-        [color, 
+        [color,
         "#{m.from ? m.from.mediumname : '?'}, #{m.date.to_nice_s} (#{m.date.to_nice_distance_s})  #{m.snippet}"]]]
 
     when :detailed
@@ -823,7 +820,7 @@ private
       end
 
       HookManager.run "detailed-headers", :message => m, :headers => headers
-      
+
       from_line + (addressee_lines + headers.map { |k, v| "   #{k}: #{v}" }).map { |l| [[color, prefix + "  " + l]] }
     end
   end
@@ -831,7 +828,7 @@ private
   def format_person_list prefix, people
     ptext = people.map { |p| format_person p }
     pad = " " * prefix.display_length
-    [prefix + ptext.first + (ptext.length > 1 ? "," : "")] + 
+    [prefix + ptext.first + (ptext.length > 1 ? "," : "")] +
       ptext[1 .. -1].map_with_index do |e, i|
         pad + e + (i == ptext.length - 1 ? "" : ",")
       end
@@ -841,6 +838,19 @@ private
     p.longname + (ContactManager.is_aliased_contact?(p) ? " (#{ContactManager.alias_for p})" : "")
   end
 
+  def maybe_wrap_text lines
+    if @wrap
+      config_width = $config[:wrap_width]
+      if config_width and config_width != 0
+        width = [config_width, buffer.content_width].min
+      else
+        width = buffer.content_width
+      end
+      lines = lines.map { |l| l.chomp.wrap width if l }.flatten
+    end
+    return lines
+  end
+
   ## 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
@@ -856,23 +866,15 @@ private
     else
       raise "Bad chunk: #{chunk.inspect}" unless chunk.respond_to?(:inlineable?) ## debugging
       if chunk.inlineable?
-        lines = chunk.lines
-        if @wrap
-          config_width = $config[:wrap_width]
-          if config_width and config_width != 0
-            width = [config_width, buffer.content_width].min
-          else
-            width = buffer.content_width
-          end
-          lines = lines.map { |l| l.chomp.wrap width }.flatten
-        end
+        lines = maybe_wrap_text(chunk.lines)
         lines.map { |line| [[chunk.color, "#{prefix}#{line}"]] }
       elsif chunk.expandable?
         case state
         when :closed
           [[[chunk.patina_color, "#{prefix}+ #{chunk.patina_text}"]]]
         when :open
-          [[[chunk.patina_color, "#{prefix}- #{chunk.patina_text}"]]] + chunk.lines.map { |line| [[chunk.color, "#{prefix}#{line}"]] }
+          lines = maybe_wrap_text(chunk.lines)
+          [[[chunk.patina_color, "#{prefix}- #{chunk.patina_text}"]]] + lines.map { |line| [[chunk.color, "#{prefix}#{line}"]] }
         end
       else
         [[[chunk.patina_color, "#{prefix}x #{chunk.patina_text}"]]]

data/lib/sup/person.rb

@@ -9,6 +9,7 @@ class Person
     @name = if name
       name = name.strip.gsub(/\s+/, " ")
       name =~ /^(['"]\s*)(.*?)(\s*["'])$/ ? $2 : name
+      name.gsub('\\\\', '\\')
     end
 
     @email = email.strip.gsub(/\s+/, " ").downcase
@@ -43,19 +44,23 @@ class Person
 
   def mediumname; @name || @email; end
 
-  def full_address
-    if @name && @email
-      if @name =~ /[",@]/
-        "#{@name.inspect} <#{@email}>" # escape quotes
+  def Person.full_address name, email
+    if name && email
+      if name =~ /[",@]/
+        "#{name.inspect} <#{email}>" # escape quotes
       else
-        "#{@name} <#{@email}>"
+        "#{name} <#{email}>"
       end
     else
       email
     end
   end
 
-  ## when sorting addresses, sort by this 
+  def full_address
+    Person.full_address @name, @email
+  end
+
+  ## when sorting addresses, sort by this
   def sort_by_me
     case @name
     when /^(\S+), \S+/
@@ -71,6 +76,12 @@ 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)
+  end
+
   def self.from_address s
     return nil if s.nil?
 
@@ -100,7 +111,7 @@ class Person
         [nil, s]
       end
 
-    Person.new name, email
+    from_name_and_email name, email
   end
 
   def self.from_address_list ss