sup 0.19.0 → 0.23

data/lib/sup/index.rb

@@ -105,7 +105,7 @@ EOS
 
   def save
     debug "saving index and sources..."
-    FileUtils.mkdir_p @dir unless File.exists? @dir
+    FileUtils.mkdir_p @dir unless File.exist? @dir
     SourceManager.save_sources
     save_index
   end
@@ -116,7 +116,7 @@ EOS
 
   def load_index failsafe=false
     path = File.join(@dir, 'xapian')
-    if File.exists? path
+    if File.exist? path
       @xapian = Xapian::WritableDatabase.new(path, Xapian::DB_OPEN)
       db_version = @xapian.get_metadata 'version'
       db_version = '0' if db_version.empty?
@@ -516,19 +516,32 @@ EOS
     qp.stemmer = Xapian::Stem.new($config[:stem_language])
     qp.stemming_strategy = Xapian::QueryParser::STEM_SOME
     qp.default_op = Xapian::Query::OP_AND
-    qp.add_valuerangeprocessor(Xapian::NumberValueRangeProcessor.new(DATE_VALUENO, 'date:', true))
-    NORMAL_PREFIX.each { |k,info| info[:prefix].each { |v| qp.add_prefix k, v } }
-    BOOLEAN_PREFIX.each { |k,info| info[:prefix].each { |v| qp.add_boolean_prefix k, v, info[:exclusive] } }
+    valuerangeprocessor = Xapian::NumberValueRangeProcessor.new(DATE_VALUENO,
+                                                                'date:', true)
+    qp.add_valuerangeprocessor(valuerangeprocessor)
+    NORMAL_PREFIX.each { |k,info| info[:prefix].each {
+      |v| qp.add_prefix k, v }
+    }
+    BOOLEAN_PREFIX.each { |k,info| info[:prefix].each {
+      |v| qp.add_boolean_prefix k, v, info[:exclusive] }
+    }
 
     begin
-      xapian_query = qp.parse_query(subs, Xapian::QueryParser::FLAG_PHRASE|Xapian::QueryParser::FLAG_BOOLEAN|Xapian::QueryParser::FLAG_LOVEHATE|Xapian::QueryParser::FLAG_WILDCARD)
+      xapian_query = qp.parse_query(subs, Xapian::QueryParser::FLAG_PHRASE   |
+                                          Xapian::QueryParser::FLAG_BOOLEAN  |
+                                          Xapian::QueryParser::FLAG_LOVEHATE |
+                                          Xapian::QueryParser::FLAG_WILDCARD)
     rescue RuntimeError => e
       raise ParseError, "xapian query parser error: #{e}"
     end
 
     debug "parsed xapian query: #{Util::Query.describe(xapian_query, subs)}"
 
-    raise ParseError if xapian_query.nil? or xapian_query.empty?
+    if xapian_query.nil? or xapian_query.empty?
+      raise ParseError, "couldn't parse \"#{s}\" as xapian query " \
+                        "(special characters aren't indexed)"
+    end
+
     query[:qobj] = xapian_query
     query[:text] = s
     query

data/lib/sup/label.rb

@@ -15,7 +15,7 @@ class LabelManager
   def initialize fn
     @fn = fn
     labels =
-      if File.exists? fn
+      if File.exist? fn
         IO.readlines(fn).map { |x| x.chomp.intern }
       else
         []

data/lib/sup/logger.rb

@@ -71,7 +71,7 @@ end
 
 ## include me to have top-level #debug, #info, etc. methods.
 module LogsStuff
-  Logger::LEVELS.each { |l| define_method(l) { |s| Logger.instance.send(l, s) } }
+  Logger::LEVELS.each { |l| define_method(l) { |s, uplevel = 0| Logger.instance.send(l, s) } }
 end
 
 end

data/lib/sup/maildir.rb

@@ -12,7 +12,15 @@ class Maildir < Source
   def initialize uri, usual=true, archived=false, sync_back=true, id=nil, labels=[]
     super uri, usual, archived, id
     @expanded_uri = Source.expand_filesystem_uri(uri)
-    uri = URI(@expanded_uri)
+    parts = @expanded_uri.match /^([a-zA-Z0-9]*:(\/\/)?)(.*)/
+    if parts
+      prefix = parts[1]
+      @path = parts[3]
+      uri = URI(prefix + URI.encode(@path, URI_ENCODE_CHARS))
+    else
+      uri = URI(URI.encode @expanded_uri, URI_ENCODE_CHARS)
+      @path = uri.path
+    end
 
     raise ArgumentError, "not a maildir URI" unless uri.scheme == "maildir"
     raise ArgumentError, "maildir URI cannot have a host: #{uri.host}" if uri.host
@@ -22,7 +30,7 @@ class Maildir < Source
     # sync by default if not specified
     @sync_back = true if @sync_back.nil?
 
