X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=bin%2Fsup;h=523c685fcf49da16c984df58a4648e69743f75d2;hb=4c92e4db6639bc2ce18694dc9120ff44e29605bc;hp=273ef01914e1d73c19d3d566c6fe9c5cfa73907a;hpb=f5fc36f80266675349460ec0a11fe7a7b80214e1;p=sup

diff --git a/bin/sup b/bin/sup
index 273ef01..523c685 100644
--- a/bin/sup
+++ b/bin/sup
@@ -2,9 +2,26 @@
 
 require 'rubygems'
 require 'ncurses'
+require 'curses'
+require 'fileutils'
 require 'trollop'
 require "sup"
 
+BIN_VERSION = "0.5"
+
+unless Redwood::VERSION == BIN_VERSION
+  $stderr.puts <<EOS
+
+Error: version mismatch!
+The sup executable is at version #{BIN_VERSION.inspect}.
+The sup libraries are at version #{Redwood::VERSION.inspect}.
+
+Is your development environment conflicting with rubygems?
+EOS
+  exit(-1)
+end
+
+$exceptions = []
 $opts = Trollop::options do
   version "sup v#{Redwood::VERSION}"
   banner <<EOS
@@ -15,7 +32,22 @@ Usage:
 
 Options are:
 EOS
-  opt :no_threads, "Turn of threading. Helps with debugging. (Necessarily disables background polling for new messages.)"
+  opt :list_hooks, "List all hooks and descriptions, and quit."
+  opt :no_threads, "Turn off threading. Helps with debugging. (Necessarily disables background polling for new messages.)"
+  opt :no_initial_poll, "Don't poll for new messages when starting."
+  opt :search, "Search for this query upon startup", :type => String
+  opt :compose, "Compose message to this recipient upon startup", :type => String
+end
+
+Redwood::HookManager.register "startup", <<EOS
+Executes at startup
+No variables.
+No return value.
+EOS
+
+if $opts[:list_hooks]
+  Redwood::HookManager.print_hooks
+  exit
 end
 
 Thread.abort_on_exception = true # make debugging possible
@@ -31,10 +63,11 @@ global_keymap = Keymap.new do |k|
   k.add :list_buffers, "List all buffers", 'B'
   k.add :list_contacts, "List contacts", 'C'
   k.add :redraw, "Redraw screen", :ctrl_l
-  k.add :search, "Search messages", '/'
+  k.add :search, "Search all messages", '\\', 'F'
   k.add :list_labels, "List labels", 'L'
   k.add :poll, "Poll for new messages", 'P'
-  k.add :compose, "Compose new message", 'm'
+  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'
 end
 
@@ -45,35 +78,67 @@ def start_cursing
   Ncurses.stdscr.keypad 1
   Ncurses.curs_set 0
   Ncurses.start_color
+  $cursing = true
 end
 
 def stop_cursing
+  return unless $cursing
   Ncurses.curs_set 1
   Ncurses.echo
   Ncurses.endwin
 end
 module_function :start_cursing, :stop_cursing
 
-Redwood::start
-Index.new.load
+Index.new
+begin
+  Index.lock
+rescue Index::LockError => e
+  require 'highline'
 
-if(s = Index.source_for DraftManager.source_name)
-  DraftManager.source = s
-else
-  Index.add_source DraftManager.new_source
-end
+  h = HighLine.new
+  h.wrap_at = :auto
+  h.say Index.fancy_lock_error_message_for(e)
 
-if(s = Index.source_for SentManager.source_name)
-  SentManager.source = s
-else
-  Index.add_source SentManager.new_source
+  case h.ask("Should I ask that process to kill itself? ")
+  when /^\s*y\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
 
 begin
+  Redwood::start
+  Index.load
+
+  if(s = Index.source_for DraftManager.source_name)
+    DraftManager.source = s
+  else
+    Redwood::log "no draft source, auto-adding..."
+    Index.add_source DraftManager.new_source
+  end
+
+  if(s = Index.source_for SentManager.source_name)
+    SentManager.source = s
+  else
+    Redwood::log "no sent mail source, auto-adding..."
+    Index.add_source SentManager.new_source
+  end
+
+  HookManager.run "startup"
+
   log "starting curses"
   start_cursing
 
-  log "initializing colormap"
   Colormap.new do |c|
     c.add :status_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLUE, Ncurses::A_BOLD
     c.add :index_old_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLACK
@@ -81,6 +146,8 @@ begin
            Ncurses::A_BOLD
     c.add :index_starred_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK, 
            Ncurses::A_BOLD
+    c.add :index_draft_color, Ncurses::COLOR_RED, Ncurses::COLOR_BLACK,
+           Ncurses::A_BOLD
     c.add :labellist_old_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLACK
     c.add :labellist_new_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLACK, 
            Ncurses::A_BOLD
@@ -89,7 +156,11 @@ begin
     c.add :message_patina_color, Ncurses::COLOR_BLACK, Ncurses::COLOR_GREEN
     c.add :alternate_patina_color, Ncurses::COLOR_BLACK, Ncurses::COLOR_BLUE
     c.add :missing_message_color, Ncurses::COLOR_BLACK, Ncurses::COLOR_RED
