sup 0.0.1 → 0.0.2

data/doc/TODO

@@ -1,3 +1,4 @@
+search for other messages from author in thread-view-mode
 forward attachments
 tab completion on labels, contacts
 within-buffer search
@@ -8,7 +9,12 @@ maybe: rangefilter on the initial inbox to only consider the most recent 1000 me
 select all, starred, to me, etc
 editing of arbitrary messages
 annotations on messages
+gmail
+pop
+move sup-import argument handling to getopt or something
 
+x handle broken sources better
+x imap
 x word wrap
 x background indexing
 x auto-insertion of draft messages

data/lib/sup.rb

@@ -3,18 +3,19 @@ require 'yaml'
 require 'zlib'
 require 'thread'
 require 'fileutils'
+
 Thread.abort_on_exception = true # make debugging possible
 
 class Object
-  ## this is for debugging purposes because i keep calling nil.id and
-  ## i want it to throw an exception
-  def id 
+  ## this is for debugging purposes because i keep calling #id on the
+  ## wrong object and i want it to throw an exception
+  def id
     raise "wrong id called"
   end
 end
 
 module Redwood
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   BASE_DIR   = File.join(ENV["HOME"], ".sup")
   CONFIG_FN  = File.join(BASE_DIR, "config.yaml")
@@ -28,7 +29,6 @@ module Redwood
   YAML_DATE = "2006-10-01"
 
 ## one-stop shop for yamliciousness
-
   def register_yaml klass, props
     vars = props.map { |p| "@#{p}" }
     path = klass.name.gsub(/::/, "/")
@@ -65,7 +65,6 @@ module Redwood
 end
 
 ## set up default configuration file
-
 if File.exists? Redwood::CONFIG_FN
   $config = Redwood::load_yaml_obj Redwood::CONFIG_FN
 else
@@ -92,7 +91,9 @@ end
 require "sup/util"
 require "sup/update"
 require "sup/message"
+require "sup/source"
 require "sup/mbox"
+require "sup/imap"
 require "sup/person"
 require "sup/account"
 require "sup/thread"

data/lib/sup/buffer.rb

@@ -132,7 +132,7 @@ class BufferManager
     @minibuf_stack = []
     @textfields = {}
     @flash = nil
-    @shelled_out = false
+    @freeze = false
 
     self.class.i_am_the_instance self
   end
@@ -178,14 +178,14 @@ class BufferManager
   end
 
   def completely_redraw_screen
-    return if @shelled_out
+    return if @freeze
     Ncurses.clear
     @dirty = true
     draw_screen
   end
 
   def handle_resize
-    return if @shelled_out
+    return if @freeze
     rows, cols = Ncurses.rows, Ncurses.cols
     @buffers.each { |b| b.resize rows - 1, cols }
     completely_redraw_screen
@@ -193,7 +193,7 @@ class BufferManager
   end
 
   def draw_screen skip_minibuf=false
-    return if @shelled_out
+    return if @freeze
 
     ## disabling this for the time being, to help with debugging
     ## (currently we only have one buffer visible at a time).
@@ -216,7 +216,7 @@ class BufferManager
   def spawn_unless_exists title, opts={}
     if @name_map.member? title
       Redwood::log "buffer '#{title}' already exists, raising to front"
-      raise_to_front @name_map[title]
+      raise_to_front @name_map[title] unless opts[:hidden]
     else
       mode = yield
       spawn title, mode, opts
@@ -291,11 +291,13 @@ class BufferManager
     tf.activate question, default
     @dirty = true
     draw_screen true
-    tf.position_cursor
-    Ncurses.refresh
 
     ret = nil
+    @freeze = true
+    tf.position_cursor
+    Ncurses.refresh
     while tf.handle_input(Ncurses.nonblocking_getch); end
+    @freeze = false
 
     ret = tf.value
     tf.deactivate
@@ -315,6 +317,7 @@ class BufferManager
 
     ret = nil
     done = false
+    @freeze = true
     until done
       key = Ncurses.nonblocking_getch
       if key == Ncurses::KEY_CANCEL
@@ -324,7 +327,7 @@ class BufferManager
         done = true
       end
     end
-
+    @freeze = false
     Ncurses.curs_set 0
     erase_flash
     draw_screen
@@ -334,7 +337,15 @@ class BufferManager
   end
 
   def ask_yes_or_no question
-    [?y, ?Y].member? ask_getch(question, "ynYN")
+    r = ask_getch(question, "ynYN")
+    case r
+    when ?y, ?Y
+      true
+    when nil
+      nil
+    else
+      false
+    end
   end
 
   def draw_minibuf
