sup 1.1 → 1.3

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
@@ -271,7 +265,7 @@ class Message
         message_to_chunks rmsg
       rescue SourceError, SocketError, RMail::EncodingUnsupportedError => e
         warn_with_location "problem reading message #{id}"
-        debug "could not load message: #{location.inspect}, exception: #{e.inspect}"
+        debug "could not load message, exception: #{e.inspect}"
 
         [Chunk::Text.new(error_message.split("\n"))]
 
@@ -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 =
@@ -760,7 +759,7 @@ private
 
   def warn_with_location msg
     warn msg
-    warn "Message is in #{location.source.uri} at #{location.info}"
+    warn "Message is in #{@locations}"
   end
 end
 
@@ -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/modes/console_mode.rb

@@ -11,7 +11,7 @@ class Console
   end
 
   def query(query)
-    Enumerator.new(Index.instance, :each_message, Index.parse_query(query))
+    Index.instance.enum_for :each_message, Index.parse_query(query)
   end
 
   def add_labels(query, *labels)

data/lib/sup/modes/edit_message_mode.rb

@@ -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/thread.rb

@@ -86,22 +86,22 @@ class Thread
     end
   end
 
-  def first; each { |m, *o| return m if m }; nil; end
-  def has_message?; any? { |m, *o| m.is_a? Message }; end
-  def dirty?; any? { |m, *o| m && m.dirty? }; end
-  def date; map { |m, *o| m.date if m }.compact.max; end
+  def first; each { |m, *| return m if m }; nil; end
+  def has_message?; any? { |m, *| m.is_a? Message }; end
+  def dirty?; any? { |m, *| m && m.dirty? }; end
+  def date; map { |m, *| m.date if m }.compact.max; end
   def snippet
-    with_snippets = select { |m, *o| m && m.snippet && !m.snippet.empty? }
-    first_unread, * = with_snippets.select { |m, *o| m.has_label?(:unread) }.sort_by { |m, *o| m.date }.first
+    with_snippets = select { |m, *| m && m.snippet && !m.snippet.empty? }
+    first_unread, * = with_snippets.select { |m, *| m.has_label?(:unread) }.sort_by { |m, *| m.date }.first
     return first_unread.snippet if first_unread
-    last_read, * = with_snippets.sort_by { |m, *o| m.date }.last
+    last_read, * = with_snippets.sort_by { |m, *| m.date }.last
     return last_read.snippet if last_read
     ""
   end
-  def authors; map { |m, *o| m.from if m }.compact.uniq; end
+  def authors; map { |m, *| m.from if m }.compact.uniq; end
 
-  def apply_label t; each { |m, *o| m && m.add_label(t) }; end
-  def remove_label t; each { |m, *o| m && m.remove_label(t) }; end
+  def apply_label t; each { |m, *| m && m.add_label(t) }; end
+  def remove_label t; each { |m, *| m && m.remove_label(t) }; end
 
   def toggle_label label
     if has_label? label
@@ -113,24 +113,24 @@ class Thread
     end
   end
 
-  def set_labels l; each { |m, *o| m && m.labels = l }; end
-  def has_label? t; any? { |m, *o| m && m.has_label?(t) }; end
-  def each_dirty_message; each { |m, *o| m && m.dirty? && yield(m) }; end
+  def set_labels l; each { |m, *| m && m.labels = l }; end
+  def has_label? t; any? { |m, *| m && m.has_label?(t) }; end
+  def each_dirty_message; each { |m, *| m && m.dirty? && yield(m) }; end
 
   def direct_participants
-    map { |m, *o| [m.from] + m.to if m }.flatten.compact.uniq
+    map { |m, *| [m.from] + m.to if m }.flatten.compact.uniq
   end
 
   def participants
-    map { |m, *o| [m.from] + m.to + m.cc + m.bcc if m }.flatten.compact.uniq
+    map { |m, *| [m.from] + m.to + m.cc + m.bcc if m }.flatten.compact.uniq
   end
 
-  def size; map { |m, *o| m ? 1 : 0 }.sum; end
-  def subj; argfind { |m, *o| m && m.subj }; end
-  def labels; inject(Set.new) { |s, (m, *o)| m ? s | m.labels : s } end
+  def size; map { |m, *| m ? 1 : 0 }.sum; end
+  def subj; argfind { |m, *| m && m.subj }; end
+  def labels; inject(Set.new) { |s, (m, *)| m ? s | m.labels : s } end
   def labels= l
     raise ArgumentError, "not a set" unless l.is_a?(Set)
-    each { |m, *o| m && m.labels = l.dup }
+    each { |m, *| m && m.labels = l.dup }
   end
 
   def latest_message
@@ -360,7 +360,7 @@ class ThreadSet
   ## merges in a pre-loaded thread
   def add_thread t
     raise "duplicate" if @threads.values.member? t