-    c.add :mime_color, Ncurses::COLOR_CYAN, Ncurses::COLOR_BLACK
+    c.add :attachment_color, Ncurses::COLOR_CYAN, Ncurses::COLOR_BLACK
+    c.add :cryptosig_valid_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK, Ncurses::A_BOLD
+    c.add :cryptosig_unknown_color, Ncurses::COLOR_CYAN, Ncurses::COLOR_BLACK
+    c.add :cryptosig_invalid_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_RED, Ncurses::A_BOLD
+    c.add :generic_notice_patina_color, Ncurses::COLOR_CYAN, Ncurses::COLOR_BLACK
     c.add :quote_patina_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK
     c.add :sig_patina_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK
     c.add :quote_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK
@@ -107,9 +178,13 @@ begin
           Ncurses::A_BOLD
     c.add :draft_notification_color, Ncurses::COLOR_RED, Ncurses::COLOR_BLACK,
           Ncurses::A_BOLD
+    c.add :completion_character_color, Ncurses::COLOR_WHITE,
+          Ncurses::COLOR_BLACK, Ncurses::A_BOLD
+    c.add :horizontal_selector_selected_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK, Ncurses::A_BOLD
+    c.add :horizontal_selector_unselected_color, Ncurses::COLOR_CYAN, Ncurses::COLOR_BLACK
+    c.add :search_highlight_color, Ncurses::COLOR_BLACK, Ncurses::COLOR_YELLOW, Ncurses::A_BOLD, :highlight => :search_highlight_color
   end
 
-  log "initializing buffer manager"
   bm = BufferManager.new
 
   log "initializing mail index buffer"
@@ -121,134 +196,159 @@ begin
 
   bm.draw_screen
 
-  begin
-    Index.usual_sources.each { |s| s.check }
-  rescue SourceError
-    # do nothing! we'll report it at the next step
-  end
-  Redwood::report_broken_sources
-  
   Index.usual_sources.each do |s|
-    reporting_thread do
+    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}"
       end
-    end if s.respond_to? :connect
+    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] }
+
+  if $opts[:compose]
+    ComposeMode.spawn_nicely :to_default => $opts[:compose]
   end
 
-  imode.load_threads :num => ibuf.content_height, :when_done => lambda { reporting_thread { sleep 1; PollManager.poll } }
+  unless $opts[:no_threads]
+    PollManager.start
+    SuicideManager.start
+    Index.start_lock_update_thread
+  end
 
-  PollManager.start_thread unless $opts[:no_threads]
+  if $opts[:search]
+    SearchResultsMode.spawn_from_query $opts[:search]
+  end
 
-  until $exception
-    bm.draw_screen
+  until $exceptions.nonempty? || SuicideManager.die?
     c = Ncurses.nonblocking_getch
+    next unless c
     bm.erase_flash
 
-    if c == Ncurses::KEY_RESIZE
-      bm.handle_resize
-    elsif c
-      unless bm.handle_input(c)
-        x = global_keymap.action_for c
-        case x
-        when :quit
-          break if bm.kill_all_buffers_safely
-        when :help
-          curmode = bm.focus_buf.mode
-          bm.spawn_unless_exists("<help for #{curmode.name}>") { HelpMode.new curmode, global_keymap }
-        when :roll_buffers
-          bm.roll_buffers
-        when :roll_buffers_backwards
-          bm.roll_buffers_backwards
-        when :kill_buffer
-          bm.kill_buffer_safely bm.focus_buf
-        when :list_buffers
-          bm.spawn_unless_exists("Buffer List") { BufferListMode.new }
-        when :list_contacts
-          b = bm.spawn_unless_exists("Contact List") { ContactListMode.new }
-          b.mode.load_in_background
-        when :search
-          text = bm.ask :search, "query: "
-          next unless text && text !~ /^\s*$/
-
-          begin
-            qobj = Index.parse_user_query_string text
-            short_text = text.length < 20 ? text : text[0 ... 20] + "..."
-            log "built query from #{text.inspect}: #{qobj}"
-            mode = SearchResultsMode.new qobj
-            bm.spawn "search: \"#{short_text}\"", mode
-            mode.load_threads :num => mode.buffer.content_height
-          rescue Ferret::QueryParser::QueryParseException => e
-            bm.flash "Couldn't parse query."
-          end
-        when :list_labels
-          b = bm.spawn_unless_exists("Label list") { LabelListMode.new }
-          b.mode.load_in_background
-        when :compose
-          mode = ComposeMode.new
-          bm.spawn "New Message", mode
-          mode.edit
-        when :poll
-#          bm.raise_to_front PollManager.buffer
-          reporting_thread { PollManager.poll }
-        when :recall_draft
-          case Index.num_results_for :label => :draft
-          when 0
-            bm.flash "No draft messages."
-          when 1
-            m = nil
-            Index.each_id_by_date(:label => :draft) { |mid, builder| m = builder.call }
-            r = ResumeMode.new(m)
-            BufferManager.spawn "Edit message", r
-            r.edit
-          else
-            b = BufferManager.spawn_unless_exists("All drafts") do
-              mode = LabelSearchResultsMode.new [:draft]
-            end
-            b.mode.load_threads :num => b.content_height
-          end
-        when :nothing
-        when :redraw
-          bm.completely_redraw_screen
+    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
+      break if bm.kill_all_buffers_safely
+    when :help
+      curmode = bm.focus_buf.mode
+      bm.spawn_unless_exists("<help for #{curmode.name}>") { HelpMode.new curmode, global_keymap }
+    when :roll_buffers
+      bm.roll_buffers
+    when :roll_buffers_backwards
+      bm.roll_buffers_backwards
+    when :kill_buffer
+      bm.kill_buffer_safely bm.focus_buf
+    when :list_buffers
+      bm.spawn_unless_exists("Buffer List") { BufferListMode.new }
+    when :list_contacts
+      b, new = bm.spawn_unless_exists("Contact List") { ContactListMode.new }
+      b.mode.load_in_background if new
+    when :search
+      query = BufferManager.ask :search, "search all messages: "
+      next unless query && query !~ /^\s*$/
+      SearchResultsMode.spawn_from_query query
+    when :list_labels
+      labels = LabelManager.listable_labels.map { |l| LabelManager.string_for l }
+      user_label = bm.ask_with_completions :label, "Show threads with label (enter for listing): ", labels
+      unless user_label.nil?
+        if user_label.empty?
+          bm.spawn_unless_exists("Label list") { LabelListMode.new } if user_label && user_label.empty?
         else
