sup 0.8.1 → 0.9

data/CONTRIBUTORS

@@ -1,4 +1,8 @@
+William Morgan <wmorgan-sup at the masanjin dot nets>
+Rich Lane <rlane at the club.cc.cmu dot edus>
+Ismo Puustinen <ismo at the iki dot fis>
 Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
+Ben Walton <bwalton at the artsci.utoronto dot cas>
 Mike Stipicevic <stipim at the rpi dot edus>
 Marcus Williams <marcus-sup at the bar-coded dot nets>
 Lionel Ott <white.magic at the gmx dot des>
@@ -6,17 +10,20 @@ Ingmar Vanhassel <ingmar at the exherbo dot orgs>
 Mark Alexander <marka at the pobox dot coms>
 Christopher Warrington <chrisw at the rice dot edus>
 Richard Brown <rbrown at the exherbo dot orgs>
-Ben Walton <bwalton at the artsci.utoronto dot cas>
 Marc Hartstein <marc.hartstein at the alum.vassar dot edus>
+Israel Herraiz <israel.herraiz at the gmail dot coms>
 Grant Hollingworth <grant at the antiflux dot orgs>
+Adeodato Simó <dato at the net.com.org dot ess>
 Steve Goldman <sgoldman at the tower-research dot coms>
+Edward Z. Yang <ezyang at the mit dot edus>
 Decklin Foster <decklin at the red-bean dot coms>
-Ismo Puustinen <ismo at the iki dot fis>
+Alex Vandiver <alex at the chmrr dot nets>
 Jeff Balogh <its.jeff.balogh at the gmail dot coms>
-Alex Vandiver <alexmv at the mit dot edus>
+Carl Worth <cworth at the cworth dot orgs>
+Kornilios Kourtis <kkourt at the cslab.ece.ntua dot grs>
 Giorgio Lando <patroclo7 at the gmail dot coms>
-Israel Herraiz <israel.herraiz at the gmail dot coms>
+Benoît PIERRE <benoit.pierre at the gmail dot coms>
 Ian Taylor <ian at the lorf dot orgs>
-Stefan Lundström <lundst at the snabb.(none)>
-Rich Lane <rlane at the club.cc.cmu dot edus>
+Stefan Lundström
+Michael Hamann <michael at the content-space dot des>
 Kirill Smelkov <kirr at the landau.phys.spbu dot rus>

data/History.txt

@@ -1,3 +1,22 @@
+== 0.9 / 2009-10-01
+* Experimental Xapian backend to replace Ferret. Not everything works with it,
+  but it's fast and less likely to barf. See release notes.
+* New keybinding: "G" for reply-all.
+* New hook: custom-search, for adding your own query expansions.
+* Better preemptive thread loading.
+* Random UI tweaks: display labels before subjects, change thread-view-mode's
+  'n' and 'p' commands slightly
+* Better killing of other Sup processes.
+* Die gracefully upon SIGKILL.
+* Finally figure out the curses+ruby magic to make SIGWINCH (i.e. xterm
+  resizing) work correctly.
+* Add a console mode (press ~) for interactively playing with the index.
+* Finally figure out the curses magic to stop the weird keyboard behavior after
+  leaving the editor.
+* Improved logging. Logging now supports SUP_LOG_LEVEL environment variable.
+  Set this to "debug" for verbiage.
+* As always, many bugfixes and tweaks.
+
 == 0.8.1 / 2009-06-15
 * make multibyte display "work" for non-utf8 locales
 * fix reply-mode always selecting "Customized"

data/ReleaseNotes