-    @dir = uri.path
+    @dir = URI.decode uri.path
     @labels = Set.new(labels || [])
     @mutex = Mutex.new
     @ctimes = { 'cur' => Time.at(0), 'new' => Time.at(0) }
@@ -60,7 +68,7 @@ class Maildir < Source
           File.safe_link tmp_path, new_path
           stored = true
         ensure
-          File.unlink tmp_path if File.exists? tmp_path
+          File.unlink tmp_path if File.exist? tmp_path
         end
       end #rescue Errno...
     end #Dir.chdir
@@ -120,7 +128,10 @@ class Maildir < Source
       @ctimes[d] = ctime
 
       old_ids = benchmark(:maildir_read_index) { Index.instance.enum_for(:each_source_info, self.id, "#{d}/").to_a }
-      new_ids = benchmark(:maildir_read_dir) { Dir.glob("#{subdir}/*").map { |x| File.join(d,File.basename(x)) }.sort }
+      new_ids = benchmark(:maildir_read_dir) {
+        Dir.open(subdir).select {
+          |f| !File.directory? f}.map {
+            |x| File.join(d,File.basename(x)) }.sort }
       added += new_ids - old_ids
       deleted += old_ids - new_ids
       debug "#{old_ids.size} in index, #{new_ids.size} in filesystem"
@@ -190,7 +201,7 @@ class Maildir < Source
   def trashed? id; maildir_data(id)[2].include? "T"; end
 
   def valid? id
-    File.exists? File.join(@dir, id)
+    File.exist? File.join(@dir, id)
   end
 
 private

data/lib/sup/mbox.rb

@@ -19,16 +19,24 @@ class MBox < Source
     case uri_or_fp
     when String
       @expanded_uri = Source.expand_filesystem_uri(uri_or_fp)
-      uri = URI(@expanded_uri)
+      parts = @expanded_uri.match /^([a-zA-Z0-9]*:(\/\/)?)(.*)/
+      if parts
+        prefix = parts[1]
+        @path = parts[3]
+        uri = URI(prefix + URI.encode(@path, URI_ENCODE_CHARS))
+      else
+        uri = URI(URI.encode @expanded_uri, URI_ENCODE_CHARS)
+        @path = uri.path
+      end
+
       raise ArgumentError, "not an mbox uri" unless uri.scheme == "mbox"
       raise ArgumentError, "mbox URI ('#{uri}') cannot have a host: #{uri.host}" if uri.host
       raise ArgumentError, "mbox URI must have a path component" unless uri.path
       @f = nil
-      @path = uri.path
     else
       @f = uri_or_fp
       @path = uri_or_fp.path
-      @expanded_uri = "mbox://#{@path}"
+      @expanded_uri = "mbox://#{URI.encode @path, URI_ENCODE_CHARS}"
     end
 
     super uri_or_fp, usual, archived, id
@@ -107,7 +115,7 @@ class MBox < Source
   end
 
   def store_message date, from_email, &block
-    need_blank = File.exists?(@path) && !File.zero?(@path)
+    need_blank = File.exist?(@path) && !File.zero?(@path)
     File.open(@path, "ab") do |f|
       f.puts if need_blank
       f.puts "From #{from_email} #{date.asctime}"
@@ -172,7 +180,7 @@ class MBox < Source
     time = $1
     begin
       ## hack -- make Time.parse fail when trying to substitute values from Time.now
-      Time.parse time, 0
+      Time.parse time, Time.at(0)
       true
     rescue NoMethodError, ArgumentError
       warn "found invalid date in potential mbox split line, not splitting: #{l.inspect}"

data/lib/sup/message.rb

@@ -136,6 +136,11 @@ class Message
         header["list-post"] # just try the whole fucking thing
       end
       address && Person.from_address(address)
+    elsif header["mailing-list"]
+      address = if header["mailing-list"] =~ /list (.*?);/
+        $1
+      end
+      address && Person.from_address(address)
     elsif header["x-mailing-list"]
       Person.from_address header["x-mailing-list"]
     end
@@ -264,13 +269,27 @@ class Message
         parse_header rmsg.header
         message_to_chunks rmsg
       rescue SourceError, SocketError, RMail::EncodingUnsupportedError => e
-        warn "problem reading message #{id}"
+        warn_with_location "problem reading message #{id}"
         debug "could not load message: #{location.inspect}, exception: #{e.inspect}"
 
         [Chunk::Text.new(error_message.split("\n"))]
+
+      rescue Exception => e
+
+        warn_with_location "problem reading message #{id}"
+        debug "could not load message: #{location.inspect}, exception: #{e.inspect}"
+
+        raise e
+
       end
   end
 
+  def reload_from_source!
+    @chunks = nil
+    load_from_source!
+  end
+
+
   def error_message
     <<EOS
 #@snippet...
