sup 0.0.1 → 0.0.2

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

@@ -16,8 +16,8 @@ class PollMode < LogMode
   def poll
     puts unless @new
     @new = false
-    puts "poll started at #{Time.now}"
-    PollManager.poll { |s| puts s }
+    puts "Poll started at #{Time.now}"
+    PollManager.do_poll { |s| puts s }
   end
 end
 

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

@@ -40,7 +40,6 @@ class ReplyMode < EditMessageMode
 
     @headers[:user] = {
       "From" => "#{from.name} <#{from_email}>",
-      "To" => "",
     }
 
     @headers[:all] = {
@@ -57,12 +56,15 @@ class ReplyMode < EditMessageMode
     refs = gen_references
     mid = gen_message_id
     @headers.each do |k, v|
-      @headers[k] = v.merge({
+      @headers[k] = {
+               "To" => "",
+               "Cc" => "",
+               "Bcc" => "",
                "In-Reply-To" => "<#{@m.id}>",
                "Subject" => Message.reify_subj(@m.subj),
                "Message-Id" => mid,
                "References" => refs,
-             })
+             }.merge v
     end
 
     @type_labels = REPLY_TYPES.select { |t| @headers.member?(t) }
@@ -107,6 +109,7 @@ protected
 
     if new_header.size != header.size ||
         header.any? { |k, v| new_header[k] != v }
+      #raise "nhs: #{new_header.size} hs: #{header.size} new: #{new_header.inspect} old: #{header.inspect}"
       @selected_type = :user
       @headers[:user] = new_header
     end

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

@@ -8,9 +8,34 @@ class ResumeMode < ComposeMode
     @header.delete "Date"
     @header["Message-Id"] = gen_message_id # generate a new'n
     regen_text
+    @safe = false
+  end
+
+  def killable?
+    unless @safe
+      case BufferManager.ask_yes_or_no "Discard draft?"
+      when true
+        DraftManager.discard @id
+        BufferManager.flash "Draft discarded."
+        true
+      when false
+        BufferManager.flash "Draft saved."
+        true
+      else
+        false
+      end
+    end
   end
 
   def send_message
+    if super
+      DraftManager.discard @id 
+      @safe = true
+    end
+  end
+
+  def save_as_draft
+    @safe = true
     DraftManager.discard @id if super
   end
 end

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

@@ -14,6 +14,7 @@ class ScrollMode < Mode
     k.add :page_up, "Up one page", :page_up, 'p', :backspace
     k.add :jump_to_home, "Jump to top", :home, '^', '1'
     k.add :jump_to_end, "Jump to bottom", :end, '$', '0'
+    k.add :jump_to_left, "Jump to the left", '['
   end
 
   def initialize opts={}
@@ -48,6 +49,11 @@ class ScrollMode < Mode
     buffer.mark_dirty
   end
 
+  def jump_to_left
+    buffer.mark_dirty unless @leftcol == 0
+    @leftcol = 0
+  end
+
   ## set top line to l
   def jump_to_line l
     l = l.clamp 0, lines - 1
@@ -64,6 +70,7 @@ class ScrollMode < Mode
   def jump_to_home; jump_to_line 0; end
   def jump_to_end; jump_to_line lines - buffer.content_height; end
 
+
   def ensure_mode_validity
     @topline = @topline.clamp 0, lines - 1
     @topline = 0 if @topline < 0 # empty 

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

@@ -180,8 +180,10 @@ class ThreadIndexMode < LineCursorMode
     threads = @threads + @hidden_threads.keys
     mbid = BufferManager.say "Saving threads..."
     threads.each_with_index do |t, i|
-      BufferManager.say "Saving thread #{i + 1} of #{threads.length}...",
-                        mbid
+      if i % 5 == 0
+        BufferManager.say "Saving thread #{i + 1} of #{threads.length}...",
+                          mbid
+      end
       t.save Index
     end
     BufferManager.clear mbid
@@ -263,14 +265,9 @@ class ThreadIndexMode < LineCursorMode
 
   def load_n_threads_background n=LOAD_MORE_THREAD_NUM, opts={}
     return if @load_thread
-    @load_thread = ::Thread.new do 
-      begin
-        num = load_n_threads n, opts
-        opts[:when_done].call(num) if opts[:when_done]
-      rescue Exception => e
-        $exception ||= e
-        raise
-      end
+    @load_thread = Redwood::reporting_thread do 
+      num = load_n_threads n, opts
+      opts[:when_done].call(num) if opts[:when_done]
       @load_thread = nil
     end
   end
@@ -359,7 +356,7 @@ protected
     [ 
       [:tagged_color, @tags.tagged?(t) ? ">" : " "],
       [:none, sprintf("%#{@date_width}s ", date)],
-      [base_color, sprintf("%-#{@from_width}s ", from)],
+      [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 ? ' -' : "  ")],

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

@@ -16,6 +16,7 @@ class ThreadViewMode < LineCursorMode
     k.add :collapse_non_new_messages, "Collapse all but new messages", 'N'
     k.add :reply, "Reply to a message", 'r'
     k.add :forward, "Forward a message", 'f'
+    k.add :save_to_disk, "Save message/attachment to disk", 's'
   end
 
   def initialize thread, hidden_labels=[]
@@ -62,7 +63,7 @@ class ThreadViewMode < LineCursorMode
   def show_header
     return unless(m = @message_lines[curpos])
     BufferManager.spawn_unless_exists("Full header") do
-      TextMode.new m.content #m.header_text
+      TextMode.new m.raw_header
     end
   end
 
@@ -109,6 +110,32 @@ class ThreadViewMode < LineCursorMode
     update
   end
 
+  def save 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
+  private :save
+
+  def save_to_disk
+    return unless(chunk = @chunk_lines[curpos])
+    case chunk
+    when Message::Attachment
+      fn = BufferManager.ask :filename, "save attachment to file: ", chunk.filename
+      save(fn) { |f| f.print chunk } if fn
+    else
+      m = @message_lines[curpos]
+      fn = BufferManager.ask :filename, "save message to file: "
+      save(fn) { |f| f.print m.raw_full_message } if fn
+    end
+  end
+
   def edit_message
     return unless(m = @message_lines[curpos])
     if m.is_draft?
@@ -178,7 +205,7 @@ class ThreadViewMode < LineCursorMode
   ## not sure if this is really necessary but we might as well...
   def cleanup
     @thread.each do |m, d, p|
-      if m.has_label? :unread
+      if m && m.has_label?(:unread)
         m.remove_label :unread 
         UpdateManager.relay :read, m
       end
@@ -265,7 +292,7 @@ private
       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 })) +