-    t.each { |m, *o| add_message m }
+    t.each { |m, *| add_message m }
   end
 
   ## merges two threads together. both must be members of this threadset.

data/lib/sup/util.rb

@@ -11,6 +11,7 @@ require 'benchmark'
 require 'unicode'
 require 'unicode/display_width'
 require 'fileutils'
+require 'string-scrub' if /^2\.0\./ =~ RUBY_VERSION
 
 module ExtendedLockfile
   def gen_lock_id
@@ -79,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
@@ -205,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
@@ -315,11 +323,8 @@ class String
     # first try to encode to utf-8 from whatever current encoding
     encode!('UTF-8', :invalid => :replace, :undef => :replace)
 
-    # do this anyway in case string is set to be UTF-8, encoding to
-    # something else (UTF-16 which can fully represent UTF-8) and back
-    # ensures invalid chars are replaced.
-    encode!('UTF-16', 'UTF-8', :invalid => :replace, :undef => :replace)
-    encode!('UTF-8', 'UTF-16', :invalid => :replace, :undef => :replace)
+    # ensure invalid chars are replaced
+    scrub!
 
     fail "Could not create valid UTF-8 string out of: '#{self.to_s}'." unless valid_encoding?
 

data/lib/sup/version.rb

@@ -8,5 +8,5 @@ def git_suffix
 end
 
 module Redwood
-  VERSION = "1.1"
+  VERSION = "1.3"
 end

data/man/sup-add.1

@@ -1,85 +1,80 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-ADD" "1" "April 9, 2012" "Sup User Manual" ""
-.hy
+.TH "SUP\-ADD" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-.PP
-sup-add - add a source to the Sup source list
+sup\-add \- add a source to the Sup source list
 .SH SYNOPSIS
-.PP
-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
-.PP
 Add one ore more sources to the Sup source list
 .PP
 For mbox files on local disk, use the form:
 .IP
-.nf
-\f[C]
+.EX
 mbox:<path to mbox file>, or
 
 mbox://<path to mbox file>
-\f[R]
-.fi
+.EE
 .PP
 For Maildir folders, use the form:
 .IP
-.nf
-\f[C]
+.EX
 maildir:<path to Maildir directory>; or
 
 maildir://<path to Maildir directory>
-\f[R]
-.fi
+.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]
+\-o \f[I]STRING\f[R], \-\-force\-account \f[I]STRING\f[R]
 Reuse previously defined account user\[at]hostname
 .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
-.PP
-sup(1), sup-config(1)
+sup(1), sup\-config(1)
 .SH REPORTING BUGS
-.PP
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
 .PP
-<https://github.com/sup-heliotrope/sup/issues>
+\c
+.UR https://github.com/sup-heliotrope/sup/issues
+.UE \c
 .SH CONTACT INFORMATION
 .TP
 The Sup web page:
-<https://sup-heliotrope.github.io/>
+\c
+.UR https://sup-heliotrope.github.io/
+.UE \c
 .TP
 Code repository:
-<https://github.com/sup-heliotrope/sup/>
+\c
+.UR https://github.com/sup-heliotrope/sup/
+.UE \c
 .TP
 Sup Wiki:
-<https://github.com/sup-heliotrope/sup/wiki/>
-.TP
-Sup IRC channel:
-#sup \[at] freenode.net
+\c
+.UR https://github.com/sup-heliotrope/sup/wiki/
+.UE \c
 .TP
 Mailing list:
 supmua\[at]googlegroups.com
@@ -87,17 +82,22 @@ supmua\[at]googlegroups.com
 .PP
 supmua+subscribe\[at]googlegroups.com
 .PP
-Archives: <https://groups.google.com/d/forum/supmua/>
+Archives: \c
+.UR https://groups.google.com/d/forum/supmua/
+.UE \c
 .RE
 .SH COPYRIGHT
+Copyright © 2006\-2009 William Morgan \c
+.MT mworgan-sup@masanjin.net
+.ME \c
 .PP
-Copyright \[co] 2006-2009 William Morgan <mworgan-sup@masanjin.net>
-.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)
 any later version.
 .SH AUTHORS
-Sup was originally written by William Morgan <wmorgan-sup@masanjin.net>
-and is now developed and maintained by the Sup developers.
+Sup was originally written by William Morgan \c
+.MT wmorgan-sup@masanjin.net
+.ME \c
+\ and is now developed and maintained by the Sup developers.

data/man/sup-config.1

@@ -1,23 +1,19 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
-.hy
+.TH "SUP\-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-.PP
-sup-config - interactive configuration tool for Sup
+sup\-config \- interactive configuration tool for Sup
 .SH SYNOPSIS
-.PP
-sup-config [\f[I]options\f[R]]
+sup\-config [\f[I]options\f[R]]
 .SH DESCRIPTION
-.PP
 Interactive configuration tool for Sup.
 Won\[cq]t 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
