bin/sup in sup-0.0.2 vs bin/sup in sup-0.0.3
- old
+ new
@@ -2,25 +2,14 @@
require 'rubygems'
require 'ncurses'
require "sup"
+Thread.abort_on_exception = true # make debugging possible
+
module Redwood
-$exception = nil
-def reporting_thread
- ::Thread.new do
- begin
- yield
- rescue Exception => e
- $exception ||= e
- raise
- end
- end
-end
-module_function :reporting_thread
-
global_keymap = Keymap.new do |k|
k.add :quit, "Quit Redwood", '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'
@@ -30,10 +19,11 @@
k.add :redraw, "Redraw screen", :ctrl_l
k.add :search, "Search messages", '/'
k.add :list_labels, "List labels", 'L'
k.add :poll, "Poll for new messages", 'P'
k.add :compose, "Compose new message", 'm'
+ k.add :recall_draft, "Edit most recent draft message", 'R'
end
def start_cursing
Ncurses.initscr
Ncurses.noecho
@@ -48,20 +38,12 @@
Ncurses.echo
Ncurses.endwin
end
module_function :start_cursing, :stop_cursing
-Redwood::SentManager.new Redwood::SENT_FN
-Redwood::ContactManager.new Redwood::CONTACT_FN
-Redwood::LabelManager.new Redwood::LABEL_FN
-Redwood::AccountManager.new $config[:accounts]
-Redwood::DraftManager.new Redwood::DRAFT_DIR
-Redwood::UpdateManager.new
-Redwood::PollManager.new
-
+Redwood::start
Index.new.load
-log "loaded #{Index.size} messages from index"
if(s = Index.source_for DraftManager.source_name)
DraftManager.source = s
else
Index.add_source DraftManager.new_source
@@ -70,11 +52,11 @@
if(s = Index.source_for SentManager.source_name)
SentManager.source = s
else
Index.add_source SentManager.new_source
end
-
+
begin
log "starting curses"
start_cursing
log "initializing colormap"
@@ -118,11 +100,12 @@
Logger.make_buf
bm.draw_screen
imode.load_more_threads ibuf.content_height
- reporting_thread { sleep 3; PollManager.poll }
+ reporting_thread { sleep 5; PollManager.poll }
+ PollManager.start_thread
until $exception
bm.draw_screen
c = Ncurses.nonblocking_getch
bm.erase_flash
@@ -145,89 +128,84 @@
when :kill_buffer
bm.kill_buffer bm.focus_buf if bm.focus_buf.mode.killable?
when :list_buffers
bm.spawn_unless_exists("Buffer List") { BufferListMode.new }
when :list_contacts
- mode = ContactListMode.new
- bm.spawn "compose to contacts", mode
+ bm.spawn_unless_exists("Contact List") { ContactListMode.new }
when :search
text = bm.ask :search, "query: "
next unless text && text !~ /^\s*$/
- mode = SearchResultsMode.new text
- short_text =
- if text.length < 20
- text
- else
- text[0 ... 20] + "..."
- end
- bm.spawn "search: \"#{short_text}\"", mode
- bm.draw_screen
- mode.load_more_threads mode.buffer.content_height
- when :list_labels
- b = BufferManager.spawn_unless_exists("all labels") do
- LabelListMode.new
+
+ 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_more_threads 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
+ bm.spawn "New Message", mode
mode.edit
when :poll
- BufferManager.raise_to_front PollManager.buffer
- PollManager.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 }
+ BufferManager.spawn "Edit message", ResumeMode.new(m)
+ else
+ b = BufferManager.spawn_unless_exists(:draft) do
+ mode = LabelSearchResultsMode.new [:draft]
+ end
+ b.mode.load_more_threads b.content_height
+ end
when :nothing
when :redraw
bm.completely_redraw_screen
else
- BufferManager.flash "Unknown key press '#{c.to_character}' for #{bm.focus_buf.mode.name}."
+ bm.flash "Unknown key press '#{c.to_character}' for #{bm.focus_buf.mode.name}."
end
end
end
end
bm.kill_all_buffers
- Redwood::LabelManager.save
- Redwood::ContactManager.save
rescue Exception => e
$exception ||= e
ensure
+ Redwood::finish
stop_cursing
end
Index.save unless $exception # TODO: think about this
if $exception
- case $exception
- when IndexError
- $stderr.puts <<EOS
-An error occurred while parsing a message from source:
- #{$exception.source}.
-Typically, this means that the source has been modified in some
-way which has rendered the messages invalid. For example, if it's
-an mbox file, you may have read or deleted messages using another
-mail client.
-
-You must rebuild the index for this source. Please run:
- sup-import --rebuild #{$exception.source}
-to correct this error.
-EOS
-#' stupid ruby-mode
- else
- $stderr.puts <<EOS
+ $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 user wmorgan-sup at site masanjin dot net so that I might
-address this problem. Thank you!
+to wmorgan-sup at masanjin dot nets 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
- end
raise $exception
end
end