X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=bin%2Fsup;h=ab835e7ba4edcdec548cf43cef117ddafb6fe493;hb=b466aede237fc954ce5c64dd4ed383c04be046ba;hp=c5e54fa31acb72708ff4eef5c52f902bf7ef636f;hpb=59cb2add14f75a2b4977d7c59738ba0baeb2b517;p=sup

diff --git a/bin/sup b/bin/sup
index c5e54fa..ab835e7 100644
--- a/bin/sup
+++ b/bin/sup
@@ -2,25 +2,41 @@
 
 require 'rubygems'
 require 'ncurses'
+require 'fileutils'
+require 'trollop'
 require "sup"
 
-module Redwood
+$opts = Trollop::options do
+  version "sup v#{Redwood::VERSION}"
+  banner <<EOS
+Sup is a curses-based email client.
+
+Usage:
+  sup [options]
+
+Options are:
+EOS
+  opt :no_threads, "Turn of threading. Helps with debugging. (Necessarily disables background polling for new messages.)"
+end
 
-$exception = nil
+Thread.abort_on_exception = true # make debugging possible
+
+module Redwood
 
 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'
+#  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", 'A'
+  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 :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
@@ -39,16 +55,32 @@ def stop_cursing
 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
+begin
+  Redwood::lock
+rescue LockError => e
+  require 'highline'
+  h = HighLine.new
+  h.say <<EOS
+Error: sup is already running! User #{e.user} on host #{e.host} was running sup
+with pid #{e.pid} as of #{e.time}.
+EOS
 
+  case h.ask("Should I try and kill that process? ")
+  when /^\s*y\s*$/i
+    h.say "Ok, suggesting sepuku..."
+    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 "Ok, see you later."
+    exit
+  end
+end
+
+Redwood::start
 Index.new.load
-log "loaded #{Index.size} messages from index"
 
 if(s = Index.source_for DraftManager.source_name)
   DraftManager.source = s
@@ -61,7 +93,7 @@ if(s = Index.source_for SentManager.source_name)
 else
   Index.add_source SentManager.new_source
 end
-  
+
 begin
   log "starting curses"
   start_cursing
@@ -72,12 +104,16 @@ begin
     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 :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 :mime_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
@@ -88,6 +124,8 @@ begin
           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,
@@ -101,15 +139,36 @@ begin
 
   log "initializing mail index buffer"
   imode = InboxMode.new
-  ibuf = bm.spawn "inbox", imode
+  ibuf = bm.spawn "Inbox", imode
 
-  log "ready for (inter)action!"
+  log "ready for interaction!"
   Logger.make_buf
 
   bm.draw_screen
-  imode.load_more_threads ibuf.content_height
 
-  ::Thread.new { sleep 5; PollManager.poll }
+  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
+      begin
+        s.connect
+      rescue SourceError => e
+        Redwood::log "fatal error loading from #{s}: #{e.message}"
+      end
+    end if s.respond_to? :connect
+  end
+
+  imode.load_threads :num => ibuf.content_height, :when_done => lambda { reporting_thread { sleep 1; PollManager.poll } }
+
+  unless $opts[:no_threads]
+    PollManager.start_thread
+    SuicideManager.start_thread
+  end
 
   until $exception
     bm.draw_screen
@@ -123,7 +182,7 @@ begin
         x = global_keymap.action_for c
         case x
         when :quit
-          break
+          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 }
@@ -132,79 +191,89 @@ begin
         when :roll_buffers_backwards
           bm.roll_buffers_backwards
         when :kill_buffer
-          bm.kill_buffer bm.focus_buf unless bm.focus_buf.mode.is_a? InboxMode
+          bm.kill_buffer_safely bm.focus_buf
         when :list_buffers
           bm.spawn_unless_exists("Buffer List") { BufferListMode.new }
         when :list_contacts
-          mode = ContactListMode.new 
-          bm.spawn "compose to contacts", mode
+          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*$/
-          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_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
+          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 }
+            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
         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 client.
-
-You must rebuild the index for this source. Please run:
-  sup-import --rebuild #{$exception.source}
-to correct this error.
-EOS
-#' stupid ruby-mode
+  when SuicideException
+    Redwood::log "I've been asked to commit sepuku. I obey!"
+    exit
+  when nil
+    Redwood::log "good night, sweet prince!"
+    Index.save
   else
-    $stderr.puts <<EOS
+    Redwood::log "oh crap, an exception"
+  end
+
+  Redwood::unlock
+end
+
+if $exception 
+  $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
@@ -213,10 +282,7 @@ William
 The problem was: #{$exception.message} (error type #{$exception.class.name})
 A backtrace follows:
 EOS
-  end
   raise $exception
 end
 
-
 end
-