sup 0.0.1 → 0.0.2

data/lib/sup/logger.rb

@@ -18,14 +18,13 @@ class Logger
   def make_buf
     return if @mode.buffer || !BufferManager.instantiated? || !@respawn || @spawning
     @spawning = true
-    @mode.text = ""
     @mode.buffer = BufferManager.instance.spawn "<log>", @mode, :hidden => true
     @spawning = false
   end
 
   def log s
 #    $stderr.puts s
-    @mode << "#{Time.now}: #{s}\n"
+    @mode << "#{Time.now}: #{s.chomp}\n"
     make_buf
   end
   

data/lib/sup/mbox.rb

@@ -4,14 +4,14 @@ module Redwood
 
 ## some utility functions
 module MBox
-  BREAK_RE = /^From \S+@\S+/
+  BREAK_RE = /^From \S+/
 
   def read_header f
     header = {}
     last = nil
 
     ## i do it in this weird way because i am trying to speed things up
-    ## at load-message time.
+    ## when scanning over large mbox files.
     while(line = f.gets)
       case line
       when /^From:\s+(.*)$/i: header[last = "From"] = $1

data/lib/sup/mbox/loader.rb

@@ -4,65 +4,53 @@ require 'rmail'
 module Redwood
 module MBox
 
-class Error < StandardError; end
-
-class Loader
-  attr_reader :filename
-  bool_reader :usual, :archived, :read, :dirty
-  attr_accessor :id, :labels
-
-  ## end_offset is the last offsets within the file which we've read.
-  ## everything after that is considered new messages that haven't
-  ## been indexed.
-  def initialize filename, end_offset=0, usual=true, archived=false, id=nil
-    @filename = filename.gsub(%r(^mbox://), "")
-    @end_offset = end_offset
-    @dirty = false
-    @usual = usual
-    @archived = archived
-    @id = id
+class Loader < Source
+  attr_reader :labels
+
+  def initialize uri, start_offset=nil, usual=true, archived=false, id=nil
+    raise ArgumentError, "not an mbox uri" unless uri =~ %r!mbox://!
+    super
+
     @mutex = Mutex.new
+    @filename = uri.sub(%r!^mbox://!, "")
     @f = File.open @filename
-    @labels = ([
-      :unread,
-      archived ? nil : :inbox,
-    ] +
-      if File.dirname(filename) =~ /\b(var|usr|spool)\b/
-        []
-      else
-        [File.basename(filename).intern] 
-      end).compact
+    ## heuristic: use the filename as a label, unless the file
+    ## has a path that probably represents an inbox.
+    @labels = [:unread]
+    @labels << File.basename(@filename).intern unless File.dirname(@filename) =~ /\b(var|usr|spool)\b/
   end
 
-  def reset!; @end_offset = 0; @dirty = true; end
-  def == o; o.is_a?(Loader) && o.filename == filename; end
-  def to_s; "mbox://#{@filename}"; end
-
-  def is_source_for? s
-    @filename == s || self.to_s == s
-  end
+  def start_offset; 0; end
+  def end_offset; File.size @f; end
 
-  def load_header offset=nil
+  def load_header offset
     header = nil
     @mutex.synchronize do
-      @f.seek offset if offset
+      @f.seek offset
+      l = @f.gets
+      unless l =~ BREAK_RE
+        self.broken_msg = "offset mismatch in mbox file offset #{offset.inspect}: #{l.inspect}. Run 'sup-import --rebuild #{to_s}' to correct this." 
+        raise SourceError, self.broken_msg
+      end
       header = MBox::read_header @f
     end
     header
   end
 
   def load_message offset
-    ret = nil
     @mutex.synchronize do
       @f.seek offset
-      RMail::Mailbox::MBoxReader.new(@f).each_message do |input|
-        return RMail::Parser.read(input)
+      begin
+        RMail::Mailbox::MBoxReader.new(@f).each_message do |input|
+          return RMail::Parser.read(input)
+        end
+      rescue RMail::Parser::Error => e
+        raise SourceError, "error parsing message with rmail: #{e.message}"
       end
     end
   end
 
-  ## load the full header text
-  def load_header_text offset
+  def raw_header offset
     ret = ""
     @mutex.synchronize do
       @f.seek offset
@@ -73,44 +61,53 @@ class Loader
     ret
   end
 
+  def raw_full_message offset
+    ret = ""
+    @mutex.synchronize do
+      @f.seek offset
+      @f.gets # skip mbox header
+      until @f.eof? || (l = @f.gets) =~ BREAK_RE
+        ret += l
+      end
+    end
+    ret
+  end
+
   def next
-    return nil if done?
-    @dirty = true
-    next_end_offset = @end_offset
+    returned_offset = nil
+    next_offset = cur_offset
 
     @mutex.synchronize do
-      @f.seek @end_offset
+      @f.seek cur_offset
+
+      ## cur_offset could be at one of two places here:
+
+      ## 1. before a \n and a mbox separator, if it was previously at
+      ##    EOF and a new message was added; or,
+      ## 2. at the beginning of an mbox separator (in all other
+      ##    cases).
+
+      l = @f.gets or raise "next while at EOF"
+      if l =~ /^\s*$/ # case 1
+        returned_offset = @f.tell
+        @f.gets # now we're at a BREAK_RE, so skip past it
+      else # case 2
+        returned_offset = cur_offset
+        ## we've already skipped past the BREAK_RE, to just go
+      end
 
-      @f.gets # skip the From separator
-      next_end_offset = @f.tell
       while(line = @f.gets)
         break if line =~ BREAK_RE
-        next_end_offset = @f.tell + 1
+        next_offset = @f.tell
       end
     end
 
-    start_offset = @end_offset
-    @end_offset = next_end_offset
-
-    start_offset
+    self.cur_offset = next_offset
+    [returned_offset, labels]
   end
-
-  def each
-    until @end_offset >= File.size(@f)
-      n = self.next
-      yield(n, labels) if n
-    end
-  end
-
-  def each_header
-    each { |offset, labels| yield offset, labels, load_header(offset) }
-  end
-
-  def done?; @end_offset >= File.size(@f); end 
-  def total; File.size @f; end
 end
 
-Redwood::register_yaml(Loader, %w(filename end_offset usual archived id))
+Redwood::register_yaml(Loader, %w(uri cur_offset usual archived id))
 
 end
 end

data/lib/sup/message.rb

@@ -27,24 +27,27 @@ class Message
   end
 
   class Attachment
-    attr_reader :content_type, :desc
+    attr_reader :content_type, :desc, :filename
     def initialize content_type, desc, part
       @content_type = content_type
       @desc = desc
       @part = part
       @file = nil
+      desc =~ /filename="(.*?)"/ && @filename = $1
     end
 
     def view!
       unless @file
         @file = Tempfile.new "redwood.attachment"
-        @file.print @part.decode
+        @file.print self
         @file.close
       end
 
       ## TODO: handle unknown mime-types
       system "/usr/bin/run-mailcap --action=view #{@content_type}:#{@file.path}"
     end
+
+    def to_s; @part.decode; end
   end
 
   class Text
@@ -73,25 +76,38 @@ class Message
   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_DISTANCE = 15 # lines from the end
+  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, :mbox_status
+              :source_info, :status
 
   bool_reader :dirty
 
-  def initialize source, source_info, labels, snippet=nil
-    @source = source
-    @source_info = source_info
+  ## if index_entry is specified, will fill in values from that,
+  def initialize opts
+    if opts[:source]
+      @source = opts[:source]
+      @source_info = opts[:source_info] or raise ArgumentError, ":source but no :source_info"
+      @body = nil
+    else
+      @source = @source_info = nil
+      @body = opts[:body] or raise ArgumentError, "one of :body or :source must be specified"
+    end
+    @snippet = opts[:snippet] || ""
+    @labels = opts[:labels] || []
     @dirty = false
-    @snippet = snippet
-    @labels = labels
 
-    header = @source.load_header @source_info
-    header.each { |k, v| header[k.downcase] = v }
+    header = 
+      if opts[:header]
+        opts[:header]
+      else
+        header = @source.load_header @source_info
+        header.each { |k, v| header[k.downcase] = v }
+        header
+      end
 
     %w(message-id date).each do |f|
       raise MessageFormatError, "no #{f} field in header #{header.inspect} (source #@source offset #@source_info)" unless header.include? f
@@ -99,7 +115,8 @@ class Message
     end
 
     begin
-      @date = Time.parse header["date"]
+      date = header["date"]
+      @date = (Time === date ? date : Time.parse(header["date"]))
     rescue ArgumentError => e
       raise MessageFormatError, "unparsable date #{header['date']}: #{e.message}"
     end
@@ -125,14 +142,10 @@ class Message
       end
 
     @recipient_email = header["delivered-to"]
-    @mbox_status = header["status"]
-  end
-
-  def snippet
-    to_chunks unless @snippet
-    @snippet
+    @status = header["status"]
   end
 
+  def snippet; @snippet || to_chunks && @snippet; end
   def is_list_message?; !@list_address.nil?; end
   def is_draft?; DraftLoader === @source; end
   def draft_filename
@@ -167,12 +180,19 @@ class Message
   end
 
   def to_chunks
-    m = @source.load_message @source_info
-    message_to_chunks m
+    if @body
+      [Text.new(@body.split("\n"))]
+    else
+      message_to_chunks @source.load_message(@source_info)
+    end
+  end
+
+  def raw_header
+    @source.raw_header @source_info
   end
 
-  def header_text
-    @source.load_header_text @source_info
+  def raw_full_message
+    @source.raw_full_message @source_info
   end
 
   def content
@@ -210,7 +230,7 @@ private
           m.body
         body = m.decode or raise MessageFormatError, "no message body"
         text_to_chunks body.gsub(/\t/, "    ").gsub(/\r/, "").split("\n")
-      when "multipart/alternative", "multipart/mixed"
+      when /^multipart\//
         nil
       else
         disp = m.header["Content-Disposition"] || ""
@@ -237,7 +257,7 @@ private
         newstate = nil
         if line =~ QUOTE_PATTERN || (line =~ QUOTE_START_PATTERN && (nextline =~ QUOTE_PATTERN || nextline =~ QUOTE_START_PATTERN))
           newstate = :quote
-        elsif line =~ SIG_PATTERN && (lines.length - i) < SIG_DISTANCE
+        elsif line =~ SIG_PATTERN && (lines.length - i) < MAX_SIG_DISTANCE
           newstate = :sig
         elsif line =~ BLOCK_QUOTE_PATTERN
           newstate = :block_quote
@@ -253,7 +273,7 @@ private
         newstate = nil
         if line =~ QUOTE_PATTERN || line =~ QUOTE_START_PATTERN || line =~ /^\s*$/
           chunk_lines << line
-        elsif line =~ SIG_PATTERN && (lines.length - i) < SIG_DISTANCE
+        elsif line =~ SIG_PATTERN && (lines.length - i) < MAX_SIG_DISTANCE
           newstate = :sig
         else
           newstate = :text

data/lib/sup/mode.rb

@@ -23,6 +23,7 @@ class Mode
     end
   end
 
+  def killable?; true; end
   def draw; end
   def focus; end
   def blur; end

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

@@ -2,8 +2,8 @@ module Redwood
 
 class BufferListMode < LineCursorMode
   register_keymap do |k|
-    k.add :jump_to_buffer, "Jump to that buffer", :enter
-    k.add :reload, "Reload", "R"
+    k.add :jump_to_buffer, "Jump to selected buffer", :enter
+    k.add :reload, "Reload buffer list", "R"
   end
 
   def initialize
@@ -23,9 +23,9 @@ protected
 
   def regen_text
     @bufs = BufferManager.buffers.sort_by { |name, buf| name }
-    width = @bufs.map { |name, buf| name.length }.max
+    width = @bufs.map { |name, buf| buf.mode.name.length }.max
     @text = @bufs.map do |name, buf|
-      sprintf "%#{width}s  %s", name, buf.mode.name
+      sprintf "%#{width}s  %s", buf.mode.name, name
     end
   end
 

data/lib/sup/modes/edit-message-mode.rb

@@ -101,7 +101,7 @@ protected
   end
 
   def send_message
-    return false unless @edited || BufferManager.ask_yes_or_no("message unedited---really send?")
+    return false unless @edited || BufferManager.ask_yes_or_no("Message unedited. Really send?")
 
     raise "no message id!" unless header["Message-Id"]
     date = Time.now
@@ -112,12 +112,11 @@ protected
         AccountManager.default_account.email
       end
 
-    sendmail = AccountManager.account_for(from_email).sendmail
-    raise "nil sendmail" unless sendmail
+    acct = AccountManager.account_for(from_email) || AccountManager.default_account
     SentManager.write_sent_message(date, from_email) { |f| write_message f, true, date }
     BufferManager.flash "sending..."
 
-    IO.popen(sendmail, "w") { |p| write_message p, true, date }
+    IO.popen(acct.sendmail, "w") { |p| write_message p, true, date }
 
     BufferManager.kill_buffer buffer
     BufferManager.flash "Message sent!"
@@ -128,6 +127,7 @@ protected
     DraftManager.write_draft { |f| write_message f, false }
     BufferManager.kill_buffer buffer
     BufferManager.flash "Saved for later editing."
+    true
   end
 
   def sig_lines

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

@@ -14,6 +14,8 @@ class InboxMode < ThreadIndexMode
     super [:inbox], [:inbox]
   end
 
+  def killable?; false; end
+
   def archive
     remove_label_and_hide_thread cursor_thread, :inbox
     regen_text

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

@@ -18,7 +18,7 @@ class LabelListMode < LineCursorMode
   def load; regen_text; end
 
   def load_in_background
-    ::Thread.new do
+    Redwood::reporting_thread do
       regen_text do |i|
         if i % 10 == 0
           buffer.mark_dirty

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

@@ -7,7 +7,7 @@ class LogMode < TextMode
 
   def initialize
     @follow = true
-    super ""
+    super
   end
 
   def toggle_follow