vmail 1.6.8 → 1.6.9

data/lib/vmail/message_formatter.rb

@@ -11,9 +11,6 @@ module Vmail
     end
 
     def list_parts(parts = (@mail.parts.empty? ? [@mail] : @mail.parts))
-      if parts.empty?
-        return []
-      end
       lines = parts.map do |part|
         if part.multipart?
           list_parts(part.parts)
@@ -25,23 +22,24 @@ module Vmail
       lines.flatten
     end
 
-    def process_body(target = @mail)
-      out = if target.header['Content-Type'].to_s =~ /multipart\/mixed/
-        target.parts.map {|part| 
-          if part.multipart?
-            part = find_text_or_html_part(target.parts)
-            format_part(part) 
-          else
-            format_part(part) 
-          end
-        }.join("\n#{'-' * 39}\n")
-      elsif target.header['Content-Type'].to_s =~ /multipart\/alternative/
-        part = find_text_or_html_part(target.parts)
-        format_part(part) 
+    def plaintext_part(mail=@mail)
+      part = find_text_part2(mail.body, mail.content_type)
+      if part.nil?
+        "[No message body]"
       else
-        format_part(target)
+        format_part part
+      end
+    end
+
+    # helper method
+    def find_text_part2(part, content_type)
+      if part.multipart?  
+        part.parts.map {|p| find_text_part2(p, p.content_type)}.compact.first
+      elsif content_type =~ %r[^text/plain] || 
+        content_type =~ %r[text/plain] ||
+        content_type =~ %r[message/rfc]
+        part
       end
-      out
     end
 
     def format_part(part)
@@ -53,45 +51,20 @@ module Vmail
           format_text_body(part) 
         when /message\/rfc/
           m = Mail.new(part.body.decoded)
-          process_body(m)
+          plaintext_part(m)
         else # just format_text on it anyway
           format_text_body(part) 
         end
       else 
-        "[NO BODY]" 
+        part.decoded.gsub("\r", '')
       end
     rescue
       puts $!
       "[error:] #{$!}"
     end
 
-    def find_text_or_html_part(parts = @mail.parts)
-      if parts.empty?
-        return @mail
-      end
-      part = parts.detect {|part| part.multipart?}
-      if part
-        find_text_or_html_part(part.parts)
-      else
-        # no multipart part
-        part = parts.detect {|part| (part.header["Content-Type"].to_s =~ /text\/plain/) }
-        if part
-          return part
-        else
-          parts.first
-        end
-      end
-    end
-
     def format_text_body(part)
-      text = part.body.decoded.gsub("\r", '')
-      charset = (part.content_type_parameters && part.content_type_parameters['charset']) || encoding
-      if (charset && charset != 'UTF-8') 
-        text.force_encoding(charset)
-      else
-        text
-      end
-      text.encode("UTF-8", undef: :replace, replace: "??", invalid: :replace)
+      part.body.decoded.gsub("\r", '')
     end
 
     # depend on lynx or whatever is set by the VMAIL_HTML_PART_READER

data/lib/vmail/query.rb

@@ -3,19 +3,19 @@ module Vmail
   class Query
     # args is an array like ARGV
     def self.parse(args)
+      args = args.dup
       if args.is_a?(String)
         args = Shellwords.shellwords args
       end
+      if args.size > 0 && args.first =~ /^\d+/
+        args.shift
+      end
       query = if args.empty? 
-                [100, 'ALL']
-              elsif args.size == 1 && args[0] =~ /^\d+/ 
-                [args.shift, "ALL"] 
-              elsif args[0] =~ /^\d+/
-                args
+                ['ALL']
               else
-                [100] + args
+                args
               end
-      query
+      query.map {|x| x.to_s.downcase}
     end
 
     def self.args2string(array)

data/lib/vmail/reply_template.rb

@@ -19,7 +19,7 @@ module Vmail
       end
       date = @orig_headers['date'].is_a?(String) ? Time.parse(@orig_headers['date']) : @orig_headers['date']
       quote_header = date ? "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n" : "#{sender} wrote:\n\n"
-      body = quote_header + formatter.process_body
+      body = quote_header + formatter.plaintext_part
       begin
         body = body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
       rescue

data/lib/vmail/searching.rb

