default header prints search args

DerGuteMoritz · May 2, 2009 · 2f37de1 · 2f37de1
1 parent e7bf55b
commit 2f37de1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/lib/f/finder.rb b/lib/f/finder.rb
@@ -44,7 +44,7 @@ def #{name}(v = nil)
   end
 
   attr :description, :default_command
-  attr_reader :commands
+  attr_reader :commands, :args
 
   def initialize
     @commands = { }
@@ -92,6 +92,8 @@ def find(args = nil, &block)
     else
       @find.call(http, { :args => args, :terms => args.join(' ') } )
     end
+  ensure
+    @args = args if args
   end
 
   def parse(response = nil, &block)

diff --git a/lib/f/finder/imdb.rb b/lib/f/finder/imdb.rb
@@ -4,7 +4,6 @@
   find { |http, o| http.get '/find', :q => o[:args].join('+'), :s => 'tt' }
 
   parse do |page, result|
-    result.header = 'Results for ' + page.at('input[name="q"]')['value']
     page.css('td > a[href^="/title/"]').each do |a|
       next if a.text.blank?
       result << [a.parent.text.squeeze, a['href']]

diff --git a/lib/f/prompt.rb b/lib/f/prompt.rb
@@ -54,7 +54,7 @@ def initialize(finder, results)
 
   def list
     puts @finder.description
-    puts @results.header if @results.header
+    puts @results.header
     puts
 
     @results.each_with_index do |r, i|

diff --git a/lib/f/result.rb b/lib/f/result.rb
@@ -45,6 +45,10 @@ def initialize(finder)
     super(@items)
   end
 
+  def header
+    @header || "Results for #{@finder.args.join(' ')}"
+  end
+
   def items=(items)
     @items.replace(items.map { |a| make_item(a) })
   end