sup 0.1 → 0.2

data/lib/sup/sent.rb

@@ -21,6 +21,7 @@ class SentManager
       f.puts "From #{from_email} #{date}"
       yield f
     end
+
     @source.each do |offset, labels|
       m = Message.new :source => @source, :source_info => offset, :labels => @source.labels
       Index.sync_message m

data/lib/sup/source.rb

@@ -31,7 +31,7 @@ class Source
   ## - load_header offset
   ## - load_message offset
   ## - raw_header offset
-  ## - raw_full_message offset
+  ## - raw_message offset
   ## - check
   ## - next (or each, if you prefer): should return a message and an
   ##   array of labels.
@@ -77,8 +77,8 @@ class Source
   def seek_to! o; self.cur_offset = o; end
   def reset!; seek_to! start_offset; end
   def == o; o.uri == uri; end
-  def done?; (self.cur_offset ||= start_offset) >= end_offset; end
-  def is_source_for? uri; URI(self.uri) == URI(uri); end
+  def done?; start_offset.nil? || (self.cur_offset ||= start_offset) >= end_offset; end
+  def is_source_for? uri; uri == @uri; end
 
   ## check should throw a FatalSourceError or an OutOfSyncSourcError
   ## if it can detect a problem. it is called when the sup starts up
@@ -96,6 +96,10 @@ class Source
 
 protected
   
+  def Source.expand_filesystem_uri uri
+    uri.gsub "~", File.expand_path("~")
+  end
+
   def cur_offset= o
     @cur_offset = o
     @dirty = true

data/lib/sup/textfield.rb

@@ -1,15 +1,17 @@
-require 'curses'
-
 module Redwood
 
 ## a fully-functional text field supporting completions, expansions,
 ## history--everything!
+## 
+## writing this fucking sucked. if you thought ncurses was some 1970s
+## before-people-knew-how-to-program bullshit, wait till you see
+## ncurses forms.
 ##
-## completion is done emacs-style, and mostly depends on outside
-## support, as we merely signal the existence of a new set of
-## completions to show (#new_completions?)  or that the current list
-## of completions should be rolled if they're too large to fill the
-## screen (#roll_completions?).
+## completion comments: completion is done emacs-style, and mostly
+## depends on outside support, as we merely signal the existence of a
+## new set of completions to show (#new_completions?)  or that the
+## current list of completions should be rolled if they're too large
+## to fill the screen (#roll_completions?).
 ##
 ## in sup, completion support is implemented through BufferManager#ask
 ## and CompletionMode.
@@ -27,22 +29,17 @@ class TextField
   bool_reader :new_completions, :roll_completions
   attr_reader :completions
 
-  ## when the user presses enter, we store the value in @value and
-  ## clean up all the ncurses cruft. before @value is set, we can
-  ## get the current value from ncurses.
-  def value; @field ? get_cur_value : @value end
+  def value; @value || get_cursed_value end
 
   def activate question, default=nil, &block
     @question = question
-    @value = nil
     @completion_block = block
     @field = Ncurses::Form.new_field 1, @width - question.length,
                                      @y, @x + question.length, 0, 0
     @form = Ncurses::Form.new_form [@field]
-
-    @history[@i = @history.size] = default || ""
+    @value = default
     Ncurses::Form.post_form @form
-    set_cur_value @history[@i]
+    set_cursed_value default if default
   end
 
   def position_cursor
@@ -50,7 +47,7 @@ class TextField
     @w.mvaddstr @y, 0, @question
     Ncurses.curs_set 1
     Ncurses::Form.form_driver @form, Ncurses::Form::REQ_END_FIELD
-    Ncurses::Form.form_driver @form, Ncurses::Form::REQ_NEXT_CHAR if @history[@i] =~ / $/ # fucking RETARDED!!!!
+    Ncurses::Form.form_driver @form, Ncurses::Form::REQ_NEXT_CHAR if @value && @value =~ / $/ # fucking RETARDED!!!!
   end
 
   def deactivate
@@ -66,20 +63,21 @@ class TextField
     ## short-circuit exit paths
     case c
     when Ncurses::KEY_ENTER # submit!
-      @value = @history[@i] = get_cur_value
+      @value = get_cursed_value
+      @history.push @value
       return false
     when Ncurses::KEY_CANCEL # cancel
