bin/sup in sup-0.5 vs bin/sup in sup-0.6
- old
+ new
@@ -3,13 +3,14 @@
require 'rubygems'
require 'ncurses'
require 'curses'
require 'fileutils'
require 'trollop'
+require 'fastthread'
require "sup"
-BIN_VERSION = "0.5"
+BIN_VERSION = "0.6"
unless Redwood::VERSION == BIN_VERSION
$stderr.puts <<EOS
Error: version mismatch!
@@ -19,11 +20,10 @@
Is your development environment conflicting with rubygems?
EOS
exit(-1)
end
-$exceptions = []
$opts = Trollop::options do
version "sup v#{Redwood::VERSION}"
banner <<EOS
Sup is a curses-based email client.
@@ -53,11 +53,12 @@
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'
k.add :kill_buffer, "Kill the current buffer", 'x'
k.add :list_buffers, "List all buffers", 'B'
@@ -137,57 +138,12 @@
HookManager.run "startup"
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
ibuf = bm.spawn "Inbox", imode
@@ -221,11 +177,11 @@
if $opts[:search]
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
action =
@@ -238,12 +194,16 @@
rescue InputSequenceAborted
:nothing
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 }
when :roll_buffers
bm.roll_buffers
@@ -298,11 +258,11 @@
bm.draw_screen
end
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?
SuicideManager.stop if PollManager.instantiated?
Index.stop_lock_update_thread
@@ -314,39 +274,39 @@
if SuicideManager.instantiated? && SuicideManager.die?
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
Redwood::log "oh crap, an exception"
end
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
end
$stderr.puts <<EOS
----------------------------------------------------------------
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!
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
end