@@ -348,8 +359,8 @@ class BufferManager
   def say s, id=nil
     id ||= @minibuf_stack.length
     @minibuf_stack[id] = s
-    unless @shelled_out
-      draw_minibuf
+    unless @freeze
+      draw_screen
       Ncurses.refresh
     end
     id
@@ -359,8 +370,8 @@ class BufferManager
 
   def flash s
     @flash = s
-    unless @shelled_out
-      draw_minibuf
+    unless @freeze
+      draw_screen
       Ncurses.refresh
     end
   end
@@ -373,19 +384,19 @@ class BufferManager
         @minibuf_stack.delete_at i
       end
     end
-    unless @shelled_out
-      draw_minibuf
+    unless @freeze
+      draw_screen
       Ncurses.refresh
     end
   end
 
   def shell_out command
-    @shelled_out = true
+    @freeze = true
     Ncurses.endwin
     system command
     Ncurses.refresh
     Ncurses.curs_set 0
-    @shelled_out = false
+    @freeze = false
   end
 end
 end

data/lib/sup/draft.rb

@@ -10,9 +10,9 @@ class DraftManager
     self.class.i_am_the_instance self
   end
 
-  def self.source_name; "drafts"; end
+  def self.source_name; "drafts://"; end
   def self.source_id; 9999; end
-  def new_source; @source = DraftLoader.new @dir; end
+  def new_source; @source = DraftLoader.new; end
 
   def write_draft
     offset = @source.gen_offset
@@ -20,7 +20,7 @@ class DraftManager
     File.open(fn, "w") { |f| yield f }
 
     @source.each do |offset, labels|
-      m = Message.new @source, offset, labels
+      m = Message.new :source => @source, :source_info => offset, :labels => labels
       Index.add_message m
       UpdateManager.relay :add, m
     end
@@ -36,25 +36,30 @@ class DraftManager
   end
 end
 
-class DraftLoader
-  attr_accessor :dir, :end_offset
-  bool_reader :dirty
+class DraftLoader < Source
+  attr_accessor :dir
 
-  def initialize dir, end_offset=0
+  def initialize cur_offset=0
+    dir = Redwood::DRAFT_DIR
     Dir.mkdir dir unless File.exists? dir
+    super "draft://#{dir}", cur_offset, true, false
     @dir = dir
-    @end_offset = end_offset
-    @dirty = false
   end
 
-  def done?; !File.exists? fn_for_offset(@end_offset); end
-  def usual?; true; end
   def id; DraftManager.source_id; end
   def to_s; DraftManager.source_name; end
-  def is_source_for? x; x == DraftManager.source_name; end
+
+  def next
+    ret = nil
+    begin
+      ret = cur_offset
+      self.cur_offset = cur_offset + 1
+    end until File.exists? fn_for_offset(ret)
+    [ret, [:draft]]
+  end
 
   def gen_offset
-    i = @end_offset
+    i = cur_offset
     while File.exists? fn_for_offset(i)
       i += 1
     end
@@ -77,8 +82,7 @@ class DraftLoader
     end
   end
 
-  ## load the full header text
-  def load_header_text offset
+  def raw_header offset
     ret = ""
     File.open fn_for_offset(offset) do |f|
       until f.eof? || (l = f.gets) =~ /^$/
@@ -88,18 +92,18 @@ class DraftLoader
     ret
   end
 
-  def each
-    while File.exists?(fn = File.join(@dir, @end_offset.to_s))
-      yield @end_offset, [:draft, :inbox]
-      @end_offset += 1
-      @dirty = true
+  def raw_full_message offset
+    ret = ""
+    File.open fn_for_offset(offset) do |f|
+      ret += l until f.eof?
     end
+    ret
   end
 
-  def total; Dir[File.join(@dir, "*")].sort.last.to_i; end
-  def reset!; @end_offset = 0; @dirty = true; end
+  def start_offset; 0; end
+  def end_offset; Dir.new(@dir).entries.sort.last.to_i + 1; end
 end
 
-Redwood::register_yaml(DraftLoader, %w(dir end_offset))
+Redwood::register_yaml(DraftLoader, %w(cur_offset))
 
 end

data/lib/sup/imap.rb

