Merge commit 'origin/mark-as-spam-hook'

[sup] / bin / sup

diff --git a/bin/sup b/bin/sup
index 45db505120c30fb65127df0b3846b03d6bde69fa..e27b3f7d14b7e213e42d8381b5b165cdd0ce31cc 100644 (file)
--- a/bin/sup
+++ b/bin/sup
@@ -5,6 +5,7 @@ require 'ncurses'
 require 'curses'
 require 'fileutils'
 require 'trollop'
+require 'fastthread'
 require "sup"
 
 BIN_VERSION = "git"
@@ -21,7 +22,6 @@ EOS
   exit(-1)
 end
 
-$exceptions = []
 $opts = Trollop::options do
   version "sup v#{Redwood::VERSION}"
   banner <<EOS
@@ -55,7 +55,8 @@ Thread.abort_on_exception = true # make debugging possible
 module Redwood
 
 global_keymap = Keymap.new do |k|
-  k.add :quit, "Quit Redwood", 'q'
+  k.add :quit_ask, "Quit Sup, but ask first", 'q'
+  k.add :quit_now, "Quit Sup immediately", 'Q'
   k.add :help, "Show help", 'H', '?'
   k.add :roll_buffers, "Switch to next buffer", 'b'
 #  k.add :roll_buffers_backwards, "Switch to previous buffer", 'B'
@@ -139,53 +140,8 @@ begin
   log "starting curses"
   start_cursing
 
-  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
-    c.add :index_new_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLACK, 
-           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
-    c.add :twiddle_color, Ncurses::COLOR_BLUE, Ncurses::COLOR_BLACK
-    c.add :label_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK
-    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 :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
-    c.add :sig_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK
-    c.add :to_me_color, Ncurses::COLOR_GREEN, Ncurses::COLOR_BLACK
-    c.add :starred_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK,
-          Ncurses::A_BOLD
-    c.add :starred_patina_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_GREEN,
-          Ncurses::A_BOLD
-    c.add :alternate_starred_patina_color, Ncurses::COLOR_YELLOW,
-          Ncurses::COLOR_BLUE, Ncurses::A_BOLD
-    c.add :snippet_color, Ncurses::COLOR_CYAN, Ncurses::COLOR_BLACK
-    c.add :option_color, Ncurses::COLOR_WHITE, Ncurses::COLOR_BLACK
-    c.add :tagged_color, Ncurses::COLOR_YELLOW, Ncurses::COLOR_BLACK,
-          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
-
   bm = BufferManager.new
+  Colormap.new.populate_colormap
 
   log "initializing mail index buffer"
   imode = InboxMode.new
@@ -223,7 +179,7 @@ begin
     SearchResultsMode.spawn_from_query $opts[:search]
   end
 
-  until $exceptions.nonempty? || SuicideManager.die?
+  until Redwood::exceptions.nonempty? || SuicideManager.die?
     c = Ncurses.nonblocking_getch
     next unless c
     bm.erase_flash
@@ -240,8 +196,12 @@ begin
       end
 
     case action
-    when :quit
+    when :quit_now
       break if bm.kill_all_buffers_safely
+    when :quit_ask
+      if bm.ask_yes_or_no "Really quit?"
+        break if bm.kill_all_buffers_safely
+      end
     when :help
       curmode = bm.focus_buf.mode
       bm.spawn_unless_exists("<help for #{curmode.name}>") { HelpMode.new curmode, global_keymap }
@@ -300,7 +260,7 @@ begin
 
   bm.kill_all_buffers if SuicideManager.die?
 rescue Exception => e
-  $exceptions << [e, "main"]
+  Redwood::record_exception e, "main"
 ensure
   unless $opts[:no_threads]
     PollManager.stop if PollManager.instantiated?
@@ -316,7 +276,7 @@ ensure
     Redwood::log "I've been ordered to commit seppuku. I obey!"
   end
 
-  if $exceptions.empty?
+  if Redwood::exceptions.empty?
     Redwood::log "no fatal errors. good job, william."
     Index.save
   else
@@ -326,9 +286,9 @@ ensure
   Index.unlock
 end
 
-unless $exceptions.empty?
-  File.open("sup-exception-log.txt", "w") do |f|
-    $exceptions.each do |e, name|
+unless Redwood::exceptions.empty?
+  File.open(File.join(BASE_DIR, "exception-log.txt"), "w") do |f|
+    Redwood::exceptions.each do |e, name|
       f.puts "--- #{e.class.name} from thread: #{name}"
       f.puts e.message, e.backtrace
     end
@@ -337,7 +297,7 @@ unless $exceptions.empty?
 ----------------------------------------------------------------
 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
+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!
 
@@ -345,7 +305,7 @@ Sincerely,
 William
 ----------------------------------------------------------------
 EOS
-  $exceptions.each do |e, name|
+  Redwood::exceptions.each do |e, name|
     puts "--- #{e.class.name} from thread: #{name}"
     puts e.message, e.backtrace
   end