@@ -1,3 +1,38 @@
+Release 0.9:
+
+There's a new Xapian backend as an alternative to the Ferret one. It's still in
+a beta stage. It's much faster and much less prone to the random crashes than
+Ferret, but certain things don't work yet, most noticeably the unread message
+counts in label-list-mode.
+
+You can switch back and forth between both indexes without harm, *except* any
+new messages added to the one index won't be picked up by the other. Follow
+these instructions:
+
+To TRY the Xapian index, without screwing Ferret up:
+
+1. sup-dump > dump                              # takes a while
+2. export SUP_INDEX=xapian                      # or however you do it in your shell
+3. sup-sync --all --all-sources --restore dump  # takes a long time
+4. sup -n                # -n ensures that no polling is done. don't hit 'P' either
+
+Step 1 will take a long time, and step 3 will take a very long time.
+
+At this point, whenever you run Sup, the SUP_INDEX environment variable will
+determine which index you use. If it's unset, or "ferret", you will use the
+ferret index. If it's "xapian", the Xapian index. Make sure when you run sup
+with the Xapian index, you use -n and don't hit 'P', to avoid loading new
+messages into it.
+
+If you want to switch to Xapian permanently, you can then:
+
+1. rm -rf ~/.sup/ferret
+2. permanently set SUP_INDEX=xapian according to your shell
+3. Run sup as normal, i.e. without -n.
+
+If you want to go back to Ferret, you can just rm -rf ~/.sup/xapian and make
+sure your SUP_INDEX environment variable is unset.
+
 Release 0.8.1:
 
 A bugfix release with fixes for quote parsing (bad behavior in certain long

data/bin/sup

@@ -5,10 +5,9 @@ require 'ncurses'
 require 'curses'
 require 'fileutils'
 require 'trollop'
-require 'fastthread'
 require "sup"
 
-BIN_VERSION = "0.8.1"
+BIN_VERSION = "0.9"
 
 unless Redwood::VERSION == BIN_VERSION
   $stderr.puts <<EOS
@@ -59,6 +58,7 @@ if $opts[:list_hooks]
 end
 
 Thread.abort_on_exception = true # make debugging possible
+Thread.current.priority = 1 # keep ui responsive
 
 module Redwood
 
@@ -79,6 +79,8 @@ global_keymap = Keymap.new do |k|
   k.add :compose, "Compose new message", 'm', 'c'
   k.add :nothing, "Do nothing", :ctrl_g
   k.add :recall_draft, "Edit most recent draft message", 'R'
+  k.add :show_inbox, "Show the Inbox buffer", 'I'
+  k.add :show_console, "Show the Console buffer", '~'
 end
 
 ## the following magic enables wide characters when used with a ruby
@@ -89,24 +91,24 @@ end
 ## BSD users: if libc.so.6 is not found, try installing compat6x.
 require 'dl/import'
 module LibC
-  extend DL::Importable
+  extend DL.const_defined?(:Importer) ? DL::Importer : DL::Importable
   setlocale_lib = case Config::CONFIG['arch']
     when /darwin/; "libc.dylib"
     when /cygwin/; "cygwin1.dll"
     else; "libc.so.6"
   end
 
-  Redwood::log "dynamically loading setlocale() from #{setlocale_lib}"
+  debug "dynamically loading setlocale() from #{setlocale_lib}"
   begin
     dlload setlocale_lib
     extern "void setlocale(int, const char *)"
-    Redwood::log "setting locale..."
+    debug "setting locale..."
     LibC.setlocale(6, "")  # LC_ALL == 6
   rescue RuntimeError => e
-    Redwood::log "cannot dlload setlocale(); ncurses wide character support probably broken."
-    Redwood::log "dlload error was #{e.class}: #{e.message}"
+    warn "cannot dlload setlocale(); ncurses wide character support probably broken."
+    warn "dlload error was #{e.class}: #{e.message}"
     if Config::CONFIG['arch'] =~ /bsd/
-      Redwood::log "BSD variant detected. You may have to install a compat6x package to acquire libc."
+      warn "BSD variant detected. You may have to install a compat6x package to acquire libc."
     end
   end
 end
@@ -130,80 +132,68 @@ def stop_cursing
 end
 module_function :start_cursing, :stop_cursing
 
-Index.new
-begin
-  Index.lock
-rescue Index::LockError => e
-  require 'highline'
-
-  h = HighLine.new
-  h.wrap_at = :auto
-  h.say Index.fancy_lock_error_message_for(e)
-
-  case h.ask("Should I ask that process to kill itself? ")
-  when /^\s*y(es)?\s*$/i
-    h.say "Ok, suggesting seppuku..."
-    FileUtils.touch Redwood::SUICIDE_FN
-    sleep SuicideManager::DELAY * 2
-    FileUtils.rm_f Redwood::SUICIDE_FN
-    h.say "Let's try that again."
-    retry
-  else
-    h.say <<EOS
-Ok, giving up. If the process crashed and left a stale lockfile, you
-can fix this by manually deleting #{Index.lockfile}.
-EOS
-    exit
-  end
-end
+Index.init
+Index.lock_interactively or exit
 
 begin
   Redwood::start
   Index.load
 
-  if(s = Index.source_for DraftManager.source_name)
+  $die = false
+  trap("TERM") { |x| $die = true }
+  trap("WINCH") { |x| BufferManager.sigwinch_happened! }
+
+  if(s = Redwood::SourceManager.source_for DraftManager.source_name)
     DraftManager.source = s
   else
-    Redwood::log "no draft source, auto-adding..."
-    Index.add_source DraftManager.new_source
+    debug "no draft source, auto-adding..."
+    Redwood::SourceManager.add_source DraftManager.new_source
   end
 
-  if(s = Index.source_for SentManager.source_name)
+  if(s = Redwood::SourceManager.source_for SentManager.source_uri)
     SentManager.source = s
   else
-    Redwood::log "no sent mail source, auto-adding..."
-    Index.add_source SentManager.new_source
+    Redwood::SourceManager.add_source SentManager.default_source
   end
 
   HookManager.run "startup"
 
-  log "starting curses"
+  debug "starting curses"
+  Redwood::Logger.remove_sink $stderr
   start_cursing
 
-  bm = BufferManager.new
+  bm = BufferManager.init
   Colormap.new.populate_colormap
 
-  log "initializing mail index buffer"
+  debug "initializing log buffer"
+  lmode = Redwood::LogMode.new "system log"
+  lmode.on_kill { Logger.clear! }
+  Logger.add_sink lmode
+  Logger.force_message "Welcome to Sup! Log level is set to #{Logger.level}."
+  if Logger::LEVELS.index(Logger.level) > 0
+    Logger.force_message "For more verbose logging, restart with SUP_LOG_LEVEL=#{Logger::LEVELS[Logger::LEVELS.index(Logger.level)-1]}."
+  end
+
+  debug "initializing inbox buffer"
   imode = InboxMode.new
   ibuf = bm.spawn "Inbox", imode
 
-  log "ready for interaction!"
-  Logger.make_buf
+  debug "ready for interaction!"
 
   bm.draw_screen
 
-  Index.usual_sources.each do |s|
+  Redwood::SourceManager.usual_sources.each do |s|
     next unless s.respond_to? :connect
     reporting_thread("call #connect on #{s}") do
       begin
         s.connect
       rescue SourceError => e
-        Redwood::log "fatal error loading from #{s}: #{e.message}"
+        error "fatal error loading from #{s}: #{e.message}"
       end
     end
   end unless $opts[:no_initial_poll]
-  
-  imode.load_threads :num => ibuf.content_height, :when_done => lambda { reporting_thread("poll after loading inbox") { sleep 1; PollManager.poll } unless $opts[:no_threads] || $opts[:no_initial_poll] }
+
+  imode.load_threads :num => ibuf.content_height, :when_done => lambda { |num| reporting_thread("poll after loading inbox") { sleep 1; PollManager.poll } unless $opts[:no_threads] || $opts[:no_initial_poll] }
 
   if $opts[:compose]
     ComposeMode.spawn_nicely :to_default => $opts[:compose]
@@ -211,7 +201,6 @@ begin
 
   unless $opts[:no_threads]
     PollManager.start
-    SuicideManager.start
     Index.start_lock_update_thread
   end
 
@@ -219,30 +208,40 @@ begin
     SearchResultsMode.spawn_from_query $opts[:search]
   end
 
-  until Redwood::exceptions.nonempty? || SuicideManager.die?
-    c = 
-       begin
-         Ncurses.nonblocking_getch
-       rescue Exception => e
-         if e.is_a?(Interrupt)
-           raise if BufferManager.ask_yes_or_no("Die ungracefully now?")
-           bm.draw_screen
-           nil
-         end
-       end
-    next unless c
+  until Redwood::exceptions.nonempty? || $die
+    c = begin
+      Ncurses.nonblocking_getch
+    rescue Interrupt
+      raise if BufferManager.ask_yes_or_no "Die ungracefully now?"
+      BufferManager.draw_screen
+      nil
+    end
+
+    if c.nil?
+      if BufferManager.sigwinch_happened?
+        debug "redrawing screen on sigwinch"
+        BufferManager.completely_redraw_screen
+      end
+      next
+    end
+
+    if c == 410
+      ## this is ncurses's way of telling us it's detected a refresh.
+      ## since we have our own sigwinch handler, we don't do anything.
+      next
+    end
+
     bm.erase_flash
 
-    action =
-      begin
-        if bm.handle_input c
-          :nothing
-        else
-          bm.resolve_input_with_keymap c, global_keymap
-        end
-      rescue InputSequenceAborted
+    action = begin
+      if bm.handle_input c
         :nothing
+      else
+        bm.resolve_input_with_keymap c, global_keymap
       end
+    rescue InputSequenceAborted
+      :nothing
+    end
     case action
     when :quit_now
       break if bm.kill_all_buffers_safely
@@ -298,6 +297,11 @@ begin
         b, new = BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] }
         b.mode.load_threads :num => b.content_height if new
       end
