search: fix gcalc regexp again

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / search.rb

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index b2e950ecd544b81247e2f380dab041dfbaf125e8..a485b0dfc3052be32ee9c16273c667aae32666a4 100644 (file)
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -18,7 +18,8 @@
 GOOGLE_SEARCH = "http://www.google.com/search?oe=UTF-8&q="
 GOOGLE_WAP_SEARCH = "http://www.google.com/wml/search?hl=en&q="
 GOOGLE_WAP_LINK = /<a accesskey="(\d)" href=".*?u=(.*?)">(.*?)<\/a>/im
-GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?></td><td>&nbsp;</td><td nowrap>(?:<h2 class=r>)?<font size=\+1><b>(.+)</b>(?:</h2>)?</td>}
+GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?>.*?<h2 class=r[^>]*><b>(.+?)</b>}
+GOOGLE_COUNT_RESULT = %r{<font size=-1>Results <b>1<\/b> - <b>10<\/b> of about <b>(.*)<\/b> for}
 GOOGLE_DEF_RESULT = %r{<p> (Web definitions for .*?)<br/>(.*?)<br/>(.*?)\s-\s+<a href}
 
 class SearchPlugin < Plugin
@@ -95,6 +96,11 @@ class SearchPlugin < Plugin
       single ? u : "#{n}. #{Bold}#{t}#{Bold}: #{u}"
     }.join(" | ")
 
+    if params[:lucky]
+      m.reply urls.first
+      return
+    end
+
     # If we return a single, full result, change the output to a more compact representation
     if single
       m.reply "Result for %s: %s -- %s" % [what, results, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate
@@ -109,10 +115,15 @@ class SearchPlugin < Plugin
 
   end
 
+  def lucky(m, params)
+    params.merge!(:lucky => true)
+    google(m, params)
+  end
+
   def gcalc(m, params)
     what = params[:words].to_s
     searchfor = CGI.escape(what)
-    
+
     debug "Getting gcalc thing: #{searchfor.inspect}"
     url = GOOGLE_SEARCH + searchfor
 
@@ -124,24 +135,54 @@ class SearchPlugin < Plugin
     end
 
     debug "#{html.size} bytes of html recieved"
-    
+
     results = html.scan(GOOGLE_CALC_RESULT)
     debug "results: #{results.inspect}"
-    
+
     if results.length != 1
       m.reply "couldn't calculate #{what}"
       return
     end
-    
+
     result = results[0][0].ircify_html
     debug "replying with: #{result.inspect}"
     m.reply "#{result}"
   end
 
+  def gcount(m, params)
+    what = params[:words].to_s
+    searchfor = CGI.escape(what)
+
+    debug "Getting gcount thing: #{searchfor.inspect}"
+    url = GOOGLE_SEARCH + searchfor
+
+    begin
+      html = @bot.httputil.get(url)
+    rescue => e
+      m.reply "error googlecounting #{what}"
+      return
+    end
+
+    debug "#{html.size} bytes of html recieved"
+
+    results = html.scan(GOOGLE_COUNT_RESULT)
+    debug "results: #{results.inspect}"
+
+    if results.length != 1
+      m.reply "couldn't count #{what}"
+      return
+    end
+
+    result = results[0][0].ircify_html
+    debug "replying with: #{result.inspect}"
+    m.reply "total results: #{result}"
+
+  end
+
   def gdef(m, params)
     what = params[:words].to_s
     searchfor = CGI.escape("define " + what)
-    
+
     debug "Getting gdef thing: #{searchfor.inspect}"
     url = GOOGLE_WAP_SEARCH + searchfor
 
@@ -155,12 +196,12 @@ class SearchPlugin < Plugin
     debug html
     results = html.scan(GOOGLE_DEF_RESULT)
     debug "results: #{results.inspect}"
-    
+
     if results.length != 1
       m.reply "couldn't find a definition for #{what} on Google"
       return
     end
-    
+
     head = results[0][0].ircify_html
     text = results[0][1].ircify_html
     link = results[0][2]
@@ -191,11 +232,13 @@ end
 
 plugin = SearchPlugin.new
 
-plugin.map "search *words", :action => 'google'
-plugin.map "google *words", :action => 'google'
-plugin.map "gcalc *words", :action => 'gcalc'
-plugin.map "gdef *words", :action => 'gdef'
-plugin.map "wp :lang *words", :action => 'wikipedia', :requirements => { :lang => /^\w\w\w?$/ }
-plugin.map "wp *words", :action => 'wikipedia'
-plugin.map "unpedia *words", :action => 'unpedia'
+plugin.map "search *words", :action => 'google', :threaded => true
+plugin.map "google *words", :action => 'google', :threaded => true
+plugin.map "lucky *words", :action => 'lucky', :threaded => true
+plugin.map "gcount *words", :action => 'gcount', :threaded => true
+plugin.map "gcalc *words", :action => 'gcalc', :threaded => true
+plugin.map "gdef *words", :action => 'gdef', :threaded => true
+plugin.map "wp :lang *words", :action => 'wikipedia', :requirements => { :lang => /^\w\w\w?$/ }, :threaded => true
+plugin.map "wp *words", :action => 'wikipedia', :threaded => true
+plugin.map "unpedia *words", :action => 'unpedia', :threaded => true