sup 1.2 → 1.4

data/lib/sup/index.rb

@@ -142,7 +142,7 @@ EOS
 
   def save_index
     info "Flushing Xapian updates to disk. This may take a while..."
-    @xapian.flush
+    @xapian.commit
   end
 
   def contains_id? id
@@ -516,9 +516,13 @@ EOS
     qp.stemmer = Xapian::Stem.new($config[:stem_language])
     qp.stemming_strategy = Xapian::QueryParser::STEM_SOME
     qp.default_op = Xapian::Query::OP_AND
-    valuerangeprocessor = Xapian::NumberValueRangeProcessor.new(DATE_VALUENO,
-                                                                'date:', true)
-    qp.add_valuerangeprocessor(valuerangeprocessor)
+    begin
+      rangeprocessor = Xapian::NumberRangeProcessor.new DATE_VALUENO, 'date:'
+      qp.add_rangeprocessor rangeprocessor
+    rescue NameError  # xapian < 1.3
+      valuerangeprocessor = Xapian::NumberValueRangeProcessor.new DATE_VALUENO, 'date:', true
+      qp.add_valuerangeprocessor valuerangeprocessor
+    end
     NORMAL_PREFIX.each { |k,info| info[:prefix].each {
       |v| qp.add_prefix k, v }
     }

data/lib/sup/maildir.rb

@@ -114,6 +114,10 @@ class Maildir < Source
     with_file_for(id) { |f| f.read }
   end
 
+  def fallback_date_for_message id
+    File.mtime File.join(@dir, id)
+  end
+
   ## XXX use less memory
   def poll
     added = []

data/lib/sup/mbox.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'set'
+require 'time'
 
 module Redwood
 
@@ -85,7 +86,7 @@ class MBox < Source
       begin
         ## don't use RMail::Mailbox::MBoxReader because it doesn't properly ignore
         ## "From" at the start of a message body line.
-        string = ""
+        string = +""
         until @f.eof? || MBox::is_break_line?(l = @f.gets)
           string << l
         end
@@ -97,7 +98,7 @@ class MBox < Source
   end
 
   def raw_header offset
-    ret = ""
+    ret = +""
     @mutex.synchronize do
       ensure_open
       @f.seek offset
@@ -109,9 +110,7 @@ class MBox < Source
   end
 
   def raw_message offset
-    ret = ""
-    each_raw_message_line(offset) { |l| ret << l }
-    ret
+    enum_for(:each_raw_message_line, offset).reduce(:+)
   end
 
   def store_message date, from_email, &block
@@ -137,6 +136,26 @@ class MBox < Source
     end
   end
 
+  def fallback_date_for_message offset
+    ## This is a bit awkward... We treat the From line as a delimiter,
+    ## not part of the message. So the offset is pointing *after* the
+    ## From line for the desired message. With a bit of effort we can
+    ## scan backwards to find its From line and extract a date from it.
+    buf = @mutex.synchronize do
+      ensure_open
+      start = offset
+      loop do
+        start = (start - 200).clamp 0, 2**64
+        @f.seek start
+        buf = @f.read (offset - start)
+        break buf if buf.include? ?\n or start == 0
+      end
+    end
+    BREAK_RE.match buf.lines.last do |m|
+      Time.strptime m[1], "%a %b %d %H:%M:%S %Y"
+    end
+  end
+
   def default_labels
     [:inbox, :unread]
   end
@@ -179,8 +198,7 @@ class MBox < Source
     l =~ BREAK_RE or return false
     time = $1
     begin
-      ## hack -- make Time.parse fail when trying to substitute values from Time.now
-      Time.parse time, Time.at(0)
+      Time.strptime time, "%a %b %d %H:%M:%S %Y"
       true
     rescue NoMethodError, ArgumentError
       warn "found invalid date in potential mbox split line, not splitting: #{l.inspect}"

data/lib/sup/message.rb

@@ -103,16 +103,10 @@ class Message
     when Time
       date
     when String