@@ -0,0 +1,61 @@
+module Vmail
+  module Searching
+    # The main function called by the client to retrieve messages
+    def search(query)
+      @query = Vmail::Query.parse(query) 
+      # customizable @limit is Deprecated
+      @limit = 100
+
+      if search_query?
+        #@num_messages = @all_ids.size
+        query_string = Vmail::Query.args2string(@query)
+        @ids = reconnect_if_necessary(180) do # timeout of 3 minutes
+          @imap.search(query_string)
+        end
+        @start_index = [@ids.size - @limit, 0].max 
+      else
+        # set the target range to the whole set, unless it is too big
+        @start_index = [@num_messages - @limit, 0].max + 1
+        @query.unshift "#{@start_index}:#@num_messages"
+        query_string = Vmail::Query.args2string(@query)
+        log "Query: #{query_string.inspect}"
+        @ids = reconnect_if_necessary(180) do # timeout of 3 minutes
+          @imap.search(query_string)
+        end
+      end
+
+      if @ids.empty?
+        return "No messages"
+      end
+
+      self.max_seqno = @ids[-1] # this is a instance var
+      log "- Query got #{@ids.size} results; max seqno: #{self.max_seqno}" 
+      clear_cached_message
+
+      select_ids = search_query? ? @ids[-@limit,@limit] : @ids
+
+      if select_ids.size > @limit
+        raise "Too many messages to fetch headers for"
+      end
+
+      message_ids = fetch_and_cache_headers select_ids
+      res = get_message_headers message_ids
+
+      if STDOUT.tty?
+        with_more_message_line(res)
+      else
+        # non interactive mode
+        puts [@mailbox, res].join("\n")
+      end
+    rescue
+      log "ERROR:\n#{$!.inspect}\n#{$!.backtrace.join("\n")}"
+    end  
+
+    def search_query?
+      x = @query[-1] != 'all'
+      log "Search query? #{x} #{@query.inspect}"
+      x
+    end
+  end
+end
+

data/lib/vmail/showing_headers.rb

@@ -0,0 +1,103 @@
+module Vmail
+  module ShowingHeaders
+
+    def get_message_headers(message_ids)
+      messages = message_ids.map {|message_id| Message[message_id] }
+      messages.map {|m| format_header_for_list(m)}.join("\n")
+    end
+
+    def fetch_and_cache_headers(id_set)
+      log "Fetching headers for #{id_set.size} messages"
+      results = reconnect_if_necessary do 
+        @imap.fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID"])
+      end
+      results.reverse.map do |x| 
+        envelope = x.attr["ENVELOPE"]
+        message_id = envelope.message_id
+        subject = Mail::Encodings.unquote_and_convert_to(envelope.subject, 'UTF-8')
+        recipients = ((envelope.to || []) + (envelope.cc || [])).map {|a| extract_address(a)}.join(', ')
+        sender = extract_address envelope.from.first
+        uid = x.attr["UID"]
+        message = Message[message_id]
+        unless message
+          message = Message.new
+          message.message_id = message_id
+          message.save
+        end
+        params = {
+          subject: (subject || ''),
+          flags: x.attr['FLAGS'].join(','),
+          date: DateTime.parse(envelope.date).to_s,
+          size: x.attr['RFC822.SIZE'],
+          sender: sender,
+          recipients: recipients
+        }
+        # We really just need to update the flags, buy let's update everything
+        message.update params
+
+        unless message.labels.include?(@label)
+          params = {message_id: message.message_id, uid: uid, label_id: @label.label_id}
+
+          Labeling.create params
+        end
+        message_id
+      end
+    end
+
+    def extract_address(address_struct)
+      address = if address_struct.nil?
+                  "Unknown"
+                elsif address_struct.name
+                  "#{Mail::Encodings.unquote_and_convert_to(address_struct.name, 'UTF-8')} <#{[address_struct.mailbox, address_struct.host].join('@')}>"
+                else
+                  [Mail::Encodings.unquote_and_convert_to(address_struct.mailbox, 'UTF-8'), Mail::Encodings.unquote_and_convert_to(address_struct.host, 'UTF-8')].join('@') 
+                end
+
+    end
+
+    def format_header_for_list(message)
+      date = DateTime.parse(message.date)
+      formatted_date = if date.year != Time.now.year
+                         date.strftime "%b %d %Y" 
+                       else 
+                         date.strftime "%b %d %I:%M%P"
+                       end
+      address = if @mailbox == mailbox_aliases['sent']
+                  message.recipients
+                else
+                  message.sender
+                end
+
+      mid_width = @width - 38
+      address_col_width = (mid_width * 0.3).ceil
+      subject_col_width = (mid_width * 0.7).floor
+      row_text = [ format_flags(message.flags).col(2),
+                   (formatted_date || '').col(14),
+                   address.col(address_col_width),
+                   message.subject.col(subject_col_width), 
+                   number_to_human_size(message.size).rcol(7), 
+                   message.message_id ].join(' | ')
+    end
+
+    FLAGMAP = {'Flagged' => '*', 'Answered' => 'A'}
+
+    def format_flags(flags)
+      # other flags like "Old" should be hidden here
+      flags = flags.split(',').map {|flag| FLAGMAP[flag] || flag}
+      flags.delete("Old")
+      if flags.delete('Seen').nil?
+        flags << '+' # unread
+      end
+      flags.join('')
+    end
+
+    def with_more_message_line(res)
+      remaining = @start_index 
+      if remaining < 1
+        return res
+      end
+      res + "\n>  Load #{[100, remaining].min} more messages. #{remaining} remaining." 
+    end
+
+  end
+end