@@ -327,17 +346,17 @@ EOS
       to.map { |p| p.indexable_content },
       cc.map { |p| p.indexable_content },
       bcc.map { |p| p.indexable_content },
-      indexable_chunks.map { |c| c.lines },
+      indexable_chunks.map { |c| c.lines.map { |l| l.fix_encoding! } },
       indexable_subject,
     ].flatten.compact.join " "
   end
 
   def indexable_body
-    indexable_chunks.map { |c| c.lines }.flatten.compact.join " "
+    indexable_chunks.map { |c| c.lines }.flatten.compact.map { |l| l.fix_encoding! }.join " "
   end
 
   def indexable_chunks
-    chunks.select { |c| c.is_a? Chunk::Text } || []
+    chunks.select { |c| c.indexable? } || []
   end
 
   def indexable_subject
@@ -390,19 +409,19 @@ private
 
   def multipart_signed_to_chunks m
     if m.body.size != 2
-      warn "multipart/signed with #{m.body.size} parts (expecting 2)"
+      warn_with_location "multipart/signed with #{m.body.size} parts (expecting 2)"
       return
     end
 
     payload, signature = m.body
     if signature.multipart?
-      warn "multipart/signed with payload multipart #{payload.multipart?} and signature multipart #{signature.multipart?}"
+      warn_with_location "multipart/signed with payload multipart #{payload.multipart?} and signature multipart #{signature.multipart?}"
       return
     end
 
     ## this probably will never happen
     if payload.header.content_type && payload.header.content_type.downcase == "application/pgp-signature"
-      warn "multipart/signed with payload content type #{payload.header.content_type}"
+      warn_with_location "multipart/signed with payload content type #{payload.header.content_type}"
       return
     end
 
@@ -417,23 +436,23 @@ private
 
   def multipart_encrypted_to_chunks m
     if m.body.size != 2
-      warn "multipart/encrypted with #{m.body.size} parts (expecting 2)"
+      warn_with_location "multipart/encrypted with #{m.body.size} parts (expecting 2)"
       return
     end
 
     control, payload = m.body
     if control.multipart?
-      warn "multipart/encrypted with control multipart #{control.multipart?} and payload multipart #{payload.multipart?}"
+      warn_with_location "multipart/encrypted with control multipart #{control.multipart?} and payload multipart #{payload.multipart?}"
       return
     end
 
     if payload.header.content_type && payload.header.content_type.downcase != "application/octet-stream"
-      warn "multipart/encrypted with payload content type #{payload.header.content_type}"
+      warn_with_location "multipart/encrypted with payload content type #{payload.header.content_type}"
       return
     end
 
     if control.header.content_type && control.header.content_type.downcase != "application/pgp-encrypted"
-      warn "multipart/encrypted with control content type #{signature.header.content_type}"
+      warn_with_location "multipart/encrypted with control content type #{signature.header.content_type}"
       return
     end
 
@@ -677,7 +696,7 @@ private
           newstate = :quote
         elsif line =~ SIG_PATTERN && (lines.length - i) < MAX_SIG_DISTANCE && !lines[(i+1)..-1].index { |l| l =~ /^-- $/ }
           newstate = :sig
-        elsif line =~ BLOCK_QUOTE_PATTERN
+        elsif line =~ BLOCK_QUOTE_PATTERN && nextline !~ QUOTE_PATTERN
           newstate = :block_quote
         end
 
@@ -737,6 +756,11 @@ private
     end
     chunks
   end
+
+  def warn_with_location msg
+    warn msg
+    warn "Message is in #{location.source.uri} at #{location.info}"
+  end
 end
 
 class Location

data/lib/sup/message_chunks.rb

@@ -128,7 +128,7 @@ EOS
 
       text = case @content_type
       when /^text\/plain\b/
-        @raw_content
+        @raw_content.force_encoding(encoded_content.charset || 'US-ASCII')
       else
         HookManager.run "mime-decode", :content_type => @content_type,
                         :filename => lambda { write_to_disk },
@@ -138,7 +138,7 @@ EOS
 
       @lines = nil
       if text
-        text = text.transcode(encoded_content.charset || $encoding, text.encoding)
+        text = text.encode($encoding, :invalid => :replace, :undef => :replace)
         begin
           @lines = text.gsub("\r\n", "\n").gsub(/\t/, "        ").gsub(/\r/, "").split("\n")
         rescue Encoding::CompatibilityError
@@ -159,11 +159,14 @@ EOS
         "Attachment: #{filename} (#{content_type}; #{@raw_content.size.to_human_size})"
       end
     end
+    def safe_filename; Shellwords.escape(@filename).gsub("/", "_") end
+    def filesafe_filename; @filename.gsub("/", "_") end
 
     ## an attachment is exapndable if we've managed to decode it into
     ## something we can display inline. otherwise, it's viewable.
     def inlineable?; false end
     def expandable?; !viewable? end