@@ -0,0 +1,107 @@
+require 'uri'
+require 'net/imap'
+require 'stringio'
+
+module Redwood
+
+class IMAP < Source
+  attr_reader :labels
+  
+  def initialize uri, username, password, last_uid=nil, usual=true, archived=false, id=nil
+    raise ArgumentError, "username and password must be specified" unless username && password
+
+    super uri, last_uid, usual, archived, id
+
+    @parsed_uri = URI(uri)
+    @username = username
+    @password = password
+    @imap = nil
+    @labels = [:unread]
+    @labels << mailbox.intern unless mailbox =~ /inbox/i || mailbox.empty?
+    @labels << :inbox unless archived?
+
+    connect
+  end
+
+  def connect
+    return false if broken?
+    return true if @imap
+    Redwood::log "connecting to #{@parsed_uri.host} port #{ssl? ? 993 : 143}, ssl=#{ssl?} ..."
+
+    ## ok, this is FUCKING ANNOYING.
+    ##
+    ## what imap.rb likes to do is, if an exception occurs, catch it
+    ## and re-raise it on the calling thread. seems reasonable. but
+    ## what that REALLY means is that the only way to reasonably
+    ## initialize imap is in its own thread, because otherwise, you
+    ## will never be able to catch the exception it raises on the
+    ## calling thread, and the backtrace will not make any sense at
+    ## all, and you will waste HOURS of your life on this fucking
+    ## problem.
+    ##
+    ## FUCK!!!!!!!!!
+    ::Thread.new do
+      begin
+        #raise Net::IMAP::ByeResponseError, "simulated imap failure"
+        @imap = Net::IMAP.new @parsed_uri.host, ssl? ? 993 : 143, ssl?
+        @imap.authenticate 'LOGIN', @username, @password
+        @imap.examine mailbox
+        Redwood::log "successfully connected to #{@parsed_uri}, mailbox #{mailbox}"
+      rescue Exception => e
+        self.broken_msg = e.message.chomp # fucking chomp! fuck!!!
+        @imap = nil
+        Redwood::log "error connecting to IMAP server: #{self.broken_msg}"
+      end
+    end.join
+
+    !!@imap
+  end
+  private :connect
+
+  def mailbox; @parsed_uri.path[1..-1] end ##XXXX TODO handle nil
+  def ssl?; @parsed_uri.scheme == 'imaps' end
+
+  def load_header uid=nil
+    MBox::read_header StringIO.new(raw_header(uid))
+  end
+
+  def load_message uid
+    RMail::Parser.read raw_full_message(uid)
+  end
+
+  ## load the full header text
+  def raw_header uid
+    connect or return broken_msg
+    begin
+      connect or return broken_msg
+    rescue Exception => e
+      raise "wtf: #{e.inspect}"
+    end
+    @imap.uid_fetch(uid, 'RFC822.HEADER')[0].attr['RFC822.HEADER'].gsub(/\r\n/, "\n")
+  end
+
+  def raw_full_message uid
+    connect or return broken_msg
+    @imap.uid_fetch(uid, 'RFC822')[0].attr['RFC822'].gsub(/\r\n/, "\n")
+  end
+  
+  def each
+    connect or return broken_msg
+    uids = @imap.uid_search ['UID', "#{cur_offset}:#{end_offset}"]
+    uids.each do |uid|
+      @last_uid = uid
+      @dirty = true
+      yield uid, labels
+    end
+  end
+
+  def start_offset; 1; end
+  def end_offset
+    connect or return start_offset
+    @imap.uid_search(['ALL']).last
+  end
+end
+
+Redwood::register_yaml(IMAP, %w(uri username password offset usual archived id))
+
+end

data/lib/sup/index.rb

@@ -18,17 +18,11 @@ end
 class Index
   include Singleton
 
-  LOAD_THREAD_PETIT_DELAY = 0.1
-  LOAD_THREAD_GRAND_DELAY = 5
-
-  MESSAGES_AT_A_TIME = 10
-
   attr_reader :index # debugging only
   
   def initialize dir=BASE_DIR
     @dir = dir
     @mutex = Mutex.new
-    @load_thread = nil # loads new messages
     @sources = {}
     @sources_dirty = false
 
@@ -50,7 +44,8 @@ class Index
     raise "duplicate source!" if @sources.include? source
     @sources_dirty = true
     source.id ||= @sources.size
-    source.id += 1 while @sources.member? source.id
+    ##TODO: why was this necessary?
+    ##source.id += 1 while @sources.member? source.id
     @sources[source.id] = source
   end
 
@@ -71,7 +66,7 @@ class Index
       field_infos = Ferret::Index::FieldInfos.new :store => :yes
       field_infos.add_field :message_id
       field_infos.add_field :source_id
-      field_infos.add_field :source_info, :index => :no, :term_vector => :no
+      field_infos.add_field :source_info
       field_infos.add_field :date, :index => :untokenized
       field_infos.add_field :body, :store => :no
       field_infos.add_field :label