data/lib/vmail/showing_message.rb

@@ -0,0 +1,91 @@
+module Vmail
+  module ShowingMessage
+
+    def current_message
+      return unless @cur_message_id
+      Message[@cur_message_id]
+    end
+
+    def current_mail
+      (c = current_message) && Mail.new(c.rfc822)
+    end
+
+    def cached_full_message?(message_id)
+      m = Message[message_id]
+      log "- found message #{message_id}"
+      log "- message has plaintext? #{!m.plaintext.nil?}"
+      m && !m.plaintext.nil? && m
+    end
+
+    def show_message(message_id, raw=false)
+      log "Show message: #{message_id}"
+      return current_message.rfc822 if raw 
+      log "Showing message message_id: #{message_id}"
+      res = fetch_and_cache(message_id)
+      if res.nil?
+        # retry, though this is a hack!
+        log "- data is nil. retrying..."
+        return show_message(message_id, raw)
+      end
+      res
+    end
+
+    def fetch_and_cache(message_id)
+      if message = cached_full_message?(message_id)
+        log "- full message cache hit"        
+        return message.plaintext
+      end
+      log "- full message cache miss"        
+      labeling = Labeling[message_id: message_id, label_id: @label.label_id]
+      uid = labeling.uid
+
+      log "- fetching message uid #{uid}"        
+      fetch_data = reconnect_if_necessary do 
+        res = retry_if_needed do
+          @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])
+        end
+        res[0] 
+      end
+      seqno = fetch_data.seqno
+      rfc822 = Mail.new(fetch_data.attr['RFC822'])
+      formatter = Vmail::MessageFormatter.new rfc822
+
+      message = Message[message_id]
+      message_text = <<-EOF
+#{message_id} #{number_to_human_size message.size} #{message.flags} #{format_parts_info(formatter.list_parts)}
+#{divider '-'}
+#{format_headers(formatter.extract_headers)}
+
+#{formatter.plaintext_part}
+EOF
+      # 2 calls so we can see more fine grained exceptions
+      message.update(:rfc822 => rfc822)
+      if !message_text.valid_encoding?
+        ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+        message_text = ic.iconv(message_text)
+      end
+
+      begin
+        message.update(:plaintext => message_text) 
+      rescue
+        log message_text.encoding
+        #log message_text
+        raise
+      end
+      @cur_message_id = message.message_id
+      message_text
+    rescue
+      msg = "Error encountered in fetch_and_cache(), message_id #{message_id} [#{@mailbox}]:\n#{$!}\n#{$!.backtrace.join("\n")}" 
+      log msg
+      msg
+    end
+
+    def format_parts_info(parts)
+      lines = parts.select {|part| part !~ %r{text/plain}}
+      if lines.size > 0
+        "\n#{lines.join("\n")}"
+      end
+    end
+
+  end
+end

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '1.6.8'
+  VERSION = '1.6.9'
 end

data/vmail.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'mail', '>= 2.2.12'
   s.add_dependency 'highline', '>= 1.6.1'
+  s.add_dependency 'sequel'
+  s.add_dependency 'sqlite3'
 end

metadata

@@ -2,7 +2,7 @@
 name: vmail
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.8
+  version: 1.6.9
 platform: ruby
 authors: 
 - Daniel Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -04:00
+date: 2011-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,28 @@ dependencies:
         version: 1.6.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Manage your email with Vim
 email: 
 - dhchoi@gmail.com
@@ -49,23 +71,30 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - MIT-LICENSE.txt
+- NOTES
 - README.markdown
 - Rakefile
 - TODO
 - bin/vmail
 - bin/vmail_client
 - bin/vmailsend
+- db/create.sql
 - lib/vmail.rb
 - lib/vmail.vim
 - lib/vmail/address_quoter.rb
 - lib/vmail/contacts_extractor.rb
+- lib/vmail/database.rb
+- lib/vmail/flagging_and_moving.rb
 - lib/vmail/imap_client.rb
 - lib/vmail/message_formatter.rb
 - lib/vmail/options.rb
 - lib/vmail/query.rb
 - lib/vmail/reply_template.rb
+- lib/vmail/searching.rb
 - lib/vmail/send_options.rb
 - lib/vmail/sender.rb
+- lib/vmail/showing_headers.rb
+- lib/vmail/showing_message.rb
 - lib/vmail/string_ext.rb
 - lib/vmail/version.rb
 - test/address_quoter_test.rb