+    when :show_inbox
+      BufferManager.raise_to_front ibuf
+    when :show_console
+      b, new = bm.spawn_unless_exists("Console", :system => true) { ConsoleMode.new }
+      b.mode.run
     when :nothing, InputSequenceAborted
     when :redraw
       bm.completely_redraw_screen
@@ -308,13 +312,12 @@ begin
     bm.draw_screen
   end
 
-  bm.kill_all_buffers if SuicideManager.die?
+  bm.kill_all_buffers if $die
 rescue Exception => e
   Redwood::record_exception e, "main"
 ensure
   unless $opts[:no_threads]
     PollManager.stop if PollManager.instantiated?
-    SuicideManager.stop if PollManager.instantiated?
     Index.stop_lock_update_thread
   end
 
@@ -322,17 +325,19 @@ ensure
 
   Redwood::finish
   stop_cursing
-  Redwood::log "stopped cursing"
+  Redwood::Logger.remove_all_sinks!
+  Redwood::Logger.add_sink $stderr, false
+  debug "stopped cursing"
 
-  if SuicideManager.instantiated? && SuicideManager.die?
-    Redwood::log "I've been ordered to commit seppuku. I obey!"
+  if $die
+    info "I've been ordered to commit seppuku. I obey!"
   end
 
   if Redwood::exceptions.empty?