-      begin
-        Time.parse date
-      rescue ArgumentError
-        #debug "faking mangled date header for #{@id} (orig #{header['date'].inspect} gave error: #{e.message})"
-        Time.now
-      end
-    else
-      #debug "faking non-existent date header for #{@id}"
-      Time.now
+      Time.rfc2822 date rescue nil
     end
+    @date = location.fallback_date if @date.nil?
+    @date = Time.utc 1970, 1, 1 if @date.nil?
 
     subj = header["subject"]
     subj = subj ? subj.fix_encoding! : nil
@@ -466,6 +460,11 @@ private
     end
   end
 
+  def has_embedded_message? m
+    return false unless m.header.content_type
+    %w(message/rfc822 message/global).include? m.header.content_type.downcase
+  end
+
   ## takes a RMail::Message, breaks it into Chunk:: classes.
   def message_to_chunks m, encrypted=false, sibling_types=[]
     if m.multipart?
@@ -483,7 +482,7 @@ private
       end
 
       chunks
-    elsif m.header.content_type && m.header.content_type.downcase == "message/rfc822"
+    elsif has_embedded_message? m
       encoding = m.header["Content-Transfer-Encoding"]
       if m.body
         body =
@@ -808,6 +807,10 @@ class Location
     source.load_message info
   end
 
+  def fallback_date
+    source.fallback_date_for_message info
+  end
+
   def valid?
     source.valid? info
   end

data/lib/sup/message_chunks.rb

@@ -35,30 +35,6 @@ require 'shellwords'
 ## included as quoted text during a reply. Text, Quotes, and mime-parsed
 ## attachments are quotable; Signatures are not.
 
-## monkey-patch time: make temp files have the right extension
-## Backport from Ruby 1.9.2 for versions lower than 1.8.7
-if RUBY_VERSION < '1.8.7'
-  class Tempfile
-    def make_tmpname(prefix_suffix, n)
-      case prefix_suffix
-      when String
-        prefix = prefix_suffix
-        suffix = ""
-      when Array
-        prefix = prefix_suffix[0]
-        suffix = prefix_suffix[1]
-      else
-        raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
-      end
-      t = Time.now.strftime("%Y%m%d")
-      path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-      path << "-#{n}" if n
-      path << suffix
-    end
-  end
-end
-
-
 module Redwood
 module Chunk
   class Attachment

data/lib/sup/mode.rb

@@ -37,6 +37,7 @@ class Mode
   def draw; end
   def focus; end
   def blur; end
+  def spawned; end
   def cancel_search!; end
   def in_search?; false end
   def status; ""; end

data/lib/sup/modes/contact_list_mode.rb

@@ -83,7 +83,6 @@ class ContactListMode < LineCursorMode
   def multi_search people
     mode = PersonSearchResultsMode.new people
     BufferManager.spawn "search for #{people.map { |p| p.name }.join(', ')}", mode
-    mode.load_threads :num => mode.buffer.content_height
   end
 
   def search

data/lib/sup/modes/edit_message_mode.rb

@@ -538,7 +538,7 @@ protected
       BufferManager.kill_buffer buffer
       BufferManager.flash "Message sent!"
       true
-    rescue SystemCallError, SendmailCommandFailed, CryptoManager::Error => e
+    rescue SystemCallError, SendmailCommandFailed, CryptoManager::Error, TypeError => e
       warn "Problem sending mail: #{e.message}"
       BufferManager.flash "Problem sending mail: #{e.message}"
       false
@@ -563,7 +563,7 @@ protected
     ## there are attachments, so wrap body in an attachment of its own
     unless @attachments.empty?
       body_m = m
-      body_m.header["Content-Disposition"] = "inline"
+      body_m.header["Content-Disposition"] = +"inline"
       m = RMail::Message.new
 
       m.add_part body_m
@@ -601,8 +601,8 @@ protected
     m.header["Date"] = date.rfc2822
     m.header["Message-Id"] = @message_id
     m.header["User-Agent"] = "Sup/#{Redwood::VERSION}"
-    m.header["Content-Transfer-Encoding"] ||= '8bit'
-    m.header["MIME-Version"] = "1.0" if m.multipart?
+    m.header["Content-Transfer-Encoding"] ||= +"8bit"
+    m.header["MIME-Version"] = +"1.0" if m.multipart?
     m
   end
 
