From 6d8654cc7f5eae527c11c0400455e8b8419ecf61 Mon Sep 17 00:00:00 2001 From: Marcus Williams Date: Sat, 19 Jan 2008 18:59:14 +0000 Subject: [PATCH] Add ability to interrupt current thread operation (search) This adds the ability to stop the current threading operation. This is usually a search, but its anything that ends up calling load_n_threads in thread-index-view. The user can hit ctrl-g to stop the operation. --- lib/sup/modes/thread-index-mode.rb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb index 7686098..c52dca9 100644 --- a/lib/sup/modes/thread-index-mode.rb +++ b/lib/sup/modes/thread-index-mode.rb @@ -16,6 +16,7 @@ EOS register_keymap do |k| k.add :load_threads, "Load #{LOAD_MORE_THREAD_NUM} more threads", 'M' + k.add :cancel_search, "Cancel current search", :ctrl_g k.add :reload, "Refresh view", '@' k.add :toggle_archived, "Toggle archived status", 'a' k.add :toggle_starred, "Star or unstar all messages in thread", '*' @@ -50,6 +51,8 @@ EOS @load_thread_opts = load_thread_opts @hidden_labels = hidden_labels + LabelManager::HIDDEN_RESERVED_LABELS @date_width = DATE_WIDTH + + @interrupt_search = false initialize_threads # defines @ts and @ts_mutex update # defines @text and @lines @@ -456,16 +459,19 @@ EOS ## TODO: figure out @ts_mutex in this method def load_n_threads n=LOAD_MORE_THREAD_NUM, opts={} + @interrupt_search = false @mbid = BufferManager.say "Searching for threads..." + orig_size = @ts.size last_update = Time.now @ts.load_n_threads(@ts.size + n, opts) do |i| if (Time.now - last_update) >= 0.25 - BufferManager.say "Loaded #{i.pluralize 'thread'}...", @mbid + BufferManager.say "Loaded #{i.pluralize 'thread'} (use ^G to cancel)...", @mbid update BufferManager.draw_screen last_update = Time.now end + break if @interrupt_search end @ts.threads.each { |th| th.labels.each { |l| LabelManager << l } } @@ -485,13 +491,20 @@ EOS end end + def cancel_search + @interrupt_search = true + end + def load_threads opts={} n = opts[:num] || ThreadIndexMode::LOAD_MORE_THREAD_NUM myopts = @load_thread_opts.merge({ :when_done => (lambda do |num| opts[:when_done].call(num) if opts[:when_done] + + cancelled = @interrupt_search?" (search cancelled by user)":"" + if num > 0 - BufferManager.flash "Found #{num.pluralize 'thread'}." + BufferManager.flash "Found #{num.pluralize 'thread'}#{cancelled}." else BufferManager.flash "No matches." end -- 2.45.2