-    Redwood::log "no fatal errors. good job, william."
+    debug "no fatal errors. good job, william."
     Index.save
   else
-    Redwood::log "oh crap, an exception"
+    error "oh crap, an exception"
   end
 
   Index.unlock

data/bin/sup-add

@@ -77,17 +77,17 @@ end
 
 $terminal.wrap_at = :auto
 Redwood::start
-index = Redwood::Index.new
+index = Redwood::Index.init
 
-index.lock_or_die
+index.lock_interactively or exit
 
 begin
-  index.load_sources
+  Redwood::SourceManager.load_sources
 
   ARGV.each do |uri|
     labels = $opts[:labels] ? $opts[:labels].split(/\s*,\s*/).uniq : []
 
-    if !$opts[:force_new] && index.source_for(uri) 
+    if !$opts[:force_new] && Redwood::SourceManager.source_for(uri)
       say "Already know about #{uri}; skipping."
       next
     end
@@ -99,10 +99,10 @@ begin
       when "mbox+ssh"
         say "For SSH connections, if you will use public key authentication, you may leave the username and password blank."
         say ""
-        username, password = get_login_info uri, index.sources
+        username, password = get_login_info uri, Redwood::SourceManager.sources
         Redwood::MBox::SSHLoader.new uri, username, password, nil, !$opts[:unusual], $opts[:archive], nil, labels
       when "imap", "imaps"
-        username, password = get_login_info uri, index.sources
+        username, password = get_login_info uri, Redwood::SourceManager.sources
         Redwood::IMAP.new uri, username, password, nil, !$opts[:unusual], $opts[:archive], nil, labels
       when "maildir"
         Redwood::Maildir.new uri, nil, !$opts[:unusual], $opts[:archive], nil, labels
@@ -114,7 +114,7 @@ begin
         Trollop::die "Unknown source type #{parsed_uri.scheme.inspect}"      
       end
     say "Adding #{source}..."
-    index.add_source source
+    Redwood::SourceManager.add_source source
   end
 ensure
   index.save

data/bin/sup-config

@@ -17,15 +17,14 @@ Usage:
 
 Options:
 EOS
-end #' stupid ruby-mode
+end
 
 def axe q, default=nil
-  ans = 
-    if default && !default.empty?
-      ask "#{q} (enter for \"#{default}\"): "
-    else
-      ask "#{q}: "
-    end
+  ans = if default && !default.empty?
+    ask "#{q} (enter for \"#{default}\"): "
+  else
+    ask "#{q}: "
+  end
   ans.empty? ? default : ans
 end
 