+              (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)] +
@@ -331,6 +358,7 @@ private
     BufferManager.flash "viewing #{a.content_type} attachment..."
     a.view!
     BufferManager.erase_flash
+    BufferManager.completely_redraw_screen
   end
 
 end

data/lib/sup/poll.rb

@@ -13,25 +13,38 @@ class PollManager
     
     self.class.i_am_the_instance self
 
-    ::Thread.new do
+    Redwood::reporting_thread do
       while true
         sleep DELAY / 2
-        if @last_poll.nil? || (Time.now - @last_poll) >= DELAY
-          mbid = BufferManager.say "Polling for new messages..."
-          num, numi = poll { |s| BufferManager.say s, mbid }
-          BufferManager.clear mbid
-          BufferManager.flash "Loaded #{num} new messages, #{numi} to inbox." if num > 0
-        end
+        poll if @last_poll.nil? || (Time.now - @last_poll) >= DELAY
       end
     end
   end
 
+  def buffer
+    BufferManager.spawn_unless_exists("<poll for new messages>", :hidden => true) do
+      PollMode.new
+    end
+  end
+
   def poll
+    BufferManager.flash "Polling for new messages..."
+    num, numi = buffer.mode.poll
+    if num > 0
+      BufferManager.flash "Loaded #{num} new messages, #{numi} to inbox." 
+    else
+      BufferManager.flash "No new messages."
+    end
+    [num, numi]
+  end
+
+  def do_poll
     return [0, 0] if @polling
     @polling = true
     found = {}
     total_num = 0
     total_numi = 0
+
     Index.usual_sources.each do |source|
       next if source.done?
       yield "Loading from #{source}... "
@@ -41,9 +54,10 @@ class PollManager
       num_inbox = 0
       source.each do |offset, labels|
         start_offset ||= offset
-
+        yield " Found message at #{offset} with labels #{labels * ', '}"
         begin
-          m = Redwood::Message.new source, offset, labels
+          m = Redwood::Message.new :source => source, :source_info => offset,
+                                   :labels => labels
           if found[m.id]
             yield "Skipping duplicate message #{m.id}"
             next
@@ -64,7 +78,7 @@ class PollManager
         if num % 1000 == 0 && num > 0
           elapsed = Time.now - start
           pctdone = (offset.to_f - start_offset) / (source.total.to_f - start_offset)
-          remaining = (source.total.to_f - offset.to_f) * (elapsed.to_f / (offset.to_f - start_offset))
+          remaining = (source.end_offset.to_f - offset.to_f) * (elapsed.to_f / (offset.to_f - start_offset))
           yield "## #{num} (#{(pctdone * 100.0)}% done) read; #{elapsed.to_time_s} elapsed; est. #{remaining.to_time_s} remaining"
         end
       end