+    def indexable?; expandable? end
     def initial_state; :open end
     def viewable?; @lines.nil? end
     def view_default! path
@@ -229,6 +232,7 @@ EOS
     def inlineable?; true end
     def quotable?; true end
     def expandable?; false end
+    def indexable?; true end
     def viewable?; false end
     def color; :text_color end
   end
@@ -242,6 +246,7 @@ EOS
     def inlineable?; @lines.length == 1 end
     def quotable?; true end
     def expandable?; !inlineable? end
+    def indexable?; expandable? end
     def viewable?; false end
 
     def patina_color; :quote_patina_color end
@@ -258,6 +263,7 @@ EOS
     def inlineable?; @lines.length == 1 end
     def quotable?; false end
     def expandable?; !inlineable? end
+    def indexable?; expandable? end
     def viewable?; false end
 
     def patina_color; :sig_patina_color end
@@ -291,6 +297,7 @@ EOS
     def inlineable?; false end
     def quotable?; false end
     def expandable?; true end
+    def indexable?; true end
     def initial_state; :closed end
     def viewable?; false end
 
@@ -301,12 +308,13 @@ EOS
   end
 
   class CryptoNotice
-    attr_reader :lines, :status, :patina_text
+    attr_reader :lines, :status, :patina_text, :unknown_fingerprint
 
-    def initialize status, description, lines=[]
+    def initialize status, description, lines=[], unknown_fingerprint=nil
       @status = status
       @patina_text = description
       @lines = lines
+      @unknown_fingerprint = unknown_fingerprint
     end
 
     def patina_color
@@ -322,6 +330,7 @@ EOS
     def inlineable?; false end
     def quotable?; false end
     def expandable?; !@lines.empty? end
+    def indexable?; false end
     def viewable?; false end
   end
 end

data/lib/sup/mode.rb

@@ -46,7 +46,7 @@ class Mode
   end
 
   def resolve_input c
-    ancestors.each do |klass| # try all keymaps in order of ancestry
+    self.class.ancestors.each do |klass| # try all keymaps in order of ancestry
       next unless @@keymaps.member?(klass)
       action = BufferManager.resolve_input_with_keymap c, @@keymaps[klass]
       return action if action
@@ -62,7 +62,7 @@ class Mode
 
   def help_text
     used_keys = {}
-    ancestors.map do |klass|
+    self.class.ancestors.map do |klass|
       km = @@keymaps[klass] or next
       title = "Keybindings from #{Mode.make_name klass.name}"
       s = <<EOS
@@ -83,7 +83,8 @@ EOS
 ### helper functions
 
   def save_to_file fn, talk=true
-    if File.exists? fn
+    FileUtils.mkdir_p File.dirname(fn)
+    if File.exist? fn
       unless BufferManager.ask_yes_or_no "File \"#{fn}\" exists. Overwrite?"
         info "Not overwriting #{fn}"
         return
@@ -102,37 +103,42 @@ EOS
   end
 
   def pipe_to_process command
-    Open3.popen3(command) do |input, output, error|
-      err, data, * = IO.select [error], [input], nil
-
-      unless err.empty?
-        message = err.first.read
-        if message =~ /^\s*$/
-          warn "error running #{command} (but no error message)"
-          BufferManager.flash "Error running #{command}!"
-        else
-          warn "error running #{command}: #{message}"
-          BufferManager.flash "Error: #{message}"
+    begin
+      Open3.popen3(command) do |input, output, error|
+        err, data, * = IO.select [error], [input], nil
+
+        unless err.empty?
+          message = err.first.read
+          if message =~ /^\s*$/
+            warn "error running #{command} (but no error message)"
+            BufferManager.flash "Error running #{command}!"
+          else
+            warn "error running #{command}: #{message}"
+            BufferManager.flash "Error: #{message}"
+          end
+          return nil, false
         end
-        return
-      end
 
-      data = data.first
-      data.sync = false # buffer input
+        data = data.first
+        data.sync = false # buffer input
 
-      yield data
-      data.close # output will block unless input is closed
+        yield data
+        data.close # output will block unless input is closed
 
-      ## BUG?: shows errors or output but not both....
-      data, * = IO.select [output, error], nil, nil
-      data = data.first
+        ## BUG?: shows errors or output but not both....
+        data, * = IO.select [output, error], nil, nil
+        data = data.first
 
-      if data.eof
-        BufferManager.flash "'#{command}' done!"
-        nil
-      else
-        data.read
+        if data.eof
+          BufferManager.flash "'#{command}' done!"
+          return nil, true
+        else
+          return data.read, true
+        end
       end
+    rescue Errno::ENOENT
+      # If the command is invalid
+      return nil, false
     end
   end
 end