@@ -54,64 +53,62 @@ def add_source
   while true do
     say "Ok, now for the details."
 
-    default_labels, components = 
-      case type
-      when :mbox
-        $last_fn ||= ENV["MAIL"]
-        fn = axe "What's the full path to the mbox file?", $last_fn #"srm
-        return if fn.nil? || fn.empty?
-
-        $last_fn = fn
-        [Redwood::MBox::Loader.suggest_labels_for(fn),
-         { :scheme => "mbox", :path => fn }]
-      when :maildir
-        $last_fn ||= ENV["MAIL"]
-        fn = axe "What's the full path to the maildir directory?", $last_fn #"srm
-        return if fn.nil? || fn.empty?
-
-        $last_fn = fn
-        [Redwood::Maildir.suggest_labels_for(fn),
-         { :scheme => "maildir", :path => fn }]
-      when :mboxssh
-        $last_server ||= "localhost"
-        srv = axe "What machine is the mbox file located on?", $last_server 
-        return if srv.nil? || srv.empty?
-        $last_server = srv
-
-        fn = axe "What's the path to the mbox file?", $last_fn #" stupid ruby-mode
-        return if fn.nil? || fn.empty?
-        $last_fn = fn
-        fn = "/#{fn}" # lame
-        [Redwood::MBox::SSHLoader.suggest_labels_for(fn),
-         { :scheme => "mbox+ssh", :host => srv, :path => fn }]
-      when :imap, :imaps
-        $last_server ||= "localhost"
-        srv = axe "What is the IMAP server (host, or host:port notation)?", $last_server
-        return if srv.nil? || srv.empty?
-        $last_server = srv
-
-        $last_folder ||= "INBOX"
-        fn = axe "What's the folder path?", $last_folder #"srm 
-        return if fn.nil? || fn.empty?
-        $last_folder = fn
-
-        fn = "/#{fn}" # lame
-        if srv =~ /^(\S+):(\d+)$/
-          host, port = $1, $2.to_i
-        else
-          host, port = srv, nil
-        end
-        [Redwood::IMAP.suggest_labels_for(fn),
-         { :scheme => type.to_s, :host => host, :port => port, :path => fn }]
-      end
-    
-    uri = 
-      begin
-        URI::Generic.build components
-      rescue URI::Error => e
-        say "Whoopsie! I couldn't build a URI from that: #{e.message}"
-        if axe_yes("Try again?") then next else return end
+    default_labels, components = case type
+    when :mbox
+      $last_fn ||= ENV["MAIL"]
+      fn = axe "What's the full path to the mbox file?", $last_fn
+      return if fn.nil? || fn.empty?
+
+      $last_fn = fn
+      [Redwood::MBox::Loader.suggest_labels_for(fn),
+       { :scheme => "mbox", :path => fn }]
+    when :maildir
+      $last_fn ||= ENV["MAIL"]
+      fn = axe "What's the full path to the maildir directory?", $last_fn
+      return if fn.nil? || fn.empty?
+
+      $last_fn = fn
+      [Redwood::Maildir.suggest_labels_for(fn),
+       { :scheme => "maildir", :path => fn }]
+    when :mboxssh
+      $last_server ||= "localhost"
+      srv = axe "What machine is the mbox file located on?", $last_server
+      return if srv.nil? || srv.empty?
+      $last_server = srv
+
+      fn = axe "What's the path to the mbox file?", $last_fn
+      return if fn.nil? || fn.empty?
+      $last_fn = fn
+      fn = "/#{fn}" # lame
+      [Redwood::MBox::SSHLoader.suggest_labels_for(fn),
+       { :scheme => "mbox+ssh", :host => srv, :path => fn }]
+    when :imap, :imaps
+      $last_server ||= "localhost"
+      srv = axe "What is the IMAP server (host, or host:port notation)?", $last_server
+      return if srv.nil? || srv.empty?
+      $last_server = srv
+
+      $last_folder ||= "INBOX"
+      fn = axe "What's the folder path?", $last_folder
+      return if fn.nil? || fn.empty?
+      $last_folder = fn
+
+      fn = "/#{fn}"
+      if srv =~ /^(\S+):(\d+)$/
+        host, port = $1, $2.to_i
+      else
+        host, port = srv, nil
       end