@@ -27,27 +23,30 @@ Configuration file for Sup
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-.PP
-sup(1), sup-add(1)
+sup(1), sup\-add(1)
 .SH REPORTING BUGS
-.PP
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
 .PP
-<https://github.com/sup-heliotrope/sup/issues>
+\c
+.UR https://github.com/sup-heliotrope/sup/issues
+.UE \c
 .SH CONTACT INFORMATION
 .TP
 The Sup web page:
-<https://sup-heliotrope.github.io/>
+\c
+.UR https://sup-heliotrope.github.io/
+.UE \c
 .TP
 Code repository:
-<https://github.com/sup-heliotrope/sup/>
+\c
+.UR https://github.com/sup-heliotrope/sup/
+.UE \c
 .TP
 Sup Wiki:
-<https://github.com/sup-heliotrope/sup/wiki/>
-.TP
-Sup IRC channel:
-#sup \[at] freenode.net
+\c
+.UR https://github.com/sup-heliotrope/sup/wiki/
+.UE \c
 .TP
 Mailing list:
 supmua\[at]googlegroups.com
@@ -55,17 +54,22 @@ supmua\[at]googlegroups.com
 .PP
 supmua+subscribe\[at]googlegroups.com
 .PP
-Archives: <https://groups.google.com/d/forum/supmua/>
+Archives: \c
+.UR https://groups.google.com/d/forum/supmua/
+.UE \c
 .RE
 .SH COPYRIGHT
+Copyright © 2006\-2009 William Morgan \c
+.MT mworgan-sup@masanjin.net
+.ME \c
 .PP
-Copyright \[co] 2006-2009 William Morgan <mworgan-sup@masanjin.net>
-.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)
 any later version.
 .SH AUTHORS
-Sup was originally written by William Morgan <wmorgan-sup@masanjin.net>
-and is now developed and maintained by the Sup developers.
+Sup was originally written by William Morgan \c
+.MT wmorgan-sup@masanjin.net
+.ME \c
+\ and is now developed and maintained by the Sup developers.

data/man/sup-dump.1

@@ -1,66 +1,61 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
-.hy
+.TH "SUP\-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-.PP
-sup-dump - dumps message state from Sup index
+sup\-dump \- dumps message state from Sup index
 .SH SYNOPSIS
-.PP
-sup-dump [\f[I]options\f[R]]
+sup\-dump [\f[I]options\f[R]]
 .SH DESCRIPTION
-.PP
 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
-.PP
 Dump message state and store in file
 .IP
-.nf
-\f[C]
-sup-dump > filename
-\f[R]
-.fi
+.EX
+sup\-dump > filename
+.EE
 .PP
 Dump message state and compress output to store in file
 .IP
-.nf
-\f[C]
-sup-dump | bzip2 > filename.bz2
-\f[R]
-.fi
+.EX
+sup\-dump | bzip2 > filename.bz2
+.EE
 .SH SEE ALSO
-.PP
-sup(1), sup-sync(1), sup-import-dump(1)
+sup(1), sup\-sync(1), sup\-import\-dump(1)
 .SH REPORTING BUGS
-.PP
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
 .PP
-<https://github.com/sup-heliotrope/sup/issues>
+\c
+.UR https://github.com/sup-heliotrope/sup/issues
+.UE \c
 .SH CONTACT INFORMATION
 .TP
 The Sup web page:
-<https://sup-heliotrope.github.io/>
+\c
+.UR https://sup-heliotrope.github.io/
+.UE \c
 .TP
 Code repository:
-<https://github.com/sup-heliotrope/sup/>
+\c
+.UR https://github.com/sup-heliotrope/sup/
+.UE \c
 .TP
 Sup Wiki:
-<https://github.com/sup-heliotrope/sup/wiki/>
-.TP
-Sup IRC channel:
-#sup \[at] freenode.net
+\c
+.UR https://github.com/sup-heliotrope/sup/wiki/
+.UE \c
 .TP
 Mailing list:
 supmua\[at]googlegroups.com
@@ -68,17 +63,22 @@ supmua\[at]googlegroups.com
 .PP
 supmua+subscribe\[at]googlegroups.com
 .PP
-Archives: <https://groups.google.com/d/forum/supmua/>
+Archives: \c
+.UR https://groups.google.com/d/forum/supmua/
+.UE \c
 .RE
 .SH COPYRIGHT
+Copyright © 2006\-2009 William Morgan \c
+.MT mworgan-sup@masanjin.net
+.ME \c
 .PP
-Copyright \[co] 2006-2009 William Morgan <mworgan-sup@masanjin.net>
-.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)
 any later version.
 .SH AUTHORS
-Sup was originally written by William Morgan <wmorgan-sup@masanjin.net>
-and is now developed and maintained by the Sup developers.
+Sup was originally written by William Morgan \c
+.MT wmorgan-sup@masanjin.net
+.ME \c
+\ and is now developed and maintained by the Sup developers.