-      @history.delete_at @i
-      @i = @history.empty? ? nil : (@i - 1) % @history.size 
       @value = nil
       return false
     when Ncurses::KEY_TAB # completion
       return true unless @completion_block
       if @completions.empty?
-        v = get_cur_value
+        v = get_cursed_value
         c = @completion_block.call v
         if c.size > 0
-          set_cur_value c.map { |full, short| full }.shared_prefix
+          @value = c.map { |full, short| full }.shared_prefix(true)
+          set_cursed_value @value
+          position_cursor
         end
         if c.size > 1
           @completions = c
@@ -94,6 +92,7 @@ class TextField
     end
 
     reset_completion_state
+    @value = nil
 
     d =
       case c
@@ -103,18 +102,24 @@ class TextField
         Ncurses::Form::REQ_NEXT_CHAR
       when Ncurses::KEY_BACKSPACE
         Ncurses::Form::REQ_DEL_PREV
-      when ?\001
+      when 1 #ctrl-a
         Ncurses::Form::REQ_BEG_FIELD
-      when ?\005
+      when 5 #ctrl-e
         Ncurses::Form::REQ_END_FIELD
+      when 11 # ctrl-k
+        Ncurses::Form::REQ_CLR_EOF
       when Ncurses::KEY_UP
-        @history[@i] = @field.field_buffer 0
+        @i ||= @history.size
+        @history[@i] = get_cursed_value
         @i = (@i - 1) % @history.size
-        set_cur_value @history[@i]
+        @value = @history[@i]
+        set_cursed_value @value
       when Ncurses::KEY_DOWN
-        @history[@i] = @field.field_buffer 0
+        @i ||= @history.size
+        @history[@i] = get_cursed_value
         @i = (@i + 1) % @history.size
-        set_cur_value @history[@i]
+        @value = @history[@i]
+        set_cursed_value @value
       else
         c
       end
@@ -131,16 +136,25 @@ private
   end
 
   ## ncurses inanity wrapper
-  def get_cur_value
+  ##
+  ## DO NOT READ THIS CODE. YOU WILL GO MAD.
+  def get_cursed_value
+    return nil unless @field
+
+    x = Ncurses.curx
     Ncurses::Form.form_driver @form, Ncurses::Form::REQ_VALIDATION
-    @field.field_buffer(0).gsub(/^\s+|\s+$/, "").gsub(/\s+/, " ")
+    v = @field.field_buffer(0).gsub(/^\s+|\s+$/, "")
+
+    ## cursor <= end of text
+    if x - @question.length - v.length <= 0
+      v
+    else # trailing spaces
+      v + (" " * (x - @question.length - v.length))
+    end
   end
-  
-  ## ncurses inanity wrapper
-  def set_cur_value v
+
+  def set_cursed_value v
     @field.set_field_buffer 0, v
-    Ncurses::Form.form_driver @form, Ncurses::Form::REQ_END_FIELD
   end
-
 end
 end

data/lib/sup/thread.rb

@@ -54,7 +54,7 @@ class Thread
 
   ## yields each message, its depth, and its parent. the message yield
   ## parameter can be a Message object, or :fake_root, or nil (no
-  ## message found but the presence of one induced from other
+  ## message found but the presence of one deduced from other
   ## messages).
   def each fake_root=false
     adj = 0
@@ -85,7 +85,10 @@ class Thread
   def first; each { |m, *o| return m if m }; nil; end
   def dirty?; any? { |m, *o| m && m.dirty? }; end
   def date; map { |m, *o| m.date if m }.compact.max; end
-  def snippet; argfind { |m, *o| m && m.snippet }; end
+  def snippet
+    last_m, last_stuff = select { |m, *o| m && m.snippet && !m.snippet.empty? }.sort_by { |m, *o| m.date }.last
+    last_m ? last_m.snippet : ""
+  end
   def authors; map { |m, *o| m.from if m }.compact.uniq; end
 
   def apply_label t; each { |m, *o| m && m.add_label(t) }; end
@@ -303,18 +306,19 @@ class ThreadSet
       next if contains_id? mid
 
       m = builder.call
-      add_message m
-      load_thread_for_message m, :load_killed => opts[:load_killed]
+      load_thread_for_message m, :skip_killed => opts[:skip_killed], :load_deleted => opts[:load_deleted], :load_spam => opts[:load_spam]
       yield size if block_given?
     end
   end
 
   ## loads in all messages needed to thread m
+  ## may do nothing if m's thread is killed
   def load_thread_for_message m, opts={}