-          bm.flash "Unknown key press '#{c.to_character}' for #{bm.focus_buf.mode.name}."
+          LabelSearchResultsMode.spawn_nicely user_label
         end
       end
+    when :compose
+      ComposeMode.spawn_nicely
+    when :poll
+      reporting_thread("user-invoked poll") { PollManager.poll }
+    when :recall_draft
+      case Index.num_results_for :label => :draft
+      when 0
+        bm.flash "No draft messages."
+      when 1
+        m = nil
+        Index.each_id_by_date(:label => :draft) { |mid, builder| m = builder.call }
+        r = ResumeMode.new(m)
+        BufferManager.spawn "Edit message", r
+        r.edit_message
+      else
+        b, new = BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] }
+        b.mode.load_threads :num => b.content_height if new
+      end
+    when :nothing, InputSequenceAborted
+    when :redraw
+      bm.completely_redraw_screen
+    else
+      bm.flash "Unknown keypress '#{c.to_character}' for #{bm.focus_buf.mode.name}."
     end
+
+    bm.draw_screen
   end
+
+  bm.kill_all_buffers if SuicideManager.die?
 rescue Exception => e
-  $exception ||= e
+  $exceptions << [e, "main"]
 ensure
+  unless $opts[:no_threads]
+    PollManager.stop if PollManager.instantiated?
+    SuicideManager.stop if PollManager.instantiated?
+    Index.stop_lock_update_thread
+  end
+
   Redwood::finish
   stop_cursing
-  if $exception
-    Redwood::log "oh crap, an exception"
+  Redwood::log "stopped cursing"
+
+  if SuicideManager.instantiated? && SuicideManager.die?
+    Redwood::log "I've been ordered to commit seppuku. I obey!"
+  end
+
+  if $exceptions.empty?
+    Redwood::log "no fatal errors. good job, william."
+    Index.save
   else
-    Redwood::log "good night, sweet prince!"
+    Redwood::log "oh crap, an exception"
   end
-end
 
-Index.save unless $exception # TODO: think about this
+  Index.unlock
+end
 
-if $exception 
+unless $exceptions.empty?
+  File.open("sup-exception-log.txt", "w") do |f|
+    $exceptions.each do |e, name|
+      f.puts "--- #{e.class.name} from thread: #{name}"
+      f.puts e.message, e.backtrace
+    end
+  end
   $stderr.puts <<EOS
 ----------------------------------------------------------------
-I'm very sorry, but it seems that an error occurred in Sup. 
-Please accept my sincere apologies. If you don't mind, please
-send the backtrace below and a brief report of the circumstances
-to wmorgan-sup at masanjin dot nets so that I might address this
-problem. Thank you!
+I'm very sorry. It seems that an error occurred in Sup. Please
+accept my sincere apologies. If you don't mind, please send the
+contents of sup-exception-log.txt and a brief report of the
+circumstances to sup-talk at rubyforge dot orgs so that I might
+address this problem. Thank you!
 
 Sincerely,
 William
 ----------------------------------------------------------------
-
-The problem was: #{$exception.message} (error type #{$exception.class.name})
-A backtrace follows:
 EOS
-  raise $exception
+  $exceptions.each do |e, name|
+    puts "--- #{e.class.name} from thread: #{name}"
+    puts e.message, e.backtrace
+  end
 end
 
 end