+      [Redwood::IMAP.suggest_labels_for(fn),
+       { :scheme => type.to_s, :host => host, :port => port, :path => fn }]
+    end
+
+    uri = begin
+      URI::Generic.build components
+    rescue URI::Error => e
+      say "Whoopsie! I couldn't build a URI from that: #{e.message}"
+      if axe_yes("Try again?") then next else return end
+    end
 
     say "I'm going to add this source: #{uri}"
     unless axe("Does that look right?", "y") =~ /^y|yes$/i
@@ -123,13 +120,12 @@ def add_source
 
     labels_str = axe("Enter any labels to be automatically added to all messages from this source, separated by spaces (or 'none')", default_labels.join(","))
 
-    labels =
-      if labels_str =~ /^\s*none\s*$/i
-        nil
-      else
-        labels_str.split(/\s+/)
-      end
-    
+    labels = if labels_str =~ /^\s*none\s*$/i
+      nil
+    else
+      labels_str.split(/\s+/)
+    end
+
     cmd = build_cmd "sup-add"
     cmd += " --unusual" unless usual
     cmd += " --archive" if archive
@@ -151,8 +147,8 @@ end
 
 $terminal.wrap_at = :auto
 Redwood::start
-index = Redwood::Index.new
-index.load_sources
+index = Redwood::Index.init
+Redwood::SourceManager.load_sources
 
 say <<EOS
 Howdy neighbor! This here's sup-config, ready to help you jack in to
@@ -164,14 +160,13 @@ nary a click of the mouse!
 Just answer these simple questions and you'll be on your way.
 
 EOS
-#' stupid ruby-mode
 
 account = $config[:accounts][:default]
 
 name = axe "What's your name?", account[:name]
-email = axe "What's your (primary) email address?", account[:email] #'srm
+email = axe "What's your (primary) email address?", account[:email]
 
-say "Ok, your header will look like this:"
+say "Ok, your from header will look like this:"
 say "  From: #{name} <#{email}>"
 
 say "\nDo you have any alternate email addresses that also receive email?"
@@ -187,19 +182,15 @@ $config[:accounts][:default][:alternates] = alts
 $config[:accounts][:default][:signature] = sigfn
 $config[:editor] = editor
 
-Redwood::save_yaml_obj $config, Redwood::CONFIG_FN
-
-say "Ok, I've saved you up a nice lil' #{Redwood::CONFIG_FN}."
-
 done = false
 until done
   say "\nNow, we'll tell Sup where to find all your email."
-  index.load_sources
+  Redwood::SourceManager.load_sources
   say "Current sources:"
-  if index.sources.empty?
+  if Redwood::SourceManager.sources.empty?
     say "  No sources!"
   else
-    index.sources.each { |s| puts "* #{s}" }
+    Redwood::SourceManager.sources.each { |s| puts "* #{s}" }
   end
 
   say "\n"
@@ -210,14 +201,42 @@ until done
   end
 end
 
+say "\nSup needs to know where to store your sent messages."
+say "Only sources capable of storing mail will be listed.\n\n"
+
+Redwood::SourceManager.load_sources
+if Redwood::SourceManager.sources.empty?
+  say "\nUsing the default sup://sent, since you haven't configured other sources yet."
+  $config[:sent_source] = 'sup://sent'
+else
+  # this handles the event that source.yaml already contains the SentLoader
+  # source.
+  have_sup_sent = false
+
+  choose do |menu|
+    menu.prompt = "Store my sent mail in? "
+
+    menu.choice('Default (an mbox in ~/.sup, aka sup://sent)') { $config[:sent_source] = 'sup://sent'} unless have_sup_sent
+
+    valid_sents = Redwood::SourceManager.sources.each do |s|
+      have_sup_sent = true if s.to_s.eql?('sup://sent')
+      menu.choice(s.to_s) { $config[:sent_source] = s.to_s } if s.respond_to? :store_message
+    end
+  end
+end
+
+Redwood::save_yaml_obj $config, Redwood::CONFIG_FN
+
+say "Ok, I've saved you up a nice lil' #{Redwood::CONFIG_FN}."
+
 say <<EOS
 
-Ok. The final step is to import all your messages into the Sup index.
+The final step is to import all your messages into the Sup index.
 Depending on how many messages are in the sources, this could take
 quite a while.
 
 EOS
-#'
+
 if axe_yes "Run sup-sync to import all messages now?"
   while true
     cmd = build_cmd("sup-sync") + " --all-sources"