@@ -716,10 +716,10 @@ private
     ## encode to quoted-printable for all text/* MIME types,
     ## use base64 otherwise
     if msg_part.header["Content-Type"] =~ /text\/.*/
-      msg_part.header["Content-Transfer-Encoding"] = 'quoted-printable'
+      msg_part.header.set "Content-Transfer-Encoding", +"quoted-printable"
       msg_part.body = [msg_part.body].pack('M')
     else
-      msg_part.header["Content-Transfer-Encoding"] = 'base64'
+      msg_part.header.set "Content-Transfer-Encoding", +"base64"
       msg_part.body = [msg_part.body].pack('m')
     end
     msg_part

data/lib/sup/modes/label_search_results_mode.rb

@@ -29,8 +29,7 @@ class LabelSearchResultsMode < ThreadIndexMode
     when :inbox
       BufferManager.raise_to_front InboxMode.instance.buffer
     else
-      b, new = BufferManager.spawn_unless_exists("All threads with label '#{label}'") { LabelSearchResultsMode.new [label] }
-      b.mode.load_threads :num => b.content_height if new
+      BufferManager.spawn_unless_exists("All threads with label '#{label}'") { LabelSearchResultsMode.new [label] }
     end
   end
 end

data/lib/sup/modes/line_cursor_mode.rb

@@ -20,14 +20,19 @@ class LineCursorMode < ScrollMode
       while true
         e = @load_more_q.pop
         @load_more_callbacks.each { |c| c.call e }
-        sleep 0.5
-        @load_more_q.pop until @load_more_q.empty?
+        hysteresis = $config[:load_more_threads_hysteresis] || 0.5
+        if hysteresis > 0 then
+          sleep hysteresis
+          @load_more_q.pop until @load_more_q.empty?
+        end
       end
     end
 
     super opts
   end
 
+  def spawned; call_load_more_callbacks buffer.content_height + 1; end
+
   def cleanup
     @load_more_thread.kill
     super
@@ -157,26 +162,22 @@ protected
     end
   end
 
-  ## more complicated than one might think. three behaviors.
+  def half_page_up
+    super
+    set_cursor_pos [botline, @curpos].min
+  end
+
   def page_down
-    ## if we're on the last page, and it's not a full page, just move
-    ## the cursor down to the bottom and assume we can't load anything
-    ## else via the callbacks.
-    if topline > lines - buffer.content_height
-      set_cursor_pos(lines - 1)
-
-    ## if we're on the last page, and it's a full page, try and load
-    ## more lines via the callbacks and then shift the page down
-    elsif topline == lines - buffer.content_height
-      call_load_more_callbacks buffer.content_height
-      super
+    relpos = @curpos - topline
+    super
+    set_cursor_pos [topline + relpos, lines - 1].min
+    call_load_more_callbacks buffer.content_height if lines < topline + buffer.content_height
+  end
 
-    ## otherwise, just move down
-    else
-      relpos = @curpos - topline
-      super
-      set_cursor_pos [topline + relpos, lines - 1].min
-    end
+  def half_page_down
+    super
+    set_cursor_pos [topline, @curpos].max
+    call_load_more_callbacks buffer.content_height if lines < topline + buffer.content_height
   end
 
   def jump_to_start
@@ -187,6 +188,7 @@ protected
   def jump_to_end
     super if topline < (lines - buffer.content_height)
     set_cursor_pos(lines - 1)
+    call_load_more_callbacks buffer.content_height
   end
 
 private

data/lib/sup/modes/search_results_mode.rb

@@ -49,7 +49,6 @@ class SearchResultsMode < ThreadIndexMode
       short_text = text.length < 20 ? text : text[0 ... 20] + "..."
       mode = SearchResultsMode.new query
       BufferManager.spawn "search: \"#{short_text}\"", mode
-      mode.load_threads :num => mode.buffer.content_height
     rescue Index::ParseError => e
       BufferManager.flash "Problem: #{e.message}!"
     end

data/lib/sup/modes/thread_view_mode.rb