@@ -190,31 +185,50 @@ class Index
     source = @sources[doc[:source_id].to_i]
     #puts "building message #{doc[:message_id]} (#{source}##{doc[:source_info]})"
     raise "invalid source #{doc[:source_id]}" unless source
-    begin
-      raise "no snippet" unless doc[:snippet]
-      Message.new source, doc[:source_info].to_i, 
-                  doc[:label].split(" ").map { |s| s.intern },
-                  doc[:snippet]
-    rescue MessageFormatError => e
-      raise IndexError.new(source, "error building message #{doc[:message_id]} at #{source}/#{doc[:source_info]}: #{e.message}")
-      nil
-    end
-  end
 
-  def start_load_thread
-    return if @load_thread
-    @load_thread = true
-    @load_thread = ::Thread.new do
-      while @load_thread
-        load_some_entries ENTRIES_AT_A_TIME, LOAD_THREAD_PETIT_DELAY, LOAD_THREAD_GRAND_DELAY
+    m = 
+      if source.broken?
+        nil
+      else
+        begin
+          Message.new :source => source, :source_info => doc[:source_info].to_i, 
+                      :labels => doc[:label].split(" ").map { |s| s.intern },
+                      :snippet => doc[:snippet]
+        rescue MessageFormatError => e
+          raise IndexError.new(source, "error building message #{doc[:message_id]} at #{source}/#{doc[:source_info]}: #{e.message}")
+        rescue SourceError => e
+          nil
+        end
       end
+
+    unless m
+      fake_header = {
+        "date" => Time.at(doc[:date].to_i),
+        "subject" => unwrap_subj(doc[:subject]),
+        "from" => doc[:from],
+        "to" => doc[:to],
+        "message-id" => doc[:message_id],
+        "references" => doc[:refs],
+      }
+
+      m = Message.new :labels => doc[:label].split(" ").map { |s| s.intern },
+                      :snippet => doc[:snippet], :header => fake_header, 
+                      :body => <<EOS
+#{doc[:snippet]}...
+
+An error occurred while loading this message. It is possible that the source
+has changed, or (in the case of remote sources) is down.
+
+The error message was:
+  #{source.broken_msg}
+EOS
     end
+    m
   end
 
-  def end_load_thread; @load_thread = nil; end
   def fresh_thread_id; @next_thread_id += 1; end
-
   def wrap_subj subj; "__START_SUBJECT__ #{subj} __END_SUBJECT__"; end
+  def unwrap_subj subj; subj =~ /__START_SUBJECT__ (.*?) __END_SUBJECT__/ && $1; end
 
   def add_message m
     return false if contains? m
@@ -238,7 +252,7 @@ class Index
       :from => m.from ? m.from.email : "",
       :to => (m.to + m.cc + m.bcc).map { |x| x.email }.join(" "),
       :subject => wrap_subj(Message.normalize_subj(m.subj)),
-      :refs => (m.refs + m.replytos).join(" "),
+      :refs => (m.refs + m.replytos).uniq.join(" "),
     }
 
     @index.add_document d
@@ -316,38 +330,16 @@ protected
 
   def save_sources fn=Redwood::SOURCE_FN
     if @sources_dirty || @sources.any? { |id, s| s.dirty? }
-      FileUtils.mv fn, fn + ".bak", :force => true if File.exists? fn
+      bakfn = fn + ".bak"
+      if File.exists? fn
+        File.chmod 0600, fn
+        FileUtils.mv fn, bakfn, :force => true unless File.exists?(bakfn) && File.size(bakfn) > File.size(fn)
+      end
       Redwood::save_yaml_obj @sources.values, fn 
+      File.chmod 0600, fn
     end
     @sources_dirty = false
   end
-
-  def load_some_entries max=ENTRIES_AT_A_TIME, delay1=nil, delay2=nil
-    num = 0
-    begin
-      @sources.each_with_index do |source, source_id|
-        next if source.done? || num >= max
-        source.each do |source_info, label|
-          begin
-            m = Message.new(source, source_info, label + [:inbox])
-            add_message m unless contains_id? m.id
-            puts m.content.inspect
-            num += 1
-          rescue MessageFormatError => e
-            $stderr.puts "ignoring erroneous message at #{source}##{source_info}: #{e.message}"
-          end
-          break if num >= max
-          sleep delay1 if delay1
-        end
-        Redwood::log "loaded #{num} entries from #{source}"
-        sleep delay2 if delay2
-      end
-    ensure
-      save_sources
-      save_index
-    end
-    num
-  end
 end
 
 end