-    @index.each_message_in_thread_for m, opts.merge({:limit => 100}) do |mid, builder|
+    good = @index.each_message_in_thread_for m, opts do |mid, builder|
       next if contains_id? mid
       add_message builder.call
     end
+    add_message m if good
   end
 
   ## merges in a pre-loaded thread

data/lib/sup/util.rb

@@ -63,13 +63,13 @@ module RMail
   class EncodingUnsupportedError < StandardError; end
 
   class Message
-    def add_attachment fn
+    def add_file_attachment fn
       bfn = File.basename fn
       a = Message.new
       t = MIME::Types.type_for(bfn).first || MIME::Types.type_for("exe").first
 
-      a.header.add "Content-Disposition", "attachment; filename=#{bfn}"
-      a.header.add "Content-Type", "#{t.content_type}; name=#{bfn}"
+      a.header.add "Content-Disposition", "attachment; filename=#{bfn.to_s.inspect}"
+      a.header.add "Content-Type", "#{t.content_type}; name=#{bfn.to_s.inspect}"
       a.header.add "Content-Transfer-Encoding", t.encoding
       a.body =
         case t.encoding
@@ -77,12 +77,20 @@ module RMail
           [IO.read(fn)].pack "m"
         when "quoted-printable"
           [IO.read(fn)].pack "M"
+        when "7bit", "8bit"
+          IO.read(fn)
         else
           raise EncodingUnsupportedError, t.encoding
         end
 
       add_part a
     end
+
+    def charset
+      if header.field?("content-type") && header.fetch("content-type") =~ /charset="?(.*?)"?(;|$)/
+        $1
+      end
+    end
   end
 end
 
@@ -123,21 +131,7 @@ class Object
     ret
   end
 
-  ## takes a value which it yields and then returns, so that code
-  ## like:
-  ##
-  ## x = expensive_operation
-  ## log "got #{x}"
-  ## x
-  ##
-  ## now becomes:
-  ##
-  ## with(expensive_operation) { |x| log "got #{x}" }
-  ##
-  ## i'm sure there's pithy comment i could make here about the
-  ## superiority of lisp, but fuck lisp.
-  ##
-  ## addendum: apparently this is a "k combinator". whoda thunk it?
+  ## "k combinator"
   def returning x; yield x; x; end
 
   ## clone of java-style whole-method synchronization
@@ -277,14 +271,14 @@ module Enumerable
 
   ## returns the maximum shared prefix of an array of strings
   ## optinally excluding a prefix
-  def shared_prefix exclude=""
+  def shared_prefix caseless=false, exclude=""
     return "" if empty?
     prefix = ""
     (0 ... first.length).each do |i|
-      c = first[i]
-      break unless all? { |s| s[i] == c }
+      c = (caseless ? first.downcase : first)[i]
+      break unless all? { |s| (caseless ? s.downcase : s)[i] == c }
       next if exclude[i] == c
-      prefix += c.chr
+      prefix += first[i].chr
     end
     prefix
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sup
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-07-17 00:00:00 -07:00
+  version: "0.2"
+date: 2007-10-29 00:00:00 -07:00
 summary: A console-based email client with the best features of GMail, mutt, and emacs. Features full text search, labels, tagged operations, multiple buffers, recent contacts, and more.
 require_paths: 
 - lib
@@ -43,15 +43,18 @@ files:
 - bin/sup-sync
 - bin/sup-sync-back
 - doc/FAQ.txt
+- doc/Hooks.txt
+- doc/NewUserGuide.txt
 - doc/Philosophy.txt
 - doc/TODO
-- doc/UserGuide.txt
 - lib/sup.rb
 - lib/sup/account.rb
 - lib/sup/buffer.rb
 - lib/sup/colormap.rb
 - lib/sup/contact.rb
+- lib/sup/crypto.rb
 - lib/sup/draft.rb
+- lib/sup/hook.rb
 - lib/sup/imap.rb
 - lib/sup/index.rb
 - lib/sup/keymap.rb
@@ -62,6 +65,7 @@ files:
 - lib/sup/mbox/loader.rb
 - lib/sup/mbox/ssh-file.rb
 - lib/sup/mbox/ssh-loader.rb
+- lib/sup/message-chunks.rb
 - lib/sup/message.rb
 - lib/sup/mode.rb
 - lib/sup/modes/buffer-list-mode.rb