@@ -205,7 +205,7 @@ EOS
     @layout[m].state = (@layout[m].state == :detailed ? :open : :detailed)
     update
   end
-  
+
   def reload
     update
   end
@@ -298,7 +298,6 @@ EOS
     p = @person_lines[curpos] or return
     mode = PersonSearchResultsMode.new [p]
     BufferManager.spawn "Search for #{p.name}", mode
-    mode.load_threads :num => mode.buffer.content_height
   end
 
   def compose

data/lib/sup/rfc2047.rb

@@ -62,10 +62,13 @@ module Rfc2047
       end
 
       begin
-        text.force_encoding(charset).encode(target)
+        text.force_encoding charset
+        text.encode! target
       rescue ArgumentError, EncodingError
-        word
+        next word
       end
+      next word unless text.valid_encoding?
+      text
     end
   end
 end

data/lib/sup/source.rb

@@ -90,6 +90,8 @@ class Source
   ## the location filename
   def labels? info; [] end
 
+  def fallback_date_for_message info; end
+
   ## Yields values of the form [Symbol, Hash]
   ## add: info, labels, progress
   ## delete: info, progress

data/lib/sup/util.rb

@@ -80,7 +80,14 @@ module RMail
     def self.make_file_attachment fn
       bfn = File.basename fn
       t = MIME::Types.type_for(bfn).first || MIME::Types.type_for("exe").first
-      make_attachment IO.read(fn), t.content_type, t.encoding, bfn.to_s
+      payload = IO.read fn
+      ## Need to encode as base64 or quoted-printable if any lines are longer than 998 chars.
+      encoding = if t.encoding != t.default_encoding and payload.each_line.any? { |l| l.length > 998 }
+        t.default_encoding
+      else
+        t.encoding
+      end
+      make_attachment payload, t.content_type, encoding, bfn.to_s
     end
 
     def charset
@@ -206,7 +213,7 @@ class String
   end
 
   def slice_by_display_length len
-    each_char.each_with_object "" do |c, buffer|
+    each_char.each_with_object (+"") do |c, buffer|
       len -= Unicode::DisplayWidth.of(c)
       return buffer if len < 0
       buffer << c

data/lib/sup/version.rb

@@ -8,5 +8,5 @@ def git_suffix
 end
 
 module Redwood
-  VERSION = "1.2"
+  VERSION = "1.4"
 end

data/lib/sup.rb

@@ -142,7 +142,7 @@ module Redwood
         File::open(fn) { |f| f.read }
       end
       ## fix up malformed tag URIs created by earlier versions of sup
-      raw_contents.gsub!(/!supmua.org,2006-10-01\/(\S*)$/) { |m| "!<tag:supmua.org,2006-10-01/#{$1}>" }
+      raw_contents.gsub!(/!supmua.org,2006-10-01\/(\S+)/) { |m| "!<tag:supmua.org,2006-10-01/#{$1}>" }
       if YAML.respond_to?(:unsafe_load)  # Ruby 3.1+
         YAML::unsafe_load raw_contents
       else

data/man/sup-add.1

@@ -1,10 +1,10 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.7.0.2
 .\"
-.TH "SUP-ADD" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-ADD" "1" "April 9, 2012" "Sup User Manual"
 .SH NAME
-sup-add - add a source to the Sup source list
+sup\-add \- add a source to the Sup source list
 .SH SYNOPSIS
