X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=bin%2Fsup;h=6360cdea3126a17ce3065f6ae4faef3946a671c1;hb=1204128104a1b77bf3ad52fba9c8e6c44931fd4a;hp=d3b07349ca1ee5039cbdeb3e5141259aa7557ad2;hpb=0a33287792fd6650cab5149e78ee9311760f2c64;p=sup diff --git a/bin/sup b/bin/sup index d3b0734..6360cde 100644 --- a/bin/sup +++ b/bin/sup @@ -2,10 +2,26 @@ require 'rubygems' require 'ncurses' +require 'curses' require 'fileutils' require 'trollop' require "sup" +BIN_VERSION = "git" + +unless Redwood::VERSION == BIN_VERSION + $stderr.puts < String + opt :compose, "Compose message to this recipient upon startup", :type => String end +Redwood::HookManager.register "startup", < e case h.ask("Should I ask that process to kill itself? ") when /^\s*y\s*$/i - h.say "Ok, suggesting sepuku..." + h.say "Ok, suggesting seppuku..." FileUtils.touch Redwood::SUICIDE_FN sleep SuicideManager::DELAY * 2 FileUtils.rm_f Redwood::SUICIDE_FN @@ -97,19 +123,22 @@ begin 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 @@ -117,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 @@ -129,6 +160,7 @@ begin 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 @@ -148,9 +180,11 @@ begin 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" @@ -162,24 +196,22 @@ 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 + 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 { reporting_thread { sleep 1; PollManager.poll } unless $opts[:no_threads] } + if $opts[:compose] + ComposeMode.spawn_nicely :to_default => $opts[:compose] + end unless $opts[:no_threads] PollManager.start @@ -187,104 +219,88 @@ begin Index.start_lock_update_thread end - until $exception || SuicideManager.die? + if $opts[:search] + SearchResultsMode.spawn_from_query $opts[:search] + end + + until $exceptions.nonempty? || SuicideManager.die? c = Ncurses.nonblocking_getch next unless c bm.erase_flash - 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("") { 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 - 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 - user_label = - case user_label - when nil, /^\s*$/ - bm.spawn_modal("Label list", LabelListMode.new) if user_label && user_label.empty? - else - user_label.intern - end - - case user_label - when nil - when :inbox - BufferManager.raise_to_front InboxMode.instance.buffer + action = + begin + if bm.handle_input c + :nothing else - b = BufferManager.spawn_unless_exists("All threads with label '#{user_label}'") do - mode = LabelSearchResultsMode.new([user_label]) - end - b.mode.load_threads :num => b.content_height + bm.resolve_input_with_keymap c, global_keymap end + rescue InputSequenceAborted + :nothing + end - when :compose - to = BufferManager.ask_for_contacts(:people, "To: ") or next - cc = BufferManager.ask_for_contacts(:people, "Cc: ") or next if $config[:ask_for_cc] - bcc = BufferManager.ask_for_contacts(:people, "Bcc: ") or next if $config[:ask_for_bcc] - - mode = ComposeMode.new :to => to, :cc => cc, :bcc => bcc - bm.spawn "New Message", mode - mode.edit_message - when :poll - 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_message + case action + when :quit + break if bm.kill_all_buffers_safely + when :help + curmode = bm.focus_buf.mode + bm.spawn_unless_exists("") { 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 - b = BufferManager.spawn_unless_exists("All drafts") do - mode = LabelSearchResultsMode.new [:draft] - end - b.mode.load_threads :num => b.content_height + LabelSearchResultsMode.spawn_nicely user_label end - when :nothing - when :redraw - bm.completely_redraw_screen + 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 - bm.flash "Unknown key press '#{c.to_character}' for #{bm.focus_buf.mode.name}." + 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? @@ -297,11 +313,10 @@ ensure Redwood::log "stopped cursing" if SuicideManager.instantiated? && SuicideManager.die? - Redwood::log "I've been ordered to commit sepuku. I obey!" + Redwood::log "I've been ordered to commit seppuku. I obey!" end - case $exception - when nil + if $exceptions.empty? Redwood::log "no fatal errors. good job, william." Index.save else @@ -311,23 +326,29 @@ ensure Index.unlock end -if $exception +unless $exceptions.empty? + File.open(File.join(BASE_DIR, "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 <