data/lib/sup/sent.rb

@@ -10,9 +10,9 @@ class SentManager
     self.class.i_am_the_instance self
   end
 
-  def self.source_name; "sent"; end
+  def self.source_name; "sent://"; end
   def self.source_id; 9998; end
-  def new_source; @source = SentLoader.new @fn; end
+  def new_source; @source = SentLoader.new; end
 
   def write_sent_message date, from_email
     need_blank = File.exists?(@fn) && !File.zero?(@fn)
@@ -22,7 +22,7 @@ class SentManager
       yield f
     end
     @source.each do |offset, labels|
-      m = Message.new @source, offset, labels
+      m = Message.new :source => @source, :source_info => offset, :labels => labels
       Index.add_message m
       UpdateManager.relay :add, m
     end
@@ -30,17 +30,17 @@ class SentManager
 end
 
 class SentLoader < MBox::Loader
-  def initialize filename, end_offset=0
+  def initialize cur_offset=0
+    filename = Redwood::SENT_FN
     File.open(filename, "w") { } unless File.exists? filename
-    super filename, end_offset, true, true
+    super "mbox://" + filename, cur_offset, true, true
   end
 
-  def id; SentManager.source_id; end
   def to_s; SentManager.source_name; end
-
+  def id; SentManager.source_id; end
   def labels; [:sent, :inbox]; end
 end
 
-Redwood::register_yaml(SentLoader, %w(filename end_offset))
+Redwood::register_yaml(SentLoader, %w(cur_offset))
 
 end

data/lib/sup/source.rb

@@ -0,0 +1,64 @@
+module Redwood
+
+class SourceError < StandardError; end
+
+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
+
+  ## You should implement:
+  ##
+  ## start_offset
+  ## end_offset
+  ## load_header(offset)
+  ## load_message(offset)
+  ## raw_header(offset)
+  ## raw_full_message(offset)
+  ## next
+
+  def initialize uri, initial_offset=nil, usual=true, archived=false, id=nil
+    @uri = uri
+    @cur_offset = initial_offset || start_offset
+    @usual = usual
+    @archived = archived
+    @id = id
+    @dirty = false
+    @broken_msg = nil
+  end
+
+  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 == o; o.to_s == to_s; end
+  def done?; cur_offset >= end_offset; 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
+    end
+  end
+
+protected
+
+  def cur_offset= o
+    @cur_offset = o
+    @dirty = true
+  end
+  
+  attr_writer :broken_msg
+end
+
+Redwood::register_yaml(Source, %w(uri cur_offset usual archived id))
+
+end

data/lib/sup/thread.rb

@@ -7,6 +7,7 @@ class Thread
 
   attr_reader :containers
   def initialize
+    raise "wrong thread, buddy!" if block_given?
     @containers = []
   end
 
@@ -321,6 +322,7 @@ class ThreadSet
       else
         ## to disable subject grouping, use the next line instead
         ## (and the same for below)
+        #Redwood::log "[1] normalized subject for #{id} is #{Message.normalize_subj(root.subj)}"
         thread = (@subj_thread[Message.normalize_subj(root.subj)] ||= Thread.new)
         #thread = (@subj_thread[root.id] ||= Thread.new)
 
@@ -341,6 +343,7 @@ class ThreadSet
       else
         ## to disable subject grouping, use the next line instead
         ## (and the same above)
+        #Redwood::log "[2] normalized subject for #{id} is #{Message.normalize_subj(root.subj)}"
         thread = (@subj_thread[Message.normalize_subj(root.subj)] ||= Thread.new)
         #thread = (@subj_thread[root.id] ||= Thread.new)
 

data/lib/sup/util.rb

@@ -216,10 +216,10 @@ class Time
     end  
   end
 
-  TO_NICE_S_MAX_LEN = 11 # e.g. "Jul 31 2005"
+  TO_NICE_S_MAX_LEN = 9 # e.g. "Yest.10am"
   def to_nice_s from=Time.now
     if year != from.year
-      strftime "%b %e %Y"
+      strftime "%b %Y"
     elsif month != from.month
       strftime "%b %e"
     else

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: sup
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-11-28 00:00:00 -08:00
+  version: 0.0.2
+date: 2006-12-10 00:00:00 -08:00
 summary: A console-based email client with the best features of GMail, mutt, and emacs. Features full text search, labels, tagged operations, multiple buffers, recent contacts, and more.
 require_paths: 
 - lib
@@ -79,6 +79,8 @@ files:
 - lib/sup/sent.rb
 - lib/sup/tagger.rb
 - lib/sup/colormap.rb
+- lib/sup/source.rb
+- lib/sup/imap.rb
 - lib/sup.rb
 test_files: []