-sup-add [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
+sup\-add [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
 .SH DESCRIPTION
 Add one ore more sources to the Sup source list
 .PP
@@ -25,33 +25,33 @@ maildir://<path to Maildir directory>
 .EE
 .SH OPTIONS
 .TP
--a, --archive
+\-a, \-\-archive
 Automatically archive all new messages from thesesources.
 .TP
--u, --unusual
+\-u, \-\-unusual
 Do not automatically poll these sources for new messages.
 .TP
--l \f[I]STRING\f[R], --labels \f[I]STRING\f[R]
-A comma-separated set of labels to apply to all messages from this
+\-l \f[I]STRING\f[R], \-\-labels \f[I]STRING\f[R]
+A comma\-separated set of labels to apply to all messages from this
 source
 .TP
--f, --force-new
+\-f, \-\-force\-new
 Create a new account for this source, even if one already exists
 .TP
--o \f[I]STRING\f[R], --force-account \f[I]STRING\f[R]
-Reuse previously defined account user\[at]hostname
+\-o \f[I]STRING\f[R], \-\-force\-account \f[I]STRING\f[R]
+Reuse previously defined account user\(athostname
 .TP
--v, --version
+\-v, \-\-version
 Print version and exit
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH FILES
 .TP
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-config(1)
+sup(1), sup\-config(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -77,21 +77,21 @@ Sup Wiki:
 .UE \c
 .TP
 Mailing list:
-supmua\[at]googlegroups.com
+supmua\(atgooglegroups.com
 .RS
 .PP
-supmua+subscribe\[at]googlegroups.com
+supmua+subscribe\(atgooglegroups.com
 .PP
 Archives: \c
 .UR https://groups.google.com/d/forum/supmua/
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \(at 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-config.1

@@ -1,19 +1,19 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.7.0.2
 .\"
-.TH "SUP-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-CONFIG" "1" "April 9, 2012" "Sup User Manual"
 .SH NAME
-sup-config - interactive configuration tool for Sup
+sup\-config \- interactive configuration tool for Sup
 .SH SYNOPSIS
-sup-config [\f[I]options\f[R]]
+sup\-config [\f[I]options\f[R]]
 .SH DESCRIPTION
 Interactive configuration tool for Sup.
-Won\[cq]t destroy existing configuration.
+Won\(cqt destroy existing configuration.
 .SH OPTIONS
 .TP
--v, --version
+\-v, \-\-version
 Print versian and exit
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH FILES
 .TP
@@ -23,7 +23,7 @@ Configuration file for Sup
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-add(1)
+sup(1), sup\-add(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -49,21 +49,21 @@ Sup Wiki:
 .UE \c
 .TP
 Mailing list:
-supmua\[at]googlegroups.com
+supmua\(atgooglegroups.com
 .RS
 .PP
-supmua+subscribe\[at]googlegroups.com
+supmua+subscribe\(atgooglegroups.com
 .PP
 Archives: \c
 .UR https://groups.google.com/d/forum/supmua/
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \(at 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-dump.1

@@ -1,37 +1,38 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.7.0.2
 .\"
-.TH "SUP-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-DUMP" "1" "April 9, 2012" "Sup User Manual"
 .SH NAME
-sup-dump - dumps message state from Sup index
+sup\-dump \- dumps message state from Sup index
 .SH SYNOPSIS
-sup-dump [\f[I]options\f[R]]
+sup\-dump [\f[I]options\f[R]]
 .SH DESCRIPTION
 Dumps all message state from the Sup index to standard out.
-You can later use sup-sync --restored --restore  to recover the index.
+You can later use sup\-sync \-\-restored \-\-restore  to recover the
+index.
 .PP
 This tool is primarily useful in the event that a Sup upgrade breaks
 index format compatibility.
 .SH OPTIONS
 .TP
--v, --version
+\-v, \-\-version
 Print version and exit
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH EXAMPLES
 Dump message state and store in file
 .IP
 .EX
-sup-dump > filename
+sup\-dump > filename
 .EE
 .PP
 Dump message state and compress output to store in file
 .IP
 .EX
-sup-dump | bzip2 > filename.bz2
+sup\-dump | bzip2 > filename.bz2
 .EE
 .SH SEE ALSO
-sup(1), sup-sync(1), sup-import-dump(1)
+sup(1), sup\-sync(1), sup\-import\-dump(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -57,21 +58,21 @@ Sup Wiki:
 .UE \c
 .TP
 Mailing list:
-supmua\[at]googlegroups.com
+supmua\(atgooglegroups.com
 .RS
 .PP
-supmua+subscribe\[at]googlegroups.com
+supmua+subscribe\(atgooglegroups.com
 .PP
 Archives: \c
 .UR https://groups.google.com/d/forum/supmua/
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \(at 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)