Merge branch 'master' into next

[sup] / lib / sup / modes / label-search-results-mode.rb

diff --git a/lib/sup/modes/label-search-results-mode.rb b/lib/sup/modes/label-search-results-mode.rb
index 489714057d8efa74dd9dccb1fa1cb6daf4f3abc1..bca51d456143e901683b7f3b65f1be3a909e25e0 100644 (file)
--- a/lib/sup/modes/label-search-results-mode.rb
+++ b/lib/sup/modes/label-search-results-mode.rb
@@ -9,7 +9,18 @@ class LabelSearchResultsMode < ThreadIndexMode
     super [], opts
   end
 
-  def is_relevant? m; @labels.all? { |l| m.has_label? l }; end
+  register_keymap do |k|
+    k.add :refine_search, "Refine search", '|'
+  end
+
+  def refine_search
+    label_query = @labels.size > 1 ? "(#{@labels.join('||')})" : @labels.first
+    query = BufferManager.ask :search, "refine query: ", "+label:#{label_query} "
+    return unless query && query !~ /^\s*$/
+    SearchResultsMode.spawn_from_query query
+  end
+
+  def is_relevant? m; @labels.all? { |l| m.has_label? l } end
 
   def self.spawn_nicely label
     label = LabelManager.label_for(label) unless label.is_a?(Symbol)
@@ -18,10 +29,8 @@ class LabelSearchResultsMode < ThreadIndexMode
     when :inbox
       BufferManager.raise_to_front InboxMode.instance.buffer
     else
-      BufferManager.spawn_unless_exists("All threads with label '#{label}'") do
-        mode = LabelSearchResultsMode.new([label])
-        mode.load_threads :num => b.content_height
-      end
+      b, new = BufferManager.spawn_unless_exists("All threads with label '#{label}'") { LabelSearchResultsMode.new [label] }
+      b.mode.load_threads :num => b.content_